diff --git a/BauSystem_Main/src/BauSystem.properties b/BauSystem_Main/src/BauSystem.properties index 4c65b655..c6ef8d2f 100644 --- a/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem_Main/src/BauSystem.properties @@ -95,6 +95,7 @@ AUTOSTART_MESSAGE_NO-REGION = §cDu befindest dich derzeit in keiner Region AUTOSTART_MESSAGE_RESET = §eDer AutostartTimer wurde zurückgesetzt AUTOSTART_MESSAGE_START = §eAutostartTimer gestartet AUTOSTART_MESSAGE_RESULT1 = §eZeit §7bis zur §eExplosion §7am Gegner§8:§e {0} +AUTOSTART_MESSAGE_DATE_PATTERN=mm:ss SSSS AUTOSTART_MESSAGE_RESULT2 = §eZeitdifferenz in ticks §7bis {0} Sekunden§8:§e {1} AUTOSTART_MESSAGE_RESULT3 = §7Positiv, wenn zu wenig, negativ wenn zu viel @@ -134,6 +135,11 @@ BAU-INFO_ITEM_LORE-PROTECT = §7Protect§8: §e{0} BAU-INFO_COMMAND_HELP = §8/§ebauinfo §8- §7Gibt Informationen über den Bau BAU-INFO_COMMAND_OWNER = §7Besitzer: §e{0} BAU-INFO_COMMAND_MEMBER = §7Mitglieder: §e +BAU-INFO_MEMBER_INFO = §e{0}§8[{1}§8,{1}§8] §8 +BAU-INFO_MEMBER_WE_ALLOW = §aWE +BAU-INFO_MEMBER_WE_DISALLOW = §cWE +BAU-INFO_MEMBER_WORLD_ALLOW = §aW +BAU-INFO_MEMBER_WORLD_DISALLOW = §cW BAU-INFO_COMMAND_FLAG = §e{0} §8: §7{1} BAU-INFO_COMMAND_TPS = TPS:§e @@ -174,6 +180,10 @@ DETONATOR_INVALID_POINT=§cEin Punkt konnte nicht ausgeführt werden DETONATOR_INVALID_POINTS=§c{0} Punkte konnten nicht ausgeführt werden DETONATOR_INVALID_BLOCK=§eDer Block konnte nicht hinzugefügt werden # Hotbar +HOTBAR_HELP_1=§7Speichert eine Hotbar. Diese wird beim Joinen eines Bauserver, wo du ein Leeres Inventar hast geladen. +HOTBAR_HELP_2=§8/§ehotbar save §8-§7 Speicher deine Aktuelle Hotbar +HOTBAR_HELP_3=§8/§ehotbar load §8-§7 Lade deine Standard Hotbar +HOTBAR_HELP_4=§8/§ehotbar show §8-§7 Zeigt dir deine Standard Hotbar HOTBAR_SAVED=§7Deine Hotbar wurde als Standard gespeichert HOTBAR_LOADED=§7Deine Standard Hotbar wurde geladen HOTBAR_INVENTORY=Standard Hotbar @@ -225,9 +235,11 @@ TRACE_MESSAGE_DISALLOWED = §cDu darfst hier nicht den TNT-Tracer nutzen TRACE_COMMAND_HELP_START = §8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen TRACE_COMMAND_HELP_STOP = §8/§etrace stop §8- §7Stoppt den TNT-Tracer TRACE_COMMAND_HELP_AUTO = §8/§etrace toggleauto §8- §7Automatischer Aufnahmenstart +TRACE_COMMAND_HELP_SHOW_GUI = §8/§etrace show gui §8- §7Zeigt die Trace show gui TRACE_COMMAND_HELP_SHOW = §8/§etrace show §8- <§e-water§8|§e-interpolate-xz§8|-interpolate-y§8> - §7Zeigt alle TNT-Positionen TRACE_COMMAND_HELP_HIDE = §8/§etrace hide §8- §7Versteckt alle TNT-Positionen TRACE_COMMAND_HELP_DELETE = §8/§etrace delete §8- §7Löscht alle TNT-Positionen +TRACE_COMMAND_HELP_GUI = §8/§etrace gui §8- §7Zeigt die Trace Oberfläche an TRACE_GUI_NAME = Tracer Gui TRACE_GUI_TRACE-INACTIVE = §eTracer Starten @@ -573,3 +585,5 @@ WARP_HELP_3=§8/§ewarp info §8[§7Name§8] - §7Infos zu einem Punkt WARP_HELP_4=§8/§ewarp delete §8[§7Name§8] - §7Lösche einen Warp WARP_HELP_5=§8/§ewarp gui - §7Öffne die Warp-GUI WARP_HELP_6=§8/§ewarp list - §7Liste alle Warp-Punkt auf +WARP_MOON_ITEM_NAME=§3Atemkugel +WARP_MOON_COUNTDOOWN=§7Noch §e§l{0} §77Sekunden! diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java index 46c311ba..ce085b38 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java @@ -103,7 +103,9 @@ public class AutostartListener implements Listener { if (!region.hasType(RegionType.TESTBLOCK)) return; if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return; long tickDiff = TPSUtils.currentTick.get() - regionStartTime.remove(region); - RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", new SimpleDateFormat("mm:ss SSSS").format(new Date(tickDiff * 50))); + RegionUtils.message(region, player -> { + return BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_RESULT1", player, new SimpleDateFormat(BauSystem.MESSAGE.parse("AUTOSTART_MESSAGE_DATE_PATTERN", player)).format(new Date(tickDiff * 50))); + }); RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", 30, (600 - tickDiff)); RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3"); }); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java index 921db9b1..1db0d16f 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java @@ -56,9 +56,10 @@ public class InfoCommand extends SWCommand { membermessage.append(BauSystem.MESSAGE.parsePrefixed("BAU-INFO_COMMAND_MEMBER", p)); for (BauweltMember member : members) { - membermessage.append("§e").append(SteamwarUser.get(member.getMemberID()).getUserName()).append("§8["); - membermessage.append(member.isWorldEdit() ? "§a" : "§c").append("WE").append("§8,"); - membermessage.append(member.isWorld() ? "§a" : "§c").append("W").append("§8]").append(" "); + membermessage.append(BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_INFO", p, + member.isWorldEdit() ? BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WE_ALLOW", p) : BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WE_DISALLOW", p), + member.isWorld() ? BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WORLD_ALLOW", p) : BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_WORLD_DISALLOW", p) + )); } p.sendMessage(membermessage.toString()); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java index ed9069cd..20586581 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java @@ -20,7 +20,6 @@ package de.steamwar.bausystem.features.hotbar; import de.steamwar.bausystem.BauSystem; -import de.steamwar.bausystem.config.ColorConfig; import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.Linked; import de.steamwar.command.SWCommand; @@ -37,11 +36,11 @@ public class HotbarCommand extends SWCommand { @Register(help = true) public void genericHelp(Player p, String... args) { - p.sendMessage(ColorConfig.BASE + "---=== (" + ColorConfig.HIGHLIGHT + "Hotbar" + ColorConfig.BASE + ") ===---"); - p.sendMessage(ColorConfig.BASE + "Speichert eine Hotbar. Diese wird beim Joinen eines Bauserver, wo du ein Leeres Inventar hast geladen."); - p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "hotbar save" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Speicher deine Aktuelle Hotbar"); - p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "hotbar load" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Lade deine Standard Hotbar"); - p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "hotbar show" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Zeigt dir deine Standard Hotbar"); + BauSystem.MESSAGE.sendPrefixless("COMMAND_HELP_HEAD", p, "Hotbar"); + BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_1", p); + BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_2", p); + BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_3", p); + BauSystem.MESSAGE.sendPrefixless("HOTBAR_HELP_4", p); } @Register("load") diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/TimeCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/other/TimeCommand.java index a946a9cd..c9409f51 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/TimeCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/other/TimeCommand.java @@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.Linked; -import de.steamwar.command.CommandParseException; import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommandUtils; import de.steamwar.command.TypeMapper; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java index 9f8965d2..fc5557c6 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java @@ -64,7 +64,7 @@ public class ColorCommand extends SWCommand { } if (colorizationType == ColorizationType.GLOBAL) { Region.setGlobal(Flag.COLOR, color); - BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, color.name().toLowerCase()); + BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, BauSystem.MESSAGE.parse(color.getChatValue(), p)); return; } Region region = Region.getRegion(p.getLocation()); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java index 8bcb437d..b59e23d8 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java @@ -87,7 +87,7 @@ public class ColorBauGuiItem extends BauGuiItem { public ItemStack getItem(Player player) { Region region = Region.getRegion(player.getLocation()); ColorMode mode = region.getPlain(Flag.COLOR, ColorMode.class); - return new SWItem(mapColor(mode.getColor()), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, mode.getChatValue())).getItemStack(); + return new SWItem(mapColor(mode.getColor()), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack(); } @Override @@ -96,7 +96,7 @@ public class ColorBauGuiItem extends BauGuiItem { ColorMode current = Region.getRegion(p.getLocation()).getPlain(Flag.COLOR, ColorMode.class); List> items = new ArrayList<>(); for (ColorMode value : ColorMode.values()) { - items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value.getColor()), (byte) 0, "§f" + value.getChatValue(), Collections.emptyList(), value == current, clickType -> { + items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value.getColor()), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> { }), value)); } SWListInv inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("REGION_ITEM_COLOR_CHOOSE", p), items, (clickType, colorMode) -> { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java index dc7fcb45..2bbb6e9e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java @@ -93,12 +93,12 @@ public class TraceCommand extends SWCommand { BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_START", p); BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_STOP", p); BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_AUTO", p); - p.sendMessage("§8/§etrace show gui §8- §7Zeigt die Trace show gui"); + BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_SHOW_GUI", p); BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_SHOW", p); BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_HIDE", p); BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_DELETE", p); // p.sendMessage("§8/§etrace list §8<§7FRAME-ID§8> §8- §7Listet alle TNT auf"); - p.sendMessage("§8/§etrace gui §8- §7Zeigt die Trace Oberfläche an"); + BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_GUI", p); // p.sendMessage("§7Optionale Parameter mit §8<>§7, Benötigte Parameter mit §8[]"); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Moon.java b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Moon.java index 02ed15e0..065bc21e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Moon.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Moon.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class Moon { public static void startMoon(Player player) { - player.getInventory().setHelmet(new SWItem(Material.GLASS, "§3Atemkugel").getItemStack()); + player.getInventory().setHelmet(new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("WARP_MOON_ITEM_NAME", player)).getItemStack()); AtomicInteger countDown = new AtomicInteger(5); Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), bukkitTask -> { if (countDown.get() == 0) { @@ -52,7 +52,7 @@ public class Moon { }, 0, 1); bukkitTask.cancel(); } else { - player.sendMessage("§7Noch §e§l" + countDown.getAndDecrement() + " §7Sekunden!"); + BauSystem.MESSAGE.sendPrefixless("WARP_MOON_COUNTDOOWN", player, countDown.getAndIncrement()); } }, 0, 20); }