From 15a08a64f9d83c5ed7ec6cb2e66bc7a309631052 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 27 Dec 2021 16:06:33 +0100 Subject: [PATCH] Update BauSystem.properties Signed-off-by: yoyosource --- .../features/detonator/Detoblock.java | 8 +- BauSystem_Main/src/BauSystem.properties | 156 +++++++++--------- .../src/de/steamwar/bausystem/Permission.java | 10 +- .../features/autostart/AutostartListener.java | 4 +- .../bausystem/features/bau/BauCommand.java | 6 +- .../features/bau/BauInfoBauGuiItem.java | 4 +- .../bausystem/features/bau/InfoCommand.java | 16 +- .../features/countingwand/Countingwand.java | 4 +- .../bausystem/features/gui/BauGUICommand.java | 6 +- .../gui/editor/BauGuiEditorGuiItem.java | 2 +- .../gui/editor/BauGuiImportExport.java | 6 +- .../bausystem/features/loader/Loader.java | 2 +- .../features/loader/LoaderButton.java | 8 +- .../observer/ObserverTracerCommand.java | 2 +- .../other/items/TeleportBauGuiItem.java | 4 +- .../features/tracer/TracerBauGuiItem.java | 14 +- .../features/tracer/gui/TraceShowGui.java | 4 +- .../features/tracer/record/RecordStatus.java | 12 +- .../features/util/DebugStickCommand.java | 2 +- .../features/util/MaterialCommand.java | 4 +- .../features/util/NightVisionCommand.java | 4 +- .../util/items/DebugstickBauGuiItem.java | 3 +- .../features/util/items/SkullBauGuiItem.java | 2 +- .../region/flags/flagvalues/ColorMode.java | 4 +- .../region/flags/flagvalues/TNTMode.java | 2 +- 25 files changed, 144 insertions(+), 145 deletions(-) diff --git a/BauSystem_API/src/de/steamwar/bausystem/features/detonator/Detoblock.java b/BauSystem_API/src/de/steamwar/bausystem/features/detonator/Detoblock.java index d9c4e14d..85facc7a 100644 --- a/BauSystem_API/src/de/steamwar/bausystem/features/detonator/Detoblock.java +++ b/BauSystem_API/src/de/steamwar/bausystem/features/detonator/Detoblock.java @@ -28,10 +28,10 @@ import lombok.RequiredArgsConstructor; @Getter public enum Detoblock { SWITCH(0, true, "DETONATOR_BUTTON_SWITCH"), - WOOD_BUTTON(30, "DETONATOR_BUTTON_WOOD-Button"), - STONE_BUTTON(20, "DETONATOR_BUTTON_STONE-Button"), - PRESSURE_PLATE(30, "DETONATOR_BUTTON_PRESSURE-PLATE"), - WEIGHTED_PRESSURE_PLATE(20, "DETONATOR_BUTTON_WEIGHTED-PRESSURE-PLATE"), + WOOD_BUTTON(30, "DETONATOR_BUTTON_WOOD_BUTTON"), + STONE_BUTTON(20, "DETONATOR_BUTTON_STONE_BUTTON"), + PRESSURE_PLATE(30, "DETONATOR_BUTTON_PRESSURE_PLATE"), + WEIGHTED_PRESSURE_PLATE(20, "DETONATOR_BUTTON_WEIGHTED-PRESSURE_PLATE"), TRIPWIRE(30, "DETONATOR_BUTTON_TRIPWIRE"), NOTEBLOCK(1, "DETONATOR_BUTTON_NOTEBLOCK"), DAYLIGHTSENSOR(0, true, "DETONATOR_BUTTON_DAYLIGHTSENSOR"), diff --git a/BauSystem_Main/src/BauSystem.properties b/BauSystem_Main/src/BauSystem.properties index 37e45a47..5c2e055d 100644 --- a/BauSystem_Main/src/BauSystem.properties +++ b/BauSystem_Main/src/BauSystem.properties @@ -28,11 +28,11 @@ LIST_NEXT_PAGE=§eNächste Seite # Permission PERMISSION_WORLD = Einstellungen vornehmen -PERMISSION_WORLD-EDIT = WorldEdit verwenden -PERMISSION_CHANGE_YOU-ENABLE = §aDer Spieler darf nun {0} -PERMISSION_CHANGE_YOU-DISABLE = §cDer Spieler darf nun nicht mehr {0} -PERMISSION_CHANGE_OTHER-ENABLE = §aDu kannst nun auf der Welt von §6{0} §a{1} -PERMISSION_CHANGE_OTHER-DISABLE = §cDu kannst nun nicht mehr auf der Welt von §6{0} §c{1} +PERMISSION_WORLD_EDIT = WorldEdit verwenden +PERMISSION_CHANGE_YOU_ENABLE = §aDer Spieler darf nun {0} +PERMISSION_CHANGE_YOU_DISABLE = §cDer Spieler darf nun nicht mehr {0} +PERMISSION_CHANGE_OTHER_ENABLE = §aDu kannst nun auf der Welt von §6{0} §a{1} +PERMISSION_CHANGE_OTHER_DISABLE = §cDu kannst nun nicht mehr auf der Welt von §6{0} §c{1} # Scoreboard SCOREBOARD_TIME = Uhrzeit @@ -63,7 +63,7 @@ FLAG_PROTECT_INACTIVE = §caus FLAG_TNT_ALLOW = §aan FLAG_TNT_DENY = §caus -FLAG_TNT_ONLY-TB = §7Kein §eBaurahmen +FLAG_TNT_ONLY_TB = §7Kein §eBaurahmen FLAG_DAMAGE_ALLOW = §aan FLAG_DAMAGE_DENY = §caus @@ -71,13 +71,13 @@ FLAG_DAMAGE_DENY = §caus FLAG_COLOR_WHITE = §fWeiß FLAG_COLOR_ORANGE = §6Orange FLAG_COLOR_MAGENTA = §dMagenta -FLAG_COLOR_LIGHT-BLUE = §bHellblau +FLAG_COLOR_LIGHT_BLUE = §bHellblau FLAG_COLOR_YELLOW = §eGelb FLAG_COLOR_LIME = §aHellgrün ## This cannot be converted FLAG_COLOR_PINK = §ePink FLAG_COLOR_GRAY = §8Grau -FLAG_COLOR_LIGHT-GRAY = §7Hellgrau +FLAG_COLOR_LIGHT_GRAY = §7Hellgrau FLAG_COLOR_CYAN = §3Cyan FLAG_COLOR_PURPLE = §5Lila FLAG_COLOR_BLUE = §1Blau @@ -96,7 +96,7 @@ REGION_TYPE_ONLY_TB = Testblock AUTOSTART_COMMAND_HELP = §8/§etimer §8- §7Legt den AutostartTimer ins Inventar AUTOSTART_ITEM_NAME = §eAutostartTimer AUTOSTART_ITEM_LORE = §eRechtsklick Block §8- §7Starte den Timer -AUTOSTART_MESSAGE_NO-REGION = §cDu befindest dich derzeit in keiner Region +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} @@ -126,47 +126,47 @@ BACKUP_LORE=§eKlicken zum Laden BAU_COMMAND_HELP_INFO = §8/§ebau info §8- §7Alias für §8/§ebauinfo BAU_COMMAND_HELP_TOGGLEWE = §8/§ebau togglewe §8[§7Player§8] §8- §7Editiere die WorldEdit Rechte eines Spielers BAU_COMMAND_HELP_TOGGLEWORLD = §8/§ebau toggleworld §8[§7Player§8] §8- §7Editiere die Welt Rechte eines Spielers -BAU_UNKNOWN-PLAYER = §cUnbekannter Spieler -BAU_NO-PLAYER = §cDer Spieler ist kein Mitglied deiner Welt! -BAU_NO-WORLD = §cDies ist nicht deine Welt! +BAU_UNKNOWN_PLAYER = §cUnbekannter Spieler +BAU_NO_PLAYER = §cDer Spieler ist kein Mitglied deiner Welt! +BAU_NO_WORLD = §cDies ist nicht deine Welt! -BAU-INFO_ITEM_NAME = §eBau-Management +BAU_INFO_ITEM_NAME = §eBau-Management ## This is used in BauInfoBauGuiItem.java -BAU-INFO_ITEM_LORE-TNT = §7TNT§8: §e{0} -BAU-INFO_ITEM_LORE-FREEZE = §7Freeze§8: §e{0} -BAU-INFO_ITEM_LORE-DAMAGE = §7Damage§8: §e{0} -BAU-INFO_ITEM_LORE-FIRE = §7Feuer§8: §e{0} -BAU-INFO_ITEM_LORE-COLOR = §7Farbe§8: §e{0} -BAU-INFO_ITEM_LORE-PROTECT = §7Protect§8: §e{0} +BAU_INFO_ITEM_LORE_TNT = §7TNT§8: §e{0} +BAU_INFO_ITEM_LORE_FREEZE = §7Freeze§8: §e{0} +BAU_INFO_ITEM_LORE_DAMAGE = §7Damage§8: §e{0} +BAU_INFO_ITEM_LORE_FIRE = §7Feuer§8: §e{0} +BAU_INFO_ITEM_LORE_COLOR = §7Farbe§8: §e{0} +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,{2}§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 +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,{2}§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 # Countingwand COUNTINGWAND_COMMAND_HELP = §8/§ecountingwand §8- §7Gibt dir en CountingWand COUNTINGWAND_ITEM_NAME = §eZollstock COUNTINGWAND_ITEM_LORE1 = §eLinksklick §8- §7Setzt die 1. Position COUNTINGWAND_ITEM_LORE2 = §eRechtsklick §8- §7Setzt die 2. Position -COUNTINGWAND_MESSAGE_R-CLICK = §7Erste Position bei: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) -COUNTINGWAND_MESSAGE_L-CLICK = §7Zweite Position bei: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) +COUNTINGWAND_MESSAGE_RCLICK = §7Erste Position bei: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) +COUNTINGWAND_MESSAGE_LCLICK = §7Zweite Position bei: §8[§7{0}§8, §7{1}§8, §7{2}§8] ({3}§8) COUNTINGWAND_MESSAGE_DIMENSION = §e{0}§8, §e{1}§8, §e{2} # Detonator DETONATOR_LOC_REMOVE = §e{0} entfernt DETONATOR_LOC_ADD = §e{0} hinzugefügt DETONATOR_BUTTON_SWITCH=Hebel -DETONATOR_BUTTON_WOOD-Button=Knopf -DETONATOR_BUTTON_STONE-Button=Knopf -DETONATOR_BUTTON_PRESSURE-PLATE=Druckplatte -DETONATOR_BUTTON_WEIGHTED-PRESSURE-PLATE=Druckplatte +DETONATOR_BUTTON_WOOD_BUTTON=Knopf +DETONATOR_BUTTON_STONE_BUTTON=Knopf +DETONATOR_BUTTON_PRESSURE_PLATE=Druckplatte +DETONATOR_BUTTON_WEIGHTED-PRESSURE_PLATE=Druckplatte DETONATOR_BUTTON_TRIPWIRE=Tripwire DETONATOR_BUTTON_NOTEBLOCK=Noteblock DETONATOR_BUTTON_DAYLIGHTSENSOR=Tageslichtsensor @@ -196,11 +196,11 @@ HOTBAR_SAVED=§7Deine Hotbar wurde als Standard gespeichert HOTBAR_LOADED=§7Deine Standard Hotbar wurde geladen HOTBAR_INVENTORY=Standard Hotbar # GUI -GUI_EDITOR_ITEM-NAME=§eGui Editor +GUI_EDITOR_ITEM_NAME=§eGui Editor GUI_EXPORT_CODE=§eDein Gui-Code: -GUI_EXPORT_CODE-HOVER=§eKopieren -GUI_IMPORT_INVALID-CODE=§eInvalider Gui-Code -GUI_IMPORT_CODE-SUCCESSFUL=§eGui-Code eingelesen +GUI_EXPORT_CODE_HOVER=§eKopieren +GUI_IMPORT_INVALID_CODE=§eInvalider Gui-Code +GUI_IMPORT_CODE_SUCCESSFUL=§eGui-Code eingelesen GUI_NAME=Bau GUI GUI_NO_PERMISSION=§cDu hast nicht genug Rechte um dies zu tun GUI_NO_OWNER=§cDas ist nicht deine Bauwelt @@ -648,15 +648,15 @@ TPSLIMIT_INVALID_FROZEN = §c und '0' # Trace TRACE_RECORD=§aan -TRACE_RECORD-AUTO=§aan -TRACE_RECORD-SINGLE=§aan +TRACE_RECORD_AUTO=§aan +TRACE_RECORD_SINGLE=§aan TRACE_IDLE=§caus -TRACE_IDLE-AUTO=§eauto -TRACE_IDLE-SINGLE=§esingle -TRACE_MESSAGE-AUTO_RECORD=§cTNT-Tracer muss gestoppt werden -TRACE_MESSAGE-AUTO_RECORD-AUTO=§cTNT-Tracer darf nicht aufnehmen -TRACE_MESSAGE-AUTO_IDLE=§cAuto-Tracer gestoppt -TRACE_MESSAGE-AUTO_IDLE-AUTO = §aAuto-Tracer gestartet +TRACE_IDLE_AUTO=§eauto +TRACE_IDLE_SINGLE=§esingle +TRACE_MESSAGE_AUTO_RECORD=§cTNT-Tracer muss gestoppt werden +TRACE_MESSAGE_AUTO_RECORD_AUTO=§cTNT-Tracer darf nicht aufnehmen +TRACE_MESSAGE_AUTO_IDLE=§cAuto-Tracer gestoppt +TRACE_MESSAGE_AUTO_IDLE_AUTO = §aAuto-Tracer gestartet TRACE_MESSAGE_START = §aTNT-Tracer gestartet TRACE_MESSAGE_SINGLE = §aSingle-Tracer gestartet TRACE_MESSAGE_STOP = §cTNT-Tracer gestoppt @@ -677,12 +677,12 @@ TRACE_COMMAND_HELP_LIST = §8/§etrace list §8- §7Trace GUI nur im Chat 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 -TRACE_GUI_TRACE-ACTIVE = §eTracer Stoppen -TRACE_GUI_TRACE-ACTIVE-AUTO = §eAuto-Trace ist Aktiv -TRACE_GUI_AUTO-TRACE-INACTIVE = §eAuto-Tracer Aktivieren -TRACE_GUI_AUTO-TRACE-ACTIVE = §eAuto-Tracer Deaktivieren -TRACE_GUI_SHOW-GUI = §eTrace Show Gui +TRACE_GUI_TRACE_INACTIVE = §eTracer Starten +TRACE_GUI_TRACE_ACTIVE = §eTracer Stoppen +TRACE_GUI_TRACE_ACTIVE_AUTO = §eAuto-Trace ist Aktiv +TRACE_GUI_AUTO_TRACE_INACTIVE = §eAuto-Tracer Aktivieren +TRACE_GUI_AUTO_TRACE_ACTIVE = §eAuto-Tracer Deaktivieren +TRACE_GUI_SHOW_GUI = §eTrace Show Gui TRACE_GUI_DELETE = §eTrace Löschen TRACE_SHOW_GUI_TITLE = Trace Show GUI @@ -691,12 +691,12 @@ TRACE_SHOW_GUI_HIDDEN = §cTraces ausgeblendet TRACE_SHOW_GUI_WATER_ITEM = §eWasser §7Positionen TRACE_SHOW_GUI_WATER_LORE1 = §7Zeigt alles TNT, welches TRACE_SHOW_GUI_WATER_LORE2 = §7im Wasser explodiert ist. -TRACE_SHOW_GUI_INTERPOLATE-Y_ITEM = §eInterpolation §7Y-Achse -TRACE_SHOW_GUI_INTERPOLATE-Y_LORE1 = §7Zeigt die Interpolation -TRACE_SHOW_GUI_INTERPOLATE-Y_LORE2 = §7auf der Y-Achse. -TRACE_SHOW_GUI_INTERPOLATE-XZ_ITEM = §eInterpolation §7XZ-Achse -TRACE_SHOW_GUI_INTERPOLATE-XZ_LORE1 = §7Zeigt die Interpolation -TRACE_SHOW_GUI_INTERPOLATE-XZ_LORE2 = §7auf der XZ-Achse. +TRACE_SHOW_GUI_INTERPOLATE_Y_ITEM = §eInterpolation §7Y-Achse +TRACE_SHOW_GUI_INTERPOLATE_Y_LORE1 = §7Zeigt die Interpolation +TRACE_SHOW_GUI_INTERPOLATE_Y_LORE2 = §7auf der Y-Achse. +TRACE_SHOW_GUI_INTERPOLATE_XZ_ITEM = §eInterpolation §7XZ-Achse +TRACE_SHOW_GUI_INTERPOLATE_XZ_LORE1 = §7Zeigt die Interpolation +TRACE_SHOW_GUI_INTERPOLATE_XZ_LORE2 = §7auf der XZ-Achse. TRACE_GUI_TITLE = Trace GUI TRACE_GUI_ITEM_BACK = §eBack @@ -739,14 +739,14 @@ LOADER_PAUSE = §7Pause LOADER_END = §8Finished LOADER_MESSAGE_CLEAR = §7Loader gecleart -LOADER_MESSAGE_CLEAR-HELP = §cDu must im Setup-Modus sein um den Loader zu clearen +LOADER_MESSAGE_CLEAR_HELP = §cDu must im Setup-Modus sein um den Loader zu clearen LOADER_MESSAGE_TNT = §eTNT hinzugefügt {0} LOADER_MESSAGE_INTERACT = §e{0} hinzugefügt {1} LOADER_BUTTON_SWITCH=Hebel -LOADER_BUTTON_WOOD-Button=Knopf -LOADER_BUTTON_STONE-Button=Knopf -LOADER_BUTTON_PRESSURE-PLATE=Druckplatte -LOADER_BUTTON_WEIGHTED-PRESSURE-PLATE=Druckplatte +LOADER_BUTTON_WOOD_BUTTON=Knopf +LOADER_BUTTON_STONE_BUTTON=Knopf +LOADER_BUTTON_PRESSURE_PLATE=Druckplatte +LOADER_BUTTON_WEIGHTED_PRESSURE_PLATE=Druckplatte LOADER_BUTTON_TRIPWIRE=Tripwire LOADER_BUTTON_NOTEBLOCK=Noteblock LOADER_BUTTON_DAYLIGHTSENSOR=Tageslichtsensor @@ -826,12 +826,12 @@ OBSERVER_ENABLE = §7Observer Trace gestartet OBSERVER_DISABLE = §7Observer Trace gestoppt OBSERVER_DELETE = §7Observer Trace gelöscht OBSERVER_RETRACE_DONE = §7Observer Trace neu berechnet -OBSERVER_RETRACE_NO-TRACE = §7Kein Observer Trace zum neu berechnen +OBSERVER_RETRACE_NO_TRACE = §7Kein Observer Trace zum neu berechnen # Other OTHER_ITEMS_TELEPORT_NAME=§eTeleporter -OTHER_ITEMS_TELEPORT_GUI-NAME=Teleportieren -OTHER_ITEMS_TELEPORT_PLAYER-OFFLINE=§cDer Spieler ist Offline +OTHER_ITEMS_TELEPORT_GUI_NAME=Teleportieren +OTHER_ITEMS_TELEPORT_PLAYER_OFFLINE=§cDer Spieler ist Offline OTHER_SLOT_INVALID_SLOT=§cInvalider Slot OTHER_NOCLIP_SLOT_INFO=§7Mit /slot kannst du den ausgewählten Slot ändern und einen anderen Block in den Slot nehmen. OTHER_NOCLIP_SLOT_HELP_PICK = §8/§eslot pick §8-§7 Lege den angeguckten Block ins Inventar @@ -865,18 +865,18 @@ OTHER_TPS_MESSAGE = §7 §e{0}§7 §e{1}§7 §e{2}§7 §e{3}§7 OTHER_TPS_SINGLE = §8TPS: §e{0} OTHER_WORLDSPAWN_HELP=§8/§eworldspawn §8-§e Teleportiere dich zum Spawn # DebugStick -DEBUG-STICK_COMMAND_HELP=§8/§edebugstick §8-§7 Erhalte einen DebugStick -DEBUG-STICK_NAME=§eDEBUGSTICK +DEBUG_STICK_COMMAND_HELP=§8/§edebugstick §8-§7 Erhalte einen DebugStick +DEBUG_STICK_NAME=§eDebugstick #Skull Gui -ANVIL-INV_NAME=Spieler name" +ANVIL_INV_NAME=Spieler name" # StructureVoid -STRUCTURE-VOID_COMMAND_HELP=§8/§estructureVoid §8-§7 Erhalte ein StructureVoid +STRUCTURE_VOID_COMMAND_HELP=§8/§estructureVoid §8-§7 Erhalte ein StructureVoid # NightVision -NIGHT-VISION_COMMAND_HELP=§8/§enightvision §8-§7 Schalte Nightvision an oder aus. -NIGHT-VISION_OFF=§eNightvision deaktiviert -NIGHT-VISION_ON=§eNightvision aktiviert -NIGHT_VISION_ITEM_ON:&Nightvision: &eAktiviert -NIGHT_VISION_ITEM_OFF:&Nightvision: &eDeaktiviert +NIGHT_VISION_COMMAND_HELP=§8/§enightvision §8-§7 Schalte Nightvision an oder aus. +NIGHT_VISION_OFF=§eNightvision deaktiviert +NIGHT_VISION_ON=§eNightvision aktiviert +NIGHT_VISION_ITEM_ON = &Nightvision: &eAktiviert +NIGHT_VISION_ITEM_OFF = &Nightvision: &eDeaktiviert #Navigation Wand NAVIGATION_WAND=&eNavigation Wand NAVIGATION_WAND_LEFT_CLICK="&eLeft click: jump to location" @@ -899,7 +899,7 @@ MATERIAL_SEARCH_BLASTRESISTANCE_MIN=§eBlast Resistance mindestens MATERIAL_SEARCH_BLASTRESISTANCE_MAX=§eBlast Resistance maximal MATERIAL_SEARCH_BLASTRESISTANCE_EXACT=§eBlast Resistance MATERIAL_SEARCH_VALUE=§8: §e{0} -MATERIAL_BLAST-RESISTANCE=§8- §eBlast Resistance§8: §7{0} +MATERIAL_BLAST_RESISTANCE=§8- §eBlast Resistance§8: §7{0} MATERIAL_HARDNESS=§8- §eHärte§8: §7{0} MATERIAL_TNT_BREAKABLE=§8- §eZerstörbar durch TNT MATERIAL_TNT_UNBREAKABLE=§8- §eNicht Zerstörbar durch TNT @@ -907,7 +907,7 @@ MATERIAL_TRANSPARENT=§8- §eTransparenter Block MATERIAL_SOLID=§8- §eSolider Block MATERIAL_GRAVITY=§8- §eFallender Block MATERIAL_OCCLUDING=§8- §eOccluding Block -MATERIAL_INTERACT-ABLE=§8- §eInterargierbarer Block +MATERIAL_INTERACTABLE=§8- §eInterargierbarer Block MATERIAL_FLAMMABLE=§8- §eFlammbarer Block MATERIAL_BURNABLE=§8- §eBrennbarer Block MATERIAL_WATERLOGGABLE=§8- §eWasserspeicherbarer Block diff --git a/BauSystem_Main/src/de/steamwar/bausystem/Permission.java b/BauSystem_Main/src/de/steamwar/bausystem/Permission.java index 70d7d2b5..8e31d4fd 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/Permission.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/Permission.java @@ -40,7 +40,7 @@ public enum Permission { }), WORLDEDIT(BauweltMember::isWorldEdit, (player, target) -> { target.setWorldEdit(!target.isWorldEdit()); - sendMessages(player, target.isWorldEdit(), target, "PERMISSION_WORLD-EDIT"); + sendMessages(player, target.isWorldEdit(), target, "PERMISSION_WORLD_EDIT"); }), MEMBER(bauweltMember -> true), OWNER(bauweltMember -> false); @@ -69,15 +69,15 @@ public enum Permission { Player targetPlayer = Bukkit.getPlayer(SteamwarUser.get(target.getMemberID()).getUUID()); if (targetPlayer != null) { if (ableTo) { - BauSystem.MESSAGE.send("PERMISSION_CHANGE_OTHER-ENABLE", targetPlayer, player.getName(), BauSystem.MESSAGE.parse(what, targetPlayer)); + BauSystem.MESSAGE.send("PERMISSION_CHANGE_OTHER_ENABLE", targetPlayer, player.getName(), BauSystem.MESSAGE.parse(what, targetPlayer)); } else { - BauSystem.MESSAGE.send("PERMISSION_CHANGE_OTHER-DISABLE", targetPlayer, player.getName(), BauSystem.MESSAGE.parse(what, targetPlayer)); + BauSystem.MESSAGE.send("PERMISSION_CHANGE_OTHER_DISABLE", targetPlayer, player.getName(), BauSystem.MESSAGE.parse(what, targetPlayer)); } } if (ableTo) { - BauSystem.MESSAGE.send("PERMISSION_CHANGE_YOU-ENABLE", player, BauSystem.MESSAGE.parse(what, player)); + BauSystem.MESSAGE.send("PERMISSION_CHANGE_YOU_ENABLE", player, BauSystem.MESSAGE.parse(what, player)); } else { - BauSystem.MESSAGE.send("PERMISSION_CHANGE_YOU-DISABLE", player, BauSystem.MESSAGE.parse(what, player)); + BauSystem.MESSAGE.send("PERMISSION_CHANGE_YOU_DISABLE", player, BauSystem.MESSAGE.parse(what, player)); } } 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 7b16da9d..c576d0ba 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java @@ -77,11 +77,11 @@ public class AutostartListener implements Listener { public void activate(Player player) { Region region = Region.getRegion(player.getLocation()); if (region.isGlobal()) { - BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO-REGION", player); + BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player); return; } if (!region.hasType(RegionType.TESTBLOCK)) { - BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO-REGION", player); + BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player); return; } if (regionStartTime.containsKey(region)) { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauCommand.java index 6b3f49de..c31940e1 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauCommand.java @@ -90,13 +90,13 @@ public class BauCommand extends SWCommand { private boolean negativeToggleCheck(Player p, SteamwarUser id) { if (id == null) { - BauSystem.MESSAGE.send("BAU_UNKNOWN-PLAYER", p); + BauSystem.MESSAGE.send("BAU_UNKNOWN_PLAYER", p); return true; } BauweltMember target = BauweltMember.getBauMember(bauServer.getOwnerID(), id.getId()); if (target == null) { - BauSystem.MESSAGE.send("BAU_NO-PLAYER", p); + BauSystem.MESSAGE.send("BAU_NO_PLAYER", p); return true; } return false; @@ -128,7 +128,7 @@ public class BauCommand extends SWCommand { Player p = (Player) commandSender; if (!bauServer.getOwner().equals(p.getUniqueId())) { if (guardCheckType != GuardCheckType.TAB_COMPLETE) { - BauSystem.MESSAGE.send("BAU_NO-WORLD", p); + BauSystem.MESSAGE.send("BAU_NO_WORLD", p); } return GuardResult.DENIED; } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java index 761d4aa0..dc2e7349 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java @@ -46,7 +46,7 @@ public class BauInfoBauGuiItem extends BauGuiItem { @Override public ItemStack getItem(Player player) { SWItem itemStack = SWItem.getPlayerSkull(SteamwarUser.get(BauServer.getInstance().getOwner()).getUserName()); - itemStack.setName(BauSystem.MESSAGE.parse("BAU-INFO_ITEM_NAME", player)); + itemStack.setName(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_NAME", player)); Region region = Region.getRegion(player.getLocation()); List stringList = new ArrayList<>(); for (Flag flag : Flag.getFlags()) { @@ -55,7 +55,7 @@ public class BauInfoBauGuiItem extends BauGuiItem { } Flag.Value value = region.get(flag); if (value != null) { - stringList.add(BauSystem.MESSAGE.parse("BAU-INFO_ITEM_LORE-" + flag.name(), player, BauSystem.MESSAGE.parse(value.getChatValue(), player))); + stringList.add(BauSystem.MESSAGE.parse("BAU-INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getChatValue(), player))); } } itemStack.setLore(stringList); 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 25fe55db..de23a4fb 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java @@ -30,7 +30,7 @@ public class InfoCommand extends SWCommand { @Register(help = true) public void genericHelp(Player p, String... args) { - BauSystem.MESSAGE.send("BAU-INFO_COMMAND_HELP", p); + BauSystem.MESSAGE.send("BAU_INFO_COMMAND_HELP", p); } @Register @@ -39,7 +39,7 @@ public class InfoCommand extends SWCommand { } public void sendBauInfo(Player p) { - BauSystem.MESSAGE.send("BAU-INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName()); + BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName()); Region region = Region.getRegion(p.getLocation()); for (Flag flag : Flag.getFlags()) { if (flag == Flag.PROTECT && region.getFloorLevel() == 0) { @@ -47,25 +47,25 @@ public class InfoCommand extends SWCommand { } Flag.Value value = region.get(flag); if (value != null) { - BauSystem.MESSAGE.send("BAU-INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getChatValue(), p)); + BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getChatValue(), p)); } } List members = BauweltMember.getMembers(bauServer.getOwnerID()); StringBuilder membermessage = new StringBuilder(); - membermessage.append(BauSystem.MESSAGE.parsePrefixed("BAU-INFO_COMMAND_MEMBER", p)); + membermessage.append(BauSystem.MESSAGE.parsePrefixed("BAU_INFO_COMMAND_MEMBER", p)); for (BauweltMember member : members) { - membermessage.append(BauSystem.MESSAGE.parse("BAU-INFO_MEMBER_INFO", p, + membermessage.append(BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_INFO", p, SteamwarUser.get(member.getMemberID()).getUserName(), - 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) + 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()); StringBuilder tpsMessage = new StringBuilder(); - tpsMessage.append(BauSystem.MESSAGE.parsePrefixed("BAU-INFO_COMMAND_TPS", p)); + tpsMessage.append(BauSystem.MESSAGE.parsePrefixed("BAU_INFO_COMMAND_TPS", p)); tpsMessage.append(" ").append(getTps(TPSWatcher.TPSType.ONE_SECOND)); tpsMessage.append(" ").append(getTps(TPSWatcher.TPSType.TEN_SECONDS)); if (!TPSWarpUtils.isWarping()) { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java index 4d09437e..e22fb958 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java @@ -71,9 +71,9 @@ public class Countingwand { if (newPos) { String dimension = getDimensions(p, selection.getKey(), selection.getValue()); if (pos1) { - BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_R-CLICK", p, point.getX(), point.getY(), point.getZ(), dimension); + BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_RCLICK", p, point.getX(), point.getY(), point.getZ(), dimension); } else { - BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_L-CLICK", p, point.getX(), point.getY(), point.getZ(), dimension); + BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_LCLICK", p, point.getX(), point.getY(), point.getZ(), dimension); } } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java index 16a16904..4f24fcd5 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java @@ -61,7 +61,7 @@ public class BauGUICommand extends SWCommand { TextComponent component = new TextComponent(); component.setColor(ColorConfig.HIGHLIGHT); component.setBold(true); - component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(BauSystem.MESSAGE.parse("GUI_EXPORT_CODE-HOVER", p)))); + component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(BauSystem.MESSAGE.parse("GUI_EXPORT_CODE_HOVER", p)))); component.setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, export)); component.setText(export); BauSystem.MESSAGE.send("GUI_EXPORT_CODE", p); @@ -72,11 +72,11 @@ public class BauGUICommand extends SWCommand { public void importGui(Player p, String code) { try { if (BauGuiImportExport.importGui(code, p)) { - BauSystem.MESSAGE.send("GUI_IMPORT_CODE-SUCCESSFUL", p); + BauSystem.MESSAGE.send("GUI_IMPORT_CODE_SUCCESSFUL", p); } } catch (Exception e) { e.printStackTrace(); - BauSystem.MESSAGE.send("GUI_IMPORT_INVALID-CODE", p); + BauSystem.MESSAGE.send("GUI_IMPORT_INVALID_CODE", p); } } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java index 24797e67..56eb6d8f 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java @@ -44,7 +44,7 @@ public class BauGuiEditorGuiItem extends BauGuiItem { @Override public ItemStack getItem(Player player) { - return new SWItem(Material.IRON_PICKAXE, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM-NAME", player)).getItemStack(); + return new SWItem(Material.IRON_PICKAXE, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_NAME", player)).getItemStack(); } @Override diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiImportExport.java b/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiImportExport.java index b454498d..cba3307f 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiImportExport.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiImportExport.java @@ -104,12 +104,12 @@ public class BauGuiImportExport { append(st, Integer.toBinaryString(b & 0xFF), 8); } if (!st.substring(0, 5).equals(VERSION)) { - BauSystem.MESSAGE.send("GUI_IMPORT_INVALID-CODE", p); + BauSystem.MESSAGE.send("GUI_IMPORT_INVALID_CODE", p); return false; } int size = Integer.parseInt(st.substring(5, 8), 2); if (size <= 0 || size > 5) { - BauSystem.MESSAGE.send("GUI_IMPORT_INVALID-CODE", p); + BauSystem.MESSAGE.send("GUI_IMPORT_INVALID_CODE", p); return false; } size *= 9; @@ -153,7 +153,7 @@ public class BauGuiImportExport { s = s.substring(1); int itemID = Integer.parseInt(s, 2); if (!BauGUI.getITEMS().containsKey(itemID)) { - BauSystem.MESSAGE.send("GUI_IMPORT_INVALID-CODE", p); + BauSystem.MESSAGE.send("GUI_IMPORT_INVALID_CODE", p); return false; } map.put(itemID, currentIndex); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java index ae983351..01e81be5 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java @@ -118,7 +118,7 @@ public class Loader implements Listener { actions.clear(); BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR", p); } else { - BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR-HELP", p); + BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR_HELP", p); } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java index 331954b3..e5e74171 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java @@ -29,10 +29,10 @@ import org.bukkit.block.Block; @Getter public enum LoaderButton { SWITCH(0, true, "LOADER_BUTTON_SWITCH"), - WOOD_BUTTON(30, "LOADER_BUTTON_WOOD-Button"), - STONE_BUTTON(20, "LOADER_BUTTON_STONE-Button"), - PRESSURE_PLATE(30, "LOADER_BUTTON_PRESSURE-PLATE"), - WEIGHTED_PRESSURE_PLATE(20, "LOADER_BUTTON_WEIGHTED-PRESSURE-PLATE"), + WOOD_BUTTON(30, "LOADER_BUTTON_WOOD_BUTTON"), + STONE_BUTTON(20, "LOADER_BUTTON_STONE_BUTTON"), + PRESSURE_PLATE(30, "LOADER_BUTTON_PRESSURE_PLATE"), + WEIGHTED_PRESSURE_PLATE(20, "LOADER_BUTTON_WEIGHTED_PRESSURE_PLATE"), TRIPWIRE(30, "LOADER_BUTTON_TRIPWIRE"), NOTEBLOCK(1, "LOADER_BUTTON_NOTEBLOCK"), DAYLIGHTSENSOR(0, true, "LOADER_BUTTON_DAYLIGHTSENSOR"), diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java index cdd95026..76d99616 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java @@ -55,7 +55,7 @@ public class ObserverTracerCommand extends SWCommand { @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE") public void retrace(Player p) { if (ObserverTracerListener.observerTracerMap.containsKey(p)) { - BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO-TRACE", p); + BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p); return; } ObserverTracerListener.observerTracerMap.get(p).trace(); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/items/TeleportBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/other/items/TeleportBauGuiItem.java index 6b6e3e97..e0df2221 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/items/TeleportBauGuiItem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/other/items/TeleportBauGuiItem.java @@ -49,10 +49,10 @@ public class TeleportBauGuiItem extends BauGuiItem { @Override public boolean click(ClickType click, Player p) { p.closeInventory(); - SWListInv inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("OTHER_ITEMS_TELEPORT_GUI-NAME", p), SWListInv.createPlayerList(p.getUniqueId()), (clickType, o) -> { + SWListInv inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("OTHER_ITEMS_TELEPORT_GUI_NAME", p), SWListInv.createPlayerList(p.getUniqueId()), (clickType, o) -> { Player t = Bukkit.getPlayer(o); if (t == null) { - BauSystem.MESSAGE.send("OTHER_ITEMS_TELEPORT_PLAYER-OFFLINE", p); + BauSystem.MESSAGE.send("OTHER_ITEMS_TELEPORT_PLAYER_OFFLINE", p); } else { p.performCommand("tp " + t.getName()); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java index c2e6d952..0ba6eb48 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java @@ -55,36 +55,36 @@ public class TracerBauGuiItem extends BauGuiItem { SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("TRACE_GUI_NAME", p)); if (status.isTracing()) { if (status.isAutoTrace()) { - inv.setItem(1, new SWItem(Material.GRAY_DYE, BauSystem.MESSAGE.parse("TRACE_GUI_TRACE-ACTIVE-AUTO", p))); + inv.setItem(1, new SWItem(Material.GRAY_DYE, BauSystem.MESSAGE.parse("TRACE_GUI_TRACE_ACTIVE_AUTO", p))); } else { - inv.setItem(1, new SWItem(Material.GREEN_DYE, BauSystem.MESSAGE.parse("TRACE_GUI_TRACE-ACTIVE", p), clickType -> { + inv.setItem(1, new SWItem(Material.GREEN_DYE, BauSystem.MESSAGE.parse("TRACE_GUI_TRACE_ACTIVE", p), clickType -> { p.performCommand("trace stop"); open(p); })); } } else { - inv.setItem(1, new SWItem(Material.RED_DYE, BauSystem.MESSAGE.parse("TRACE_GUI_TRACE-INACTIVE", p), clickType -> { + inv.setItem(1, new SWItem(Material.RED_DYE, BauSystem.MESSAGE.parse("TRACE_GUI_TRACE_INACTIVE", p), clickType -> { p.performCommand("trace start"); open(p); })); } if (status.isAutoTrace()) { - inv.setItem(3, new SWItem(Material.ENDER_EYE, BauSystem.MESSAGE.parse("TRACE_GUI_AUTO-TRACE-ACTIVE", p), clickType -> { + inv.setItem(3, new SWItem(Material.ENDER_EYE, BauSystem.MESSAGE.parse("TRACE_GUI_AUTO_TRACE_ACTIVE", p), clickType -> { p.performCommand("trace auto"); open(p); })); } else { - inv.setItem(3, new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("TRACE_GUI_AUTO-TRACE-INACTIVE", p), clickType -> { + inv.setItem(3, new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("TRACE_GUI_AUTO_TRACE_INACTIVE", p), clickType -> { p.performCommand("trace auto"); open(p); })); } if (TraceShowManager.hasActiveShow(p)) { - inv.setItem(5, new SWItem(Material.TNT, BauSystem.MESSAGE.parse("TRACE_GUI_SHOW-GUI", p), clickType -> { + inv.setItem(5, new SWItem(Material.TNT, BauSystem.MESSAGE.parse("TRACE_GUI_SHOW_GUI", p), clickType -> { p.performCommand("trace show gui"); })); } else { - inv.setItem(5, new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("TRACE_GUI_SHOW-GUI", p), clickType -> { + inv.setItem(5, new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("TRACE_GUI_SHOW_GUI", p), clickType -> { p.performCommand("trace show gui"); })); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/gui/TraceShowGui.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/gui/TraceShowGui.java index 8d3da073..d3eea803 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/gui/TraceShowGui.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/gui/TraceShowGui.java @@ -56,13 +56,13 @@ public class TraceShowGui { swInventory.setItem(5, water); swInventory.setCallback(5, clickType -> toggleHideTNTinWaterExploded(player, swInventory, water)); - SWItem interpolateY = new SWItem(Material.QUARTZ_STAIRS, BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE-Y_ITEM", player), Arrays.asList(BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE-Y_LORE1", player), BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE-Y_LORE2", player)), false, clickType -> { + SWItem interpolateY = new SWItem(Material.QUARTZ_STAIRS, BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE_Y_ITEM", player), Arrays.asList(BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE_Y_LORE1", player), BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE_Y_LORE2", player)), false, clickType -> { }); swInventory.setItem(6, interpolateY); swInventory.setCallback(6, clickType -> toggleInterpolateYPosition(player, swInventory, interpolateY)); Material xzMaterial = VersionedCallable.call(new VersionedCallable<>(TNTTracer_15::getTraceXZMaterial, 14)); - SWItem interpolateXZ = new SWItem(xzMaterial, (byte) 7, BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE-XZ_ITEM", player), Arrays.asList(BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE-XZ_LORE1", player), BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE-XZ_LORE2", player)), false, clickType -> { + SWItem interpolateXZ = new SWItem(xzMaterial, (byte) 7, BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE_XZ_ITEM", player), Arrays.asList(BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE_XZ_LORE1", player), BauSystem.MESSAGE.parse("TRACE_SHOW_GUI_INTERPOLATE_XZ_LORE2", player)), false, clickType -> { }); swInventory.setItem(7, interpolateXZ); swInventory.setCallback(7, clickType -> toggleInterpolateXZPosition(player, swInventory, interpolateXZ)); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/record/RecordStatus.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/record/RecordStatus.java index e1198b11..6452571c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/record/RecordStatus.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/record/RecordStatus.java @@ -21,12 +21,12 @@ package de.steamwar.bausystem.features.tracer.record; public enum RecordStatus { - RECORD("TRACE_RECORD", true, "TRACE_MESSAGE-AUTO_RECORD"), - RECORD_AUTO("TRACE_RECORD-AUTO", true, "TRACE_MESSAGE-AUTO_RECORD-AUTO"), - RECORD_SINGLE("TRACE_RECORD-SINGLE", true, ""), - IDLE("TRACE_IDLE", false, "TRACE_MESSAGE-AUTO_IDLE"), - IDLE_AUTO("TRACE_IDLE-AUTO", false, "TRACE_MESSAGE-AUTO_IDLE-AUTO"), - IDLE_SINGLE("TRACE_IDLE-SINGLE", false, ""); + RECORD("TRACE_RECORD", true, "TRACE_MESSAGE_AUTO_RECORD"), + RECORD_AUTO("TRACE_RECORD_AUTO", true, "TRACE_MESSAGE_AUTO_RECORD_AUTO"), + RECORD_SINGLE("TRACE_RECORD_SINGLE", true, ""), + IDLE("TRACE_IDLE", false, "TRACE_MESSAGE_AUTO_IDLE"), + IDLE_AUTO("TRACE_IDLE_AUTO", false, "TRACE_MESSAGE_AUTO_IDLE_AUTO"), + IDLE_SINGLE("TRACE_IDLE_SINGLE", false, ""); String name; boolean tracing; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java index 3b5f0079..d7f7ab4e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java @@ -34,7 +34,7 @@ public class DebugStickCommand extends SWCommand { super("debugstick"); } - @Register(description = "DEBUG-STICK_COMMAND_HELP") + @Register(description = "DEBUG_STICK_COMMAND_HELP") public void genericCommand(Player p) { SWUtils.giveItemToPlayer(p, new ItemStack(Material.DEBUG_STICK)); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java index 8b466194..393367ed 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java @@ -108,7 +108,7 @@ public class MaterialCommand extends SWCommand implements Listener { public SWListInv.SWListEntry toSWItem(Player p) { List lore = new ArrayList<>(); - lore.add(BauSystem.MESSAGE.parse("MATERIAL_BLAST-RESISTANCE", p, blastResistance)); + lore.add(BauSystem.MESSAGE.parse("MATERIAL_BLAST_RESISTANCE", p, blastResistance)); lore.add(BauSystem.MESSAGE.parse(blastResistance > 9 ? "MATERIAL_TNT_UNBREAKABLE" : "MATERIAL_TNT_BREAKABLE", p)); lore.add(BauSystem.MESSAGE.parse("MATERIAL_HARDNESS", p, hardness)); if (transparent) { @@ -124,7 +124,7 @@ public class MaterialCommand extends SWCommand implements Listener { lore.add(BauSystem.MESSAGE.parse("MATERIAL_OCCLUDING", p)); } if (interacteable) { - lore.add(BauSystem.MESSAGE.parse("MATERIAL_INTERACT-ABLE", p)); + lore.add(BauSystem.MESSAGE.parse("MATERIAL_INTERACTABLE", p)); } if (flammable) { lore.add(BauSystem.MESSAGE.parse("MATERIAL_FLAMMABLE", p)); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java index 245d561a..f1178df1 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java @@ -39,10 +39,10 @@ public class NightVisionCommand extends SWCommand { public void genericCommand(Player p) { if (p.hasPotionEffect(PotionEffectType.NIGHT_VISION)) { p.removePotionEffect(PotionEffectType.NIGHT_VISION); - BauSystem.MESSAGE.sendPrefixless("NIGHT-VISION_OFF", p, ChatMessageType.ACTION_BAR); + BauSystem.MESSAGE.sendPrefixless("NIGHT_VISION_OFF", p, ChatMessageType.ACTION_BAR); return; } p.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, 1000000, 255, false, false)); - BauSystem.MESSAGE.sendPrefixless("NIGHT-VISION_ON", p, ChatMessageType.ACTION_BAR); + BauSystem.MESSAGE.sendPrefixless("NIGHT_VISION_ON", p, ChatMessageType.ACTION_BAR); } } \ No newline at end of file diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java index 3202fe2d..d16a6577 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java @@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.util.items; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.Permission; -import de.steamwar.bausystem.config.ColorConfig; import de.steamwar.bausystem.linkage.specific.BauGuiItem; import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.Linked; @@ -40,7 +39,7 @@ public class DebugstickBauGuiItem extends BauGuiItem { @Override public ItemStack getItem(Player player) { - return new SWItem(Material.DEBUG_STICK, BauSystem.MESSAGE.parse("DEBUG-STICK_NAME", player)).getItemStack(); + return new SWItem(Material.DEBUG_STICK, BauSystem.MESSAGE.parse("DEBUG_STICK_NAME", player)).getItemStack(); } @Override diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java index 228a4a7b..879a226e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java @@ -47,7 +47,7 @@ public class SkullBauGuiItem extends BauGuiItem { @Override public boolean click(ClickType click, Player p) { p.closeInventory(); - SWAnvilInv inv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("ANVIL-INV_NAME",p)); + SWAnvilInv inv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("ANVIL_INV_NAME",p)); inv.setItem(Material.NAME_TAG); inv.setCallback(s -> p.performCommand("skull " + s)); inv.open(); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java index fac8b572..6902a2fb 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java @@ -30,12 +30,12 @@ public enum ColorMode implements Flag.Value { WHITE("FLAG_COLOR_WHITE", Color.WHITE), ORANGE("FLAG_COLOR_ORANGE", Color.ORANGE), MAGENTA("FLAG_COLOR_MAGENTA", Color.MAGENTA), - LIGHT_BLUE("FLAG_COLOR_LIGHT-BLUE", Color.LIGHT_BLUE), + LIGHT_BLUE("FLAG_COLOR_LIGHT_BLUE", Color.LIGHT_BLUE), YELLOW("FLAG_COLOR_YELLOW", Color.YELLOW), LIME("FLAG_COLOR_LIME", Color.LIME), PINK("FLAG_COLOR_PINK", Color.PINK), GRAY("FLAG_COLOR_GRAY", Color.GRAY), - LIGHT_GRAY("FLAG_COLOR_LIGHT-GRAY", Color.LIGHT_GRAY), + LIGHT_GRAY("FLAG_COLOR_LIGHT_GRAY", Color.LIGHT_GRAY), CYAN("FLAG_COLOR_CYAN", Color.CYAN), PURPLE("FLAG_COLOR_PURPLE", Color.PURPLE), BLUE("FLAG_COLOR_BLUE", Color.BLUE), diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java index 63a865a7..f6f2706d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java @@ -29,7 +29,7 @@ public enum TNTMode implements Flag.Value { ALLOW("FLAG_TNT_ALLOW"), DENY("FLAG_TNT_DENY"), - ONLY_TB("FLAG_TNT_ONLY-TB"); + ONLY_TB("FLAG_TNT_ONLY_TB"); private static TNTMode[] values; private final String chatValue;