SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
Archiviert
12
0
Fork 0
Code Issues 39 Pull-Requests Projekte Releases Wiki Aktivität

Merge pull request 'Translatable' (#62) from Translatable into master
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details

Quellcode durchsuchen 
Reviewed-on: #62
Dieser Commit ist enthalten in:
YoyoNow 2021-12-27 16:38:13 +01:00
Commit e34ab37cb8
42 geänderte Dateien mit 388 neuen und 429 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
BauSystem_API/src/de/steamwar/bausystem/features/detonator/Detoblock.java
Datei anzeigen

@ -28,10 +28,10 @@ import lombok.RequiredArgsConstructor;
@Getter @Getter
public enum Detoblock { public enum Detoblock {
SWITCH(0, true, "DETONATOR_BUTTON_SWITCH"), SWITCH(0, true, "DETONATOR_BUTTON_SWITCH"),
WOOD_BUTTON(30, "DETONATOR_BUTTON_WOOD-Button"), WOOD_BUTTON(30, "DETONATOR_BUTTON_WOOD_BUTTON"),
STONE_BUTTON(20, "DETONATOR_BUTTON_STONE-Button"), STONE_BUTTON(20, "DETONATOR_BUTTON_STONE_BUTTON"),
PRESSURE_PLATE(30, "DETONATOR_BUTTON_PRESSURE-PLATE"), PRESSURE_PLATE(30, "DETONATOR_BUTTON_PRESSURE_PLATE"),
WEIGHTED_PRESSURE_PLATE(20, "DETONATOR_BUTTON_WEIGHTED-PRESSURE-PLATE"), WEIGHTED_PRESSURE_PLATE(20, "DETONATOR_BUTTON_WEIGHTED-PRESSURE_PLATE"),
TRIPWIRE(30, "DETONATOR_BUTTON_TRIPWIRE"), TRIPWIRE(30, "DETONATOR_BUTTON_TRIPWIRE"),
NOTEBLOCK(1, "DETONATOR_BUTTON_NOTEBLOCK"), NOTEBLOCK(1, "DETONATOR_BUTTON_NOTEBLOCK"),
DAYLIGHTSENSOR(0, true, "DETONATOR_BUTTON_DAYLIGHTSENSOR"), DAYLIGHTSENSOR(0, true, "DETONATOR_BUTTON_DAYLIGHTSENSOR"),

223
BauSystem_Main/src/BauSystem.properties
Datei anzeigen

@ -29,11 +29,11 @@ LIST_NEXT_PAGE=§eNächste Seite
# Permission # Permission
PERMISSION_WORLD = Einstellungen vornehmen PERMISSION_WORLD = Einstellungen vornehmen
PERMISSION_WORLD-EDIT = WorldEdit verwenden PERMISSION_WORLD_EDIT = WorldEdit verwenden
PERMISSION_CHANGE_YOU-ENABLE = §aDer Spieler darf nun {0} PERMISSION_CHANGE_YOU_ENABLE = §aDer Spieler darf nun {0}
PERMISSION_CHANGE_YOU-DISABLE = §cDer Spieler darf nun nicht mehr {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_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_CHANGE_OTHER_DISABLE = §cDu kannst nun nicht mehr auf der Welt von §6{0} §c{1}
# Scoreboard # Scoreboard
SCOREBOARD_TIME = Uhrzeit SCOREBOARD_TIME = Uhrzeit
@ -64,7 +64,7 @@ FLAG_PROTECT_INACTIVE = §caus
FLAG_TNT_ALLOW = §aan FLAG_TNT_ALLOW = §aan
FLAG_TNT_DENY = §caus FLAG_TNT_DENY = §caus
FLAG_TNT_ONLY-TB = §7Kein §eBaurahmen FLAG_TNT_ONLY_TB = §7Kein §eBaurahmen
FLAG_DAMAGE_ALLOW = §aan FLAG_DAMAGE_ALLOW = §aan
FLAG_DAMAGE_DENY = §caus FLAG_DAMAGE_DENY = §caus
@ -72,13 +72,13 @@ FLAG_DAMAGE_DENY = §caus
FLAG_COLOR_WHITE = §fWeiß FLAG_COLOR_WHITE = §fWeiß
FLAG_COLOR_ORANGE = §6Orange FLAG_COLOR_ORANGE = §6Orange
FLAG_COLOR_MAGENTA = §dMagenta FLAG_COLOR_MAGENTA = §dMagenta
FLAG_COLOR_LIGHT-BLUE = §bHellblau FLAG_COLOR_LIGHT_BLUE = §bHellblau
FLAG_COLOR_YELLOW = §eGelb FLAG_COLOR_YELLOW = §eGelb
FLAG_COLOR_LIME = §aHellgrün FLAG_COLOR_LIME = §aHellgrün
## This cannot be converted ## This cannot be converted
FLAG_COLOR_PINK = §ePink FLAG_COLOR_PINK = §ePink
FLAG_COLOR_GRAY = §8Grau FLAG_COLOR_GRAY = §8Grau
FLAG_COLOR_LIGHT-GRAY = §7Hellgrau FLAG_COLOR_LIGHT_GRAY = §7Hellgrau
FLAG_COLOR_CYAN = §3Cyan FLAG_COLOR_CYAN = §3Cyan
FLAG_COLOR_PURPLE = §5Lila FLAG_COLOR_PURPLE = §5Lila
FLAG_COLOR_BLUE = §1Blau FLAG_COLOR_BLUE = §1Blau
@ -97,7 +97,7 @@ REGION_TYPE_ONLY_TB = Testblock
AUTOSTART_COMMAND_HELP = §8/§etimer §8- §7Legt den AutostartTimer ins Inventar AUTOSTART_COMMAND_HELP = §8/§etimer §8- §7Legt den AutostartTimer ins Inventar
AUTOSTART_ITEM_NAME = §eAutostartTimer AUTOSTART_ITEM_NAME = §eAutostartTimer
AUTOSTART_ITEM_LORE = §eRechtsklick Block §8- §7Starte den Timer 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_RESET = §eDer AutostartTimer wurde zurückgesetzt
AUTOSTART_MESSAGE_START = §eAutostartTimer gestartet AUTOSTART_MESSAGE_START = §eAutostartTimer gestartet
AUTOSTART_MESSAGE_RESULT1 = §eZeit §7bis zur §eExplosion §7am Gegner§8:§e {0} AUTOSTART_MESSAGE_RESULT1 = §eZeit §7bis zur §eExplosion §7am Gegner§8:§e {0}
@ -127,47 +127,47 @@ BACKUP_LORE=§eKlicken zum Laden
BAU_COMMAND_HELP_INFO = §8/§ebau info §8- §7Alias für §8/§ebauinfo 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_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_COMMAND_HELP_TOGGLEWORLD = §8/§ebau toggleworld §8[§7Player§8] §8- §7Editiere die Welt Rechte eines Spielers
BAU_UNKNOWN-PLAYER = §cUnbekannter Spieler BAU_UNKNOWN_PLAYER = §cUnbekannter Spieler
BAU_NO-PLAYER = §cDer Spieler ist kein Mitglied deiner Welt! BAU_NO_PLAYER = §cDer Spieler ist kein Mitglied deiner Welt!
BAU_NO-WORLD = §cDies ist nicht deine 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 ## This is used in BauInfoBauGuiItem.java
BAU-INFO_ITEM_LORE-TNT = §7TNT§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_FREEZE = §7Freeze§8: §e{0}
BAU-INFO_ITEM_LORE-DAMAGE = §7Damage§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_FIRE = §7Feuer§8: §e{0}
BAU-INFO_ITEM_LORE-COLOR = §7Farbe§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_PROTECT = §7Protect§8: §e{0}
BAU-INFO_COMMAND_HELP = §8/§ebauinfo §8- §7Gibt Informationen über den Bau BAU_INFO_COMMAND_HELP = §8/§ebauinfo §8- §7Gibt Informationen über den Bau
BAU-INFO_COMMAND_OWNER = §7Besitzer: §e{0} BAU_INFO_COMMAND_OWNER = §7Besitzer: §e{0}
BAU-INFO_COMMAND_MEMBER = §7Mitglieder: §e BAU_INFO_COMMAND_MEMBER = §7Mitglieder: §e
BAU-INFO_MEMBER_INFO = §e{0}§8[{1}§8,{2}§8] §8 BAU_INFO_MEMBER_INFO = §e{0}§8[{1}§8,{2}§8] §8
BAU-INFO_MEMBER_WE_ALLOW = §aWE BAU_INFO_MEMBER_WE_ALLOW = §aWE
BAU-INFO_MEMBER_WE_DISALLOW = §cWE BAU_INFO_MEMBER_WE_DISALLOW = §cWE
BAU-INFO_MEMBER_WORLD_ALLOW = §aW BAU_INFO_MEMBER_WORLD_ALLOW = §aW
BAU-INFO_MEMBER_WORLD_DISALLOW = §cW BAU_INFO_MEMBER_WORLD_DISALLOW = §cW
BAU-INFO_COMMAND_FLAG = §e{0} §8: §7{1} BAU_INFO_COMMAND_FLAG = §e{0} §8: §7{1}
BAU-INFO_COMMAND_TPS = TPS:§e BAU_INFO_COMMAND_TPS = TPS:§e
# Countingwand # Countingwand
COUNTINGWAND_COMMAND_HELP = §8/§ecountingwand §8- §7Gibt dir en CountingWand COUNTINGWAND_COMMAND_HELP = §8/§ecountingwand §8- §7Gibt dir en CountingWand
COUNTINGWAND_ITEM_NAME = §eZollstock COUNTINGWAND_ITEM_NAME = §eZollstock
COUNTINGWAND_ITEM_LORE1 = §eLinksklick §8- §7Setzt die 1. Position COUNTINGWAND_ITEM_LORE1 = §eLinksklick §8- §7Setzt die 1. Position
COUNTINGWAND_ITEM_LORE2 = §eRechtsklick §8- §7Setzt die 2. 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_RCLICK = §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_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} COUNTINGWAND_MESSAGE_DIMENSION = §e{0}§8, §e{1}§8, §e{2}
# Detonator # Detonator
DETONATOR_LOC_REMOVE = §e{0} entfernt DETONATOR_LOC_REMOVE = §e{0} entfernt
DETONATOR_LOC_ADD = §e{0} hinzugefügt DETONATOR_LOC_ADD = §e{0} hinzugefügt
DETONATOR_BUTTON_SWITCH=Hebel DETONATOR_BUTTON_SWITCH=Hebel
DETONATOR_BUTTON_WOOD-Button=Knopf DETONATOR_BUTTON_WOOD_BUTTON=Knopf
DETONATOR_BUTTON_STONE-Button=Knopf DETONATOR_BUTTON_STONE_BUTTON=Knopf
DETONATOR_BUTTON_PRESSURE-PLATE=Druckplatte DETONATOR_BUTTON_PRESSURE_PLATE=Druckplatte
DETONATOR_BUTTON_WEIGHTED-PRESSURE-PLATE=Druckplatte DETONATOR_BUTTON_WEIGHTED-PRESSURE_PLATE=Druckplatte
DETONATOR_BUTTON_TRIPWIRE=Tripwire DETONATOR_BUTTON_TRIPWIRE=Tripwire
DETONATOR_BUTTON_NOTEBLOCK=Noteblock DETONATOR_BUTTON_NOTEBLOCK=Noteblock
DETONATOR_BUTTON_DAYLIGHTSENSOR=Tageslichtsensor DETONATOR_BUTTON_DAYLIGHTSENSOR=Tageslichtsensor
@ -197,11 +197,11 @@ HOTBAR_SAVED=§7Deine Hotbar wurde als Standard gespeichert
HOTBAR_LOADED=§7Deine Standard Hotbar wurde geladen HOTBAR_LOADED=§7Deine Standard Hotbar wurde geladen
HOTBAR_INVENTORY=Standard Hotbar HOTBAR_INVENTORY=Standard Hotbar
# GUI # GUI
GUI_EDITOR_ITEM-NAME=§eGui Editor GUI_EDITOR_ITEM_NAME=§eGui Editor
GUI_EXPORT_CODE=§eDein Gui-Code: GUI_EXPORT_CODE=§eDein Gui-Code:
GUI_EXPORT_CODE-HOVER=§eKopieren GUI_EXPORT_CODE_HOVER=§eKopieren
GUI_IMPORT_INVALID-CODE=§eInvalider Gui-Code GUI_IMPORT_INVALID_CODE=§eInvalider Gui-Code
GUI_IMPORT_CODE-SUCCESSFUL=§eGui-Code eingelesen GUI_IMPORT_CODE_SUCCESSFUL=§eGui-Code eingelesen
GUI_NAME=Bau GUI GUI_NAME=Bau GUI
GUI_NO_PERMISSION=§cDu hast nicht genug Rechte um dies zu tun GUI_NO_PERMISSION=§cDu hast nicht genug Rechte um dies zu tun
GUI_NO_OWNER=§cDas ist nicht deine Bauwelt GUI_NO_OWNER=§cDas ist nicht deine Bauwelt
@ -263,6 +263,7 @@ SCRIPT_COMMAND_ARITHMETIC_SUB_ERROR = §cNur Zahlen können subtrahiert werden
SCRIPT_COMMAND_IO_ECHO_HELP_1 = §eecho §8<§7Wert§8> SCRIPT_COMMAND_IO_ECHO_HELP_1 = §eecho §8<§7Wert§8>
SCRIPT_COMMAND_IO_ECHO_HELP_2 = §7Schreibe etwas dem Spieler. Wenn kein Wert angegeben wurde ist die Nachricht leer. SCRIPT_COMMAND_IO_ECHO_HELP_2 = §7Schreibe etwas dem Spieler. Wenn kein Wert angegeben wurde ist die Nachricht leer.
SCRIPT_COMMAND_IO_ECHO_MESSAGE = {0}
SCRIPT_COMMAND_IO_ECHOACTIONBAR_HELP_1 = §eechoactionbar §8<§7Wert§8> SCRIPT_COMMAND_IO_ECHOACTIONBAR_HELP_1 = §eechoactionbar §8<§7Wert§8>
SCRIPT_COMMAND_IO_ECHOACTIONBAR_HELP_2 = §7Schreibe etwas dem Spieler in der ActionBar. Wenn kein Wert angegeben wurde ist die Nachricht leer. SCRIPT_COMMAND_IO_ECHOACTIONBAR_HELP_2 = §7Schreibe etwas dem Spieler in der ActionBar. Wenn kein Wert angegeben wurde ist die Nachricht leer.
@ -608,7 +609,20 @@ BLOCK_COUNTER_ENABLE = §7BlockCounter angemacht
BLOCK_COUNTER_DISABLE = §7BlockCounter ausgemacht BLOCK_COUNTER_DISABLE = §7BlockCounter ausgemacht
# DepthCounter # DepthCounter
DEPTH_COUNTER_COMMAND_ENABLE_HELP = §8/§edepthcounter enable §8- §7Aktiviere den Tiefenzähler
DEPTH_COUNTER_COMMAND_DISABLE_HELP = §8/§edepthcounter disable §8- §7Deaktiviere den Tiefenzähler
DEPTH_COUNTER_COMMAND_INFO_HELP = §8/§edepthcounter info §8- §7Zähle aktive Zählmodi auf
DEPTH_COUNTER_COMMAND_TOGGLE_HELP = §8/§edepthcounter toggle §8<§7CountMode§8> §8- §7Stelle einzelne Zählmodi ein
DEPTH_COUNTER_ENABLE_MESSAGE = §7Du hast den Tiefenzähler aktiviert.
DEPTH_COUNTER_DISABLE_MESSAGE = §7Du hast den Tiefenzähler deaktiviert.
DEPTH_COUNTER_ACTIVE_MESSAGE = §7Aktive Zählmodi: §e{0}§8.
DEPTH_COUNTER_MESSAGE = §7Schaden §8> §7
DEPTH_COUNTER_HIGHLIGHT = §e
DEPTH_COUNTER_SEPARATOR = §7 §7
DEPTH_COUNTER_X = X: {0}
DEPTH_COUNTER_Y = Y: {0}
DEPTH_COUNTER_Z = Z: {0}
DEPTH_COUNTER_TNT = §7TNT§8: §e{0}
# TPSLimit # TPSLimit
TICK_STEP_HELP = §8/§etick step §8<§7Ticks§8> §8- §7Spule n Ticks vor TICK_STEP_HELP = §8/§etick step §8<§7Ticks§8> §8- §7Spule n Ticks vor
@ -635,15 +649,15 @@ TPSLIMIT_INVALID_FROZEN = §c und '0'
# Trace # Trace
TRACE_RECORD=§aan TRACE_RECORD=§aan
TRACE_RECORD-AUTO=§aan TRACE_RECORD_AUTO=§aan
TRACE_RECORD-SINGLE=§aan TRACE_RECORD_SINGLE=§aan
TRACE_IDLE=§caus TRACE_IDLE=§caus
TRACE_IDLE-AUTO=§eauto TRACE_IDLE_AUTO=§eauto
TRACE_IDLE-SINGLE=§esingle TRACE_IDLE_SINGLE=§esingle
TRACE_MESSAGE-AUTO_RECORD=§cTNT-Tracer muss gestoppt werden TRACE_MESSAGE_AUTO_RECORD=§cTNT-Tracer muss gestoppt werden
TRACE_MESSAGE-AUTO_RECORD-AUTO=§cTNT-Tracer darf nicht aufnehmen TRACE_MESSAGE_AUTO_RECORD_AUTO=§cTNT-Tracer darf nicht aufnehmen
TRACE_MESSAGE-AUTO_IDLE=§cAuto-Tracer gestoppt TRACE_MESSAGE_AUTO_IDLE=§cAuto-Tracer gestoppt
TRACE_MESSAGE-AUTO_IDLE-AUTO = §aAuto-Tracer gestartet TRACE_MESSAGE_AUTO_IDLE_AUTO = §aAuto-Tracer gestartet
TRACE_MESSAGE_START = §aTNT-Tracer gestartet TRACE_MESSAGE_START = §aTNT-Tracer gestartet
TRACE_MESSAGE_SINGLE = §aSingle-Tracer gestartet TRACE_MESSAGE_SINGLE = §aSingle-Tracer gestartet
TRACE_MESSAGE_STOP = §cTNT-Tracer gestoppt TRACE_MESSAGE_STOP = §cTNT-Tracer gestoppt
@ -653,6 +667,7 @@ TRACE_MESSAGE_HIDE = §cAlle TNT-Positionen ausgeblendet
TRACE_MESSAGE_DISALLOWED = §cDu darfst hier nicht den TNT-Tracer nutzen 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_START = §8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen
TRACE_COMMAND_HELP_SINGLE = §8/§etrace single §8- §7Startet eine einzelne Aufnahme aller TNT-Positionen
TRACE_COMMAND_HELP_STOP = §8/§etrace stop §8- §7Stoppt den TNT-Tracer 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_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_GUI = §8/§etrace show gui §8- §7Zeigt die Trace show gui
@ -663,12 +678,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_COMMAND_HELP_GUI = §8/§etrace gui §8- §7Zeigt die Trace Oberfläche an
TRACE_GUI_NAME = Tracer Gui TRACE_GUI_NAME = Tracer Gui
TRACE_GUI_TRACE-INACTIVE = §eTracer Starten TRACE_GUI_TRACE_INACTIVE = §eTracer Starten
TRACE_GUI_TRACE-ACTIVE = §eTracer Stoppen TRACE_GUI_TRACE_ACTIVE = §eTracer Stoppen
TRACE_GUI_TRACE-ACTIVE-AUTO = §eAuto-Trace ist Aktiv TRACE_GUI_TRACE_ACTIVE_AUTO = §eAuto-Trace ist Aktiv
TRACE_GUI_AUTO-TRACE-INACTIVE = §eAuto-Tracer Aktivieren TRACE_GUI_AUTO_TRACE_INACTIVE = §eAuto-Tracer Aktivieren
TRACE_GUI_AUTO-TRACE-ACTIVE = §eAuto-Tracer Deaktivieren TRACE_GUI_AUTO_TRACE_ACTIVE = §eAuto-Tracer Deaktivieren
TRACE_GUI_SHOW-GUI = §eTrace Show Gui TRACE_GUI_SHOW_GUI = §eTrace Show Gui
TRACE_GUI_DELETE = §eTrace Löschen TRACE_GUI_DELETE = §eTrace Löschen
TRACE_SHOW_GUI_TITLE = Trace Show GUI TRACE_SHOW_GUI_TITLE = Trace Show GUI
@ -677,12 +692,12 @@ TRACE_SHOW_GUI_HIDDEN = §cTraces ausgeblendet
TRACE_SHOW_GUI_WATER_ITEM = §eWasser §7Positionen TRACE_SHOW_GUI_WATER_ITEM = §eWasser §7Positionen
TRACE_SHOW_GUI_WATER_LORE1 = §7Zeigt alles TNT, welches TRACE_SHOW_GUI_WATER_LORE1 = §7Zeigt alles TNT, welches
TRACE_SHOW_GUI_WATER_LORE2 = §7im Wasser explodiert ist. TRACE_SHOW_GUI_WATER_LORE2 = §7im Wasser explodiert ist.
TRACE_SHOW_GUI_INTERPOLATE-Y_ITEM = §eInterpolation §7Y-Achse TRACE_SHOW_GUI_INTERPOLATE_Y_ITEM = §eInterpolation §7Y-Achse
TRACE_SHOW_GUI_INTERPOLATE-Y_LORE1 = §7Zeigt die Interpolation TRACE_SHOW_GUI_INTERPOLATE_Y_LORE1 = §7Zeigt die Interpolation
TRACE_SHOW_GUI_INTERPOLATE-Y_LORE2 = §7auf der Y-Achse. TRACE_SHOW_GUI_INTERPOLATE_Y_LORE2 = §7auf der Y-Achse.
TRACE_SHOW_GUI_INTERPOLATE-XZ_ITEM = §eInterpolation §7XZ-Achse TRACE_SHOW_GUI_INTERPOLATE_XZ_ITEM = §eInterpolation §7XZ-Achse
TRACE_SHOW_GUI_INTERPOLATE-XZ_LORE1 = §7Zeigt die Interpolation TRACE_SHOW_GUI_INTERPOLATE_XZ_LORE1 = §7Zeigt die Interpolation
TRACE_SHOW_GUI_INTERPOLATE-XZ_LORE2 = §7auf der XZ-Achse. TRACE_SHOW_GUI_INTERPOLATE_XZ_LORE2 = §7auf der XZ-Achse.
TRACE_GUI_TITLE = Trace GUI TRACE_GUI_TITLE = Trace GUI
TRACE_GUI_ITEM_BACK = §eBack TRACE_GUI_ITEM_BACK = §eBack
@ -725,14 +740,14 @@ LOADER_PAUSE = §7Pause
LOADER_END = §8Finished LOADER_END = §8Finished
LOADER_MESSAGE_CLEAR = §7Loader gecleart 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_TNT = §eTNT hinzugefügt {0}
LOADER_MESSAGE_INTERACT = §e{0} hinzugefügt {1} LOADER_MESSAGE_INTERACT = §e{0} hinzugefügt {1}
LOADER_BUTTON_SWITCH=Hebel LOADER_BUTTON_SWITCH=Hebel
LOADER_BUTTON_WOOD-Button=Knopf LOADER_BUTTON_WOOD_BUTTON=Knopf
LOADER_BUTTON_STONE-Button=Knopf LOADER_BUTTON_STONE_BUTTON=Knopf
LOADER_BUTTON_PRESSURE-PLATE=Druckplatte LOADER_BUTTON_PRESSURE_PLATE=Druckplatte
LOADER_BUTTON_WEIGHTED-PRESSURE-PLATE=Druckplatte LOADER_BUTTON_WEIGHTED_PRESSURE_PLATE=Druckplatte
LOADER_BUTTON_TRIPWIRE=Tripwire LOADER_BUTTON_TRIPWIRE=Tripwire
LOADER_BUTTON_NOTEBLOCK=Noteblock LOADER_BUTTON_NOTEBLOCK=Noteblock
LOADER_BUTTON_DAYLIGHTSENSOR=Tageslichtsensor LOADER_BUTTON_DAYLIGHTSENSOR=Tageslichtsensor
@ -812,12 +827,12 @@ OBSERVER_ENABLE = §7Observer Trace gestartet
OBSERVER_DISABLE = §7Observer Trace gestoppt OBSERVER_DISABLE = §7Observer Trace gestoppt
OBSERVER_DELETE = §7Observer Trace gelöscht OBSERVER_DELETE = §7Observer Trace gelöscht
OBSERVER_RETRACE_DONE = §7Observer Trace neu berechnet 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
OTHER_ITEMS_TELEPORT_NAME=§eTeleporter OTHER_ITEMS_TELEPORT_NAME=§eTeleporter
OTHER_ITEMS_TELEPORT_GUI-NAME=Teleportieren OTHER_ITEMS_TELEPORT_GUI_NAME=Teleportieren
OTHER_ITEMS_TELEPORT_PLAYER-OFFLINE=§cDer Spieler ist Offline OTHER_ITEMS_TELEPORT_PLAYER_OFFLINE=§cDer Spieler ist Offline
OTHER_SLOT_INVALID_SLOT=§cInvalider Slot 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_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 OTHER_NOCLIP_SLOT_HELP_PICK = §8/§eslot pick §8-§7 Lege den angeguckten Block ins Inventar
@ -851,13 +866,22 @@ OTHER_TPS_MESSAGE = §7 §e{0}§7 §e{1}§7 §e{2}§7 §e{3}§7
OTHER_TPS_SINGLE = §8TPS: §e{0} OTHER_TPS_SINGLE = §8TPS: §e{0}
OTHER_WORLDSPAWN_HELP=§8/§eworldspawn §8-§e Teleportiere dich zum Spawn OTHER_WORLDSPAWN_HELP=§8/§eworldspawn §8-§e Teleportiere dich zum Spawn
# DebugStick # DebugStick
DEBUG-STICK_COMMAND_HELP=§8/§edebugstick §8-§7 Erhalte einen DebugStick DEBUG_STICK_COMMAND_HELP=§8/§edebugstick §8-§7 Erhalte einen DebugStick
DEBUG_STICK_NAME=§eDebugstick
#Skull Gui
ANVIL_INV_NAME=Spieler name
# StructureVoid # StructureVoid
STRUCTURE-VOID_COMMAND_HELP=§8/§estructureVoid §8-§7 Erhalte ein StructureVoid STRUCTURE_VOID_COMMAND_HELP=§8/§estructureVoid §8-§7 Erhalte ein StructureVoid
# NightVision # NightVision
NIGHT-VISION_COMMAND_HELP=§8/§enightvision §8-§7 Schalte Nightvision an oder aus. NIGHT_VISION_COMMAND_HELP=§8/§enightvision §8-§7 Schalte Nightvision an oder aus.
NIGHT-VISION_OFF=§eNightvision deaktiviert NIGHT_VISION_OFF=§eNightvision deaktiviert
NIGHT-VISION_ON=§eNightvision aktiviert 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
NAVIGATION_WAND_RIGHT_CLICK=§eRight click: pass through walls
# Material # Material
MATERIAL_INV_NAME=§eMaterial {0}/{1} MATERIAL_INV_NAME=§eMaterial {0}/{1}
MATERIAL_SEARCH=§eSuchen MATERIAL_SEARCH=§eSuchen
@ -876,7 +900,7 @@ MATERIAL_SEARCH_BLASTRESISTANCE_MIN=§eBlast Resistance mindestens
MATERIAL_SEARCH_BLASTRESISTANCE_MAX=§eBlast Resistance maximal MATERIAL_SEARCH_BLASTRESISTANCE_MAX=§eBlast Resistance maximal
MATERIAL_SEARCH_BLASTRESISTANCE_EXACT=§eBlast Resistance MATERIAL_SEARCH_BLASTRESISTANCE_EXACT=§eBlast Resistance
MATERIAL_SEARCH_VALUE=§8: §e{0} 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_HARDNESS=§8- §eHärte§8: §7{0}
MATERIAL_TNT_BREAKABLE=§8- §eZerstörbar durch TNT MATERIAL_TNT_BREAKABLE=§8- §eZerstörbar durch TNT
MATERIAL_TNT_UNBREAKABLE=§8- §eNicht Zerstörbar durch TNT MATERIAL_TNT_UNBREAKABLE=§8- §eNicht Zerstörbar durch TNT
@ -884,7 +908,7 @@ MATERIAL_TRANSPARENT=§8- §eTransparenter Block
MATERIAL_SOLID=§8- §eSolider Block MATERIAL_SOLID=§8- §eSolider Block
MATERIAL_GRAVITY=§8- §eFallender Block MATERIAL_GRAVITY=§8- §eFallender Block
MATERIAL_OCCLUDING=§8- §eOccluding Block MATERIAL_OCCLUDING=§8- §eOccluding Block
MATERIAL_INTERACT-ABLE=§8- §eInterargierbarer Block MATERIAL_INTERACTABLE=§8- §eInterargierbarer Block
MATERIAL_FLAMMABLE=§8- §eFlammbarer Block MATERIAL_FLAMMABLE=§8- §eFlammbarer Block
MATERIAL_BURNABLE=§8- §eBrennbarer Block MATERIAL_BURNABLE=§8- §eBrennbarer Block
MATERIAL_WATERLOGGABLE=§8- §eWasserspeicherbarer Block MATERIAL_WATERLOGGABLE=§8- §eWasserspeicherbarer Block
@ -1032,6 +1056,32 @@ PANZERN_PROGRESS = §e{0} §7Blöcke übrig, §e{1} §7Blöcke pro Sekunde, §e{
PANZERN_DONE = §aZuende gepanzert PANZERN_DONE = §aZuende gepanzert
# UTILS # UTILS
SELECT_HELP = §8/§eselect §8[§7RegionsTyp§8] §8- §7Wähle einen RegionsTyp aus
SELECT_EXTENSION_HELP = §8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Wähle einen RegionsTyp aus mit oder ohne Extension
SELECT_NO_PERMS = §cDu darfst hier nicht den Select Befehl verwenden
SELECT_GLOBAL_REGION = §cDie globale Region kannst du nicht auswählen
SELECT_NO_TYPE = §cDiese Region hat keinen {0}
SELECT_NO_EXTENSION = §cDiese Region hat keine Ausfahrmaße
SELECT_MESSAGE = §7WorldEdit auswahl auf {0}, {1}, {2} und {3}, {4}, {5} gesetzt
SKULL_HELP = §8/§eskull §8[§eSpieler§8] §8-§7 Gibt einen SpielerKopf
SKULL_ITEM = §e{0}§8s Kopf
SPEED_HELP = §8/§espeed §8[§71§8-§710§8|§edefault§8] §8-§7 Setzte deine Flug- und Laufgeschindigkeit.
SPEED_CURRENT = §7Aktuelle geschwindigkeit§8: §e{0}
SPEED_TOO_SMALL = §c{0} ist zu klein
SPEED_TOO_HIGH = §c{0} ist zu hoch
SPEED_ITEM = §eGeschwindigkeit
SPEED_ITEM_LORE = §7Aktuell: §e
SPEED_TAB_NAME = Geschwindigkeit eingeben
WATER_SIGHT_ON = §7Wassersicht: §eAktiviert
WATER_SIGHT_OFF = §7Wassersicht: §eDeaktiviert
WORLDEDIT_WAND = WorldEdit Wand
WORLDEDIT_LEFTCLICK = Left click: select pos #1
WORLDEDIT_RIGHTCLICK = Right click: select pos #2
TNT_CLICK_HEADER = §8---=== §eTNT §8===--- TNT_CLICK_HEADER = §8---=== §eTNT §8===---
TNT_CLICK_ORDER = §eEntity Order§8: §e{0} TNT_CLICK_ORDER = §eEntity Order§8: §e{0}
TNT_CLICK_FUSE_TIME = §eFuseTime§8: §e{0} TNT_CLICK_FUSE_TIME = §eFuseTime§8: §e{0}
@ -1042,6 +1092,17 @@ TNT_CLICK_VELOCITY_X = §7Velocity §eX§8: §e{0}
TNT_CLICK_VELOCITY_Y = §7Velocity §eY§8: §e{0} TNT_CLICK_VELOCITY_Y = §7Velocity §eY§8: §e{0}
TNT_CLICK_VELOCITY_Z = §7Velocity §eZ§8: §e{0} TNT_CLICK_VELOCITY_Z = §7Velocity §eZ§8: §e{0}
SELECT_ITEM_CHOOSE_EXTENSION = Extension auswählen
SELECT_ITEM_CHOOSE_SELECTION = Auswahl auswählen
SELECT_ITEM_NORMAL_EXTENSION = §eNormal
SELECT_ITEM_EXTENDED_EXTENSION= §eAusgefahren
SELECT_ITEM_SELECT= §eSelect
SELECT_ITEM_AUSWAHL= §7Auswahl: §7{0} {1}
SELECT_ITEM_RIGHT_CLICK=§7Rechtklick zum ändern
SELECT_ITEM_BAURAHMEN=§eBaurahmen
SELECT_ITEM_BAUPLATTFORM=§eBauplattform
SELECT_ITEM_TESTBLOCK=§eTestblock
# Warp # Warp
WARP_DISALLOWED = §cDu darfst hier nicht das Warp System nutzen WARP_DISALLOWED = §cDu darfst hier nicht das Warp System nutzen
WARP_LOC_X = §7X§8: §e{0} WARP_LOC_X = §7X§8: §e{0}
@ -1060,12 +1121,12 @@ WARP_GUI_DISTANCE=§7Distanz: §e{0} §7Blöcke
WARP_GUI_LCLICK=§7Links klicken zum teleportieren WARP_GUI_LCLICK=§7Links klicken zum teleportieren
WARP_GUI_RCLICK=§7Rechts klicken zum editieren WARP_GUI_RCLICK=§7Rechts klicken zum editieren
WARP_INFO_NAME=§7Name: §e{0} WARP_INFO_NAME=§7Name: §e{0}
WARP_HELP_1=§8/§ewarp add §8[§7Name§8] - §7Erstelle einen neuen Warp Punkt WARP_HELP_ADD=§8/§ewarp add §8[§7Name§8] §8- §7Erstelle einen neuen Warp Punkt
WARP_HELP_2=§8/§ewarp §8[§7Name§8] - §7Teleportiere dich zu einen Warp-Punkt WARP_HELP_TELEPORT=§8/§ewarp §8[§7Name§8] §8- §7Teleportiere dich zu einen Warp-Punkt
WARP_HELP_3=§8/§ewarp info §8[§7Name§8] - §7Infos zu einem Punkt WARP_HELP_INFO=§8/§ewarp info §8[§7Name§8] §8- §7Infos zu einem Punkt
WARP_HELP_4=§8/§ewarp delete §8[§7Name§8] - §7Lösche einen Warp WARP_HELP_DELETE=§8/§ewarp delete §8[§7Name§8] §8- §7Lösche einen Warp
WARP_HELP_5=§8/§ewarp gui - §7Öffne die Warp-GUI WARP_HELP_GUI=§8/§ewarp gui §8- §7Öffne die Warp-GUI
WARP_HELP_6=§8/§ewarp list - §7Liste alle Warp-Punkt auf WARP_HELP_LIST=§8/§ewarp list §8- §7Liste alle Warp-Punkt auf
WARP_MOON_ITEM_NAME=§3Atemkugel WARP_MOON_ITEM_NAME=§3Atemkugel
WARP_MOON_COUNTDOOWN=§7Noch §e§l{0} §7Sekunden! WARP_MOON_COUNTDOOWN=§7Noch §e§l{0} §7Sekunden!

10
BauSystem_Main/src/de/steamwar/bausystem/Permission.java
Datei anzeigen

@ -40,7 +40,7 @@ public enum Permission {
}), }),
WORLDEDIT(BauweltMember::isWorldEdit, (player, target) -> { WORLDEDIT(BauweltMember::isWorldEdit, (player, target) -> {
target.setWorldEdit(!target.isWorldEdit()); target.setWorldEdit(!target.isWorldEdit());
sendMessages(player, target.isWorldEdit(), target, "PERMISSION_WORLD-EDIT"); sendMessages(player, target.isWorldEdit(), target, "PERMISSION_WORLD_EDIT");
}), }),
MEMBER(bauweltMember -> true), MEMBER(bauweltMember -> true),
OWNER(bauweltMember -> false); OWNER(bauweltMember -> false);
@ -69,15 +69,15 @@ public enum Permission {
Player targetPlayer = Bukkit.getPlayer(SteamwarUser.get(target.getMemberID()).getUUID()); Player targetPlayer = Bukkit.getPlayer(SteamwarUser.get(target.getMemberID()).getUUID());
if (targetPlayer != null) { if (targetPlayer != null) {
if (ableTo) { 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 { } 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) { 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 { } 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));
} }
} }

4
BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
Datei anzeigen

@ -77,11 +77,11 @@ public class AutostartListener implements Listener {
public void activate(Player player) { public void activate(Player player) {
Region region = Region.getRegion(player.getLocation()); Region region = Region.getRegion(player.getLocation());
if (region.isGlobal()) { if (region.isGlobal()) {
BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO-REGION", player); BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
return; return;
} }
if (!region.hasType(RegionType.TESTBLOCK)) { if (!region.hasType(RegionType.TESTBLOCK)) {
BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO-REGION", player); BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
return; return;
} }
if (regionStartTime.containsKey(region)) { if (regionStartTime.containsKey(region)) {

6
BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauCommand.java
Datei anzeigen

@ -90,13 +90,13 @@ public class BauCommand extends SWCommand {
private boolean negativeToggleCheck(Player p, SteamwarUser id) { private boolean negativeToggleCheck(Player p, SteamwarUser id) {
if (id == null) { if (id == null) {
BauSystem.MESSAGE.send("BAU_UNKNOWN-PLAYER", p); BauSystem.MESSAGE.send("BAU_UNKNOWN_PLAYER", p);
return true; return true;
} }
BauweltMember target = BauweltMember.getBauMember(bauServer.getOwnerID(), id.getId()); BauweltMember target = BauweltMember.getBauMember(bauServer.getOwnerID(), id.getId());
if (target == null) { if (target == null) {
BauSystem.MESSAGE.send("BAU_NO-PLAYER", p); BauSystem.MESSAGE.send("BAU_NO_PLAYER", p);
return true; return true;
} }
return false; return false;
@ -128,7 +128,7 @@ public class BauCommand extends SWCommand {
Player p = (Player) commandSender; Player p = (Player) commandSender;
if (!bauServer.getOwner().equals(p.getUniqueId())) { if (!bauServer.getOwner().equals(p.getUniqueId())) {
if (guardCheckType != GuardCheckType.TAB_COMPLETE) { if (guardCheckType != GuardCheckType.TAB_COMPLETE) {
BauSystem.MESSAGE.send("BAU_NO-WORLD", p); BauSystem.MESSAGE.send("BAU_NO_WORLD", p);
} }
return GuardResult.DENIED; return GuardResult.DENIED;
} }

4
BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
Datei anzeigen

@ -46,7 +46,7 @@ public class BauInfoBauGuiItem extends BauGuiItem {
@Override @Override
public ItemStack getItem(Player player) { public ItemStack getItem(Player player) {
SWItem itemStack = SWItem.getPlayerSkull(SteamwarUser.get(BauServer.getInstance().getOwner()).getUserName()); 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()); Region region = Region.getRegion(player.getLocation());
List<String> stringList = new ArrayList<>(); List<String> stringList = new ArrayList<>();
for (Flag flag : Flag.getFlags()) { for (Flag flag : Flag.getFlags()) {
@ -55,7 +55,7 @@ public class BauInfoBauGuiItem extends BauGuiItem {
} }
Flag.Value<?> value = region.get(flag); Flag.Value<?> value = region.get(flag);
if (value != null) { 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); itemStack.setLore(stringList);

16
BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
Datei anzeigen

@ -30,7 +30,7 @@ public class InfoCommand extends SWCommand {
@Register(help = true) @Register(help = true)
public void genericHelp(Player p, String... args) { public void genericHelp(Player p, String... args) {
BauSystem.MESSAGE.send("BAU-INFO_COMMAND_HELP", p); BauSystem.MESSAGE.send("BAU_INFO_COMMAND_HELP", p);
} }
@Register @Register
@ -39,7 +39,7 @@ public class InfoCommand extends SWCommand {
} }
public void sendBauInfo(Player p) { 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()); Region region = Region.getRegion(p.getLocation());
for (Flag flag : Flag.getFlags()) { for (Flag flag : Flag.getFlags()) {
if (flag == Flag.PROTECT && region.getFloorLevel() == 0) { if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
@ -47,25 +47,25 @@ public class InfoCommand extends SWCommand {
} }
Flag.Value<?> value = region.get(flag); Flag.Value<?> value = region.get(flag);
if (value != null) { 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<BauweltMember> members = BauweltMember.getMembers(bauServer.getOwnerID()); List<BauweltMember> members = BauweltMember.getMembers(bauServer.getOwnerID());
StringBuilder membermessage = new StringBuilder(); 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) { 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(), 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.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.isWorld() ? BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WORLD_ALLOW", p) : BauSystem.MESSAGE.parse("BAU_INFO_MEMBER_WORLD_DISALLOW", p)
)); ));
} }
p.sendMessage(membermessage.toString()); p.sendMessage(membermessage.toString());
StringBuilder tpsMessage = new StringBuilder(); 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.ONE_SECOND));
tpsMessage.append(" ").append(getTps(TPSWatcher.TPSType.TEN_SECONDS)); tpsMessage.append(" ").append(getTps(TPSWatcher.TPSType.TEN_SECONDS));
if (!TPSWarpUtils.isWarping()) { if (!TPSWarpUtils.isWarping()) {

4
BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
Datei anzeigen

@ -71,9 +71,9 @@ public class Countingwand {
if (newPos) { if (newPos) {
String dimension = getDimensions(p, selection.getKey(), selection.getValue()); String dimension = getDimensions(p, selection.getKey(), selection.getValue());
if (pos1) { 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 { } 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);
} }
} }
} }

6
BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java
Datei anzeigen

@ -61,7 +61,7 @@ public class BauGUICommand extends SWCommand {
TextComponent component = new TextComponent(); TextComponent component = new TextComponent();
component.setColor(ColorConfig.HIGHLIGHT); component.setColor(ColorConfig.HIGHLIGHT);
component.setBold(true); 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.setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, export));
component.setText(export); component.setText(export);
BauSystem.MESSAGE.send("GUI_EXPORT_CODE", p); BauSystem.MESSAGE.send("GUI_EXPORT_CODE", p);
@ -72,11 +72,11 @@ public class BauGUICommand extends SWCommand {
public void importGui(Player p, String code) { public void importGui(Player p, String code) {
try { try {
if (BauGuiImportExport.importGui(code, p)) { if (BauGuiImportExport.importGui(code, p)) {
BauSystem.MESSAGE.send("GUI_IMPORT_CODE-SUCCESSFUL", p); BauSystem.MESSAGE.send("GUI_IMPORT_CODE_SUCCESSFUL", p);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
BauSystem.MESSAGE.send("GUI_IMPORT_INVALID-CODE", p); BauSystem.MESSAGE.send("GUI_IMPORT_INVALID_CODE", p);
} }
} }
} }

2
BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java
Datei anzeigen

@ -44,7 +44,7 @@ public class BauGuiEditorGuiItem extends BauGuiItem {
@Override @Override
public ItemStack getItem(Player player) { 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 @Override

6
BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiImportExport.java
Datei anzeigen

@ -104,12 +104,12 @@ public class BauGuiImportExport {
append(st, Integer.toBinaryString(b & 0xFF), 8); append(st, Integer.toBinaryString(b & 0xFF), 8);
} }
if (!st.substring(0, 5).equals(VERSION)) { 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; return false;
} }
int size = Integer.parseInt(st.substring(5, 8), 2); int size = Integer.parseInt(st.substring(5, 8), 2);
if (size <= 0 || size > 5) { if (size <= 0 || size > 5) {
BauSystem.MESSAGE.send("GUI_IMPORT_INVALID-CODE", p); BauSystem.MESSAGE.send("GUI_IMPORT_INVALID_CODE", p);
return false; return false;
} }
size *= 9; size *= 9;
@ -153,7 +153,7 @@ public class BauGuiImportExport {
s = s.substring(1); s = s.substring(1);
int itemID = Integer.parseInt(s, 2); int itemID = Integer.parseInt(s, 2);
if (!BauGUI.getITEMS().containsKey(itemID)) { if (!BauGUI.getITEMS().containsKey(itemID)) {
BauSystem.MESSAGE.send("GUI_IMPORT_INVALID-CODE", p); BauSystem.MESSAGE.send("GUI_IMPORT_INVALID_CODE", p);
return false; return false;
} }
map.put(itemID, currentIndex); map.put(itemID, currentIndex);

2
BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java
Datei anzeigen

@ -118,7 +118,7 @@ public class Loader implements Listener {
actions.clear(); actions.clear();
BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR", p); BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR", p);
} else { } else {
BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR-HELP", p); BauSystem.MESSAGE.send("LOADER_MESSAGE_CLEAR_HELP", p);
} }
} }

8
BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java
Datei anzeigen

@ -29,10 +29,10 @@ import org.bukkit.block.Block;
@Getter @Getter
public enum LoaderButton { public enum LoaderButton {
SWITCH(0, true, "LOADER_BUTTON_SWITCH"), SWITCH(0, true, "LOADER_BUTTON_SWITCH"),
WOOD_BUTTON(30, "LOADER_BUTTON_WOOD-Button"), WOOD_BUTTON(30, "LOADER_BUTTON_WOOD_BUTTON"),
STONE_BUTTON(20, "LOADER_BUTTON_STONE-Button"), STONE_BUTTON(20, "LOADER_BUTTON_STONE_BUTTON"),
PRESSURE_PLATE(30, "LOADER_BUTTON_PRESSURE-PLATE"), PRESSURE_PLATE(30, "LOADER_BUTTON_PRESSURE_PLATE"),
WEIGHTED_PRESSURE_PLATE(20, "LOADER_BUTTON_WEIGHTED-PRESSURE-PLATE"), WEIGHTED_PRESSURE_PLATE(20, "LOADER_BUTTON_WEIGHTED_PRESSURE_PLATE"),
TRIPWIRE(30, "LOADER_BUTTON_TRIPWIRE"), TRIPWIRE(30, "LOADER_BUTTON_TRIPWIRE"),
NOTEBLOCK(1, "LOADER_BUTTON_NOTEBLOCK"), NOTEBLOCK(1, "LOADER_BUTTON_NOTEBLOCK"),
DAYLIGHTSENSOR(0, true, "LOADER_BUTTON_DAYLIGHTSENSOR"), DAYLIGHTSENSOR(0, true, "LOADER_BUTTON_DAYLIGHTSENSOR"),

2
BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java
Datei anzeigen

@ -55,7 +55,7 @@ public class ObserverTracerCommand extends SWCommand {
@Register(value = "retrace", description = "OBSERVER_HELP_RETRACE") @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE")
public void retrace(Player p) { public void retrace(Player p) {
if (ObserverTracerListener.observerTracerMap.containsKey(p)) { if (ObserverTracerListener.observerTracerMap.containsKey(p)) {
BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO-TRACE", p); BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p);
return; return;
} }
ObserverTracerListener.observerTracerMap.get(p).trace(); ObserverTracerListener.observerTracerMap.get(p).trace();

4
BauSystem_Main/src/de/steamwar/bausystem/features/other/items/TeleportBauGuiItem.java
Datei anzeigen

@ -49,10 +49,10 @@ public class TeleportBauGuiItem extends BauGuiItem {
@Override @Override
public boolean click(ClickType click, Player p) { public boolean click(ClickType click, Player p) {
p.closeInventory(); p.closeInventory();
SWListInv<UUID> inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("OTHER_ITEMS_TELEPORT_GUI-NAME", p), SWListInv.createPlayerList(p.getUniqueId()), (clickType, o) -> { SWListInv<UUID> inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("OTHER_ITEMS_TELEPORT_GUI_NAME", p), SWListInv.createPlayerList(p.getUniqueId()), (clickType, o) -> {
Player t = Bukkit.getPlayer(o); Player t = Bukkit.getPlayer(o);
if (t == null) { if (t == null) {
BauSystem.MESSAGE.send("OTHER_ITEMS_TELEPORT_PLAYER-OFFLINE", p); BauSystem.MESSAGE.send("OTHER_ITEMS_TELEPORT_PLAYER_OFFLINE", p);
} else { } else {
p.performCommand("tp " + t.getName()); p.performCommand("tp " + t.getName());
} }

4
BauSystem_Main/src/de/steamwar/bausystem/features/script/command/io/Echo.java
Datei anzeigen

@ -33,7 +33,7 @@ public class Echo implements SpecialCommand {
@Override @Override
public boolean execute(String[] command, ScriptExecutor scriptExecutor) { public boolean execute(String[] command, ScriptExecutor scriptExecutor) {
if (command.length <= 1) { if (command.length <= 1) {
scriptExecutor.getPlayer().sendMessage(BauSystem.PREFIX + ""); BauSystem.MESSAGE.send("SCRIPT_COMMAND_IO_ECHO_MESSAGE", scriptExecutor.getPlayer(), "");
return true; return true;
} }
StringBuilder st = new StringBuilder(); StringBuilder st = new StringBuilder();
@ -43,7 +43,7 @@ public class Echo implements SpecialCommand {
} }
st.append(command[i]); st.append(command[i]);
} }
scriptExecutor.getPlayer().sendMessage(BauSystem.PREFIX + ChatColor.translateAlternateColorCodes('&', st.toString())); BauSystem.MESSAGE.send("SCRIPT_COMMAND_IO_ECHO_MESSAGE", scriptExecutor.getPlayer(), ChatColor.translateAlternateColorCodes('&', st.toString()));
return true; return true;
} }
} }

32
BauSystem_Main/src/de/steamwar/bausystem/features/testblock/depthcounter/DepthCounter.java
Datei anzeigen

@ -20,7 +20,6 @@
package de.steamwar.bausystem.features.testblock.depthcounter; package de.steamwar.bausystem.features.testblock.depthcounter;
import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.configplayer.Config; import de.steamwar.bausystem.configplayer.Config;
import de.steamwar.bausystem.region.Region; import de.steamwar.bausystem.region.Region;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
@ -105,8 +104,6 @@ public class DepthCounter {
return null; return null;
} }
final StringBuilder result = new StringBuilder(BauSystem.PREFIX).append("Schaden ").append(ColorConfig.OTHER).append("> ").append(ColorConfig.BASE);
final Set<Integer> dimensions = new HashSet<>(); final Set<Integer> dimensions = new HashSet<>();
if (xActive) { if (xActive) {
dimensions.add(x); dimensions.add(x);
@ -120,31 +117,26 @@ public class DepthCounter {
int max = getMax(dimensions); int max = getMax(dimensions);
StringBuilder st = new StringBuilder();
if (xActive) { if (xActive) {
if (x == max) { st.append(x == max ? BauSystem.MESSAGE.parse("DEPTH_COUNTER_HIGHLIGHT", player) : "")
result.append(ColorConfig.HIGHLIGHT).append("X: ").append(x).append(ColorConfig.BASE).append(" "); .append(BauSystem.MESSAGE.parse("DEPTH_COUNTER_X", player, x))
} else { .append(BauSystem.MESSAGE.parse("DEPTH_COUNTER_SEPARATOR", player));
result.append("X: ").append(x).append(" ");
}
} }
if (yActive) { if (yActive) {
if (y == max) { st.append(y == max ? BauSystem.MESSAGE.parse("DEPTH_COUNTER_HIGHLIGHT", player) : "")
result.append(ColorConfig.HIGHLIGHT).append("Y: ").append(y).append(ColorConfig.BASE).append(" "); .append(BauSystem.MESSAGE.parse("DEPTH_COUNTER_Y", player, y))
} else { .append(BauSystem.MESSAGE.parse("DEPTH_COUNTER_SEPARATOR", player));
result.append("Y: ").append(y).append(" ");
}
} }
if (zActive) { if (zActive) {
if (z == max) { st.append(z == max ? BauSystem.MESSAGE.parse("DEPTH_COUNTER_HIGHLIGHT", player) : "")
result.append(ColorConfig.HIGHLIGHT).append("Z: ").append(z).append(ColorConfig.BASE).append(" "); .append(BauSystem.MESSAGE.parse("DEPTH_COUNTER_Z", player, z))
} else { .append(BauSystem.MESSAGE.parse("DEPTH_COUNTER_SEPARATOR", player));
result.append("Z: ").append(z).append(" ");
}
} }
result.append(ColorConfig.BASE).append("TNT").append(ColorConfig.OTHER).append(": ").append(ColorConfig.HIGHLIGHT).append(tntCount); st.append(BauSystem.MESSAGE.parse("DEPTH_COUNTER_TNT", player, tntCount));
return result.toString(); return BauSystem.MESSAGE.parse("DEPTH_COUNTER_MESSAGE", player, st.toString());
} }
} }

25
BauSystem_Main/src/de/steamwar/bausystem/features/testblock/depthcounter/DepthCounterCommand.java
Datei anzeigen

@ -26,7 +26,6 @@ import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@Linked(LinkageType.COMMAND) @Linked(LinkageType.COMMAND)
public class DepthCounterCommand extends SWCommand { public class DepthCounterCommand extends SWCommand {
@ -34,35 +33,27 @@ public class DepthCounterCommand extends SWCommand {
super("depthcounter", "depthcount", "dcounter", "dcount"); super("depthcounter", "depthcount", "dcounter", "dcount");
} }
@Register @Register(value = "toggle", description = "DEPTH_COUNTER_COMMAND_TOGGLE_HELP")
public void genericHelp(Player p, String... args) {
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "depthcounter enable" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Aktiviere den Tiefenzähler");
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "depthcounter disable" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Deaktiviere den Tiefenzähler");
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "depthcounter info" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Zähle aktive Zählmodi auf");
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "depthcounter toggle " + ColorConfig.OTHER + "<" + ColorConfig.BASE + "CountMode" + ColorConfig.OTHER + ">" + ColorConfig.OTHER + " - " + ColorConfig.BASE + "Stelle einzelne Zählmodi ein");
}
@Register("toggle")
public void toggleCommand(Player p, CountMode countMode) { public void toggleCommand(Player p, CountMode countMode) {
DepthCounter.toggleMode(p, countMode); DepthCounter.toggleMode(p, countMode);
p.sendMessage(BauSystem.PREFIX + "Aktive Zählmodi: " + ColorConfig.HIGHLIGHT + DepthCounter.getModes(p) + ColorConfig.BASE + "."); p.sendMessage(BauSystem.PREFIX + "Aktive Zählmodi: " + ColorConfig.HIGHLIGHT + DepthCounter.getModes(p) + ColorConfig.BASE + ".");
} }
@Register("enable") @Register(value = "enable", description = "DEPTH_COUNTER_COMMAND_ENABLE_HELP")
public void enableCommand(Player p) { public void enableCommand(Player p) {
DepthCounter.setModes(p, CountMode.ALL()); DepthCounter.setModes(p, CountMode.ALL());
p.sendMessage(BauSystem.PREFIX + "Du hast den Tiefenzähler aktiviert."); BauSystem.MESSAGE.send("DEPTH_COUNTER_ENABLE_MESSAGE", p);
p.sendMessage(BauSystem.PREFIX + "Aktive Zählmodi: " + ColorConfig.HIGHLIGHT + DepthCounter.getModes(p) + ColorConfig.BASE + "."); BauSystem.MESSAGE.send("DEPTH_COUNTER_ACTIVE_MESSAGE", p, DepthCounter.getModes(p).toString());
} }
@Register("disable") @Register(value = "disable", description = "DEPTH_COUNTER_COMMAND_DISABLE_HELP")
public void disableCommand(Player p) { public void disableCommand(Player p) {
DepthCounter.removePlayer(p); DepthCounter.removePlayer(p);
p.sendMessage(BauSystem.PREFIX + "Du hast den Tiefenzähler deaktiviert."); BauSystem.MESSAGE.send("DEPTH_COUNTER_DISABLE_MESSAGE", p);
} }
@Register("info") @Register(value = "info", description = "DEPTH_COUNTER_COMMAND_INFO_HELP")
public void infoCommand(Player p) { public void infoCommand(Player p) {
p.sendMessage(BauSystem.PREFIX + "Aktive Zählmodi: " + ColorConfig.HIGHLIGHT + DepthCounter.getModes(p) + ColorConfig.BASE + "."); BauSystem.MESSAGE.send("DEPTH_COUNTER_ACTIVE_MESSAGE", p, DepthCounter.getModes(p).toString());
} }
} }

121
BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
Datei anzeigen

@ -34,8 +34,7 @@ import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.bausystem.shared.ShowMode; import de.steamwar.bausystem.shared.ShowMode;
import de.steamwar.bausystem.utils.ListChatView; import de.steamwar.bausystem.utils.ListChatView;
import de.steamwar.command.SWCommand; import de.steamwar.command.*;
import de.steamwar.command.TypeMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
@ -46,7 +45,6 @@ import org.bukkit.entity.Player;
import java.util.*; import java.util.*;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -105,35 +103,14 @@ public class TraceCommand extends SWCommand {
}; };
} }
@Register(help = true) @Register(value = {"gui"}, description = "TRACE_COMMAND_HELP_GUI")
public void genericHelp(Player p, String... args) { public void guiCommand(@Guard Player p) {
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_START", p);
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_STOP", p);
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_AUTO", p);
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);
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_LIST", p);
BauSystem.MESSAGE.sendPrefixless("TRACE_COMMAND_HELP_GUI", p);
}
@Register({"gui"})
public void guiCommand(Player p) {
if (!permissionCheck(p)) return;
TraceGui.openGui(p); TraceGui.openGui(p);
} }
@Register({"record", "list"}) @Register(value = {"record", "list"})
@Register({"list"}) @Register(value = {"list"}, description = "TRACE_COMMAND_HELP_LIST")
public void listCommand(Player p) { public void listCommand(@Guard Player player, @OptionalValue("0") int page) {
listCommand(p, 0);
}
@Register(value = {"record", "list"}, noTabComplete = true)
@Register(value = {"list"}, noTabComplete = true)
public void listCommand(Player player, int page) {
if (!permissionCheck(player)) return;
ListChatView.chatView(player, StoredRecords.getRecords(), page, record -> { ListChatView.chatView(player, StoredRecords.getRecords(), page, record -> {
TextComponent component = new TextComponent(); TextComponent component = new TextComponent();
component.setText(BauSystem.MESSAGE.parse("TRACE_RECORD_LIST_ELEMENT", player, record.size())); component.setText(BauSystem.MESSAGE.parse("TRACE_RECORD_LIST_ELEMENT", player, record.size()));
@ -156,20 +133,13 @@ public class TraceCommand extends SWCommand {
} }
@Register(value = {"record", "delete"}, noTabComplete = true) @Register(value = {"record", "delete"}, noTabComplete = true)
public void recordDelete(Player p, int id) { public void recordDelete(@Guard Player p, int id) {
if (!permissionCheck(p)) return;
StoredRecords.remove(id); StoredRecords.remove(id);
BauSystem.MESSAGE.send("TRACE_RECORD_DELETE", p); BauSystem.MESSAGE.send("TRACE_RECORD_DELETE", p);
} }
@Register(value = "record", noTabComplete = true) @Register(value = "record", noTabComplete = true)
public void recordList(Player p, int record) { public void recordList(@Guard Player player, int recordID, @OptionalValue("0") int page) {
recordList(p, record, 0);
}
@Register(value = "record", noTabComplete = true)
public void recordList(Player player, int recordID, int page) {
if (!permissionCheck(player)) return;
Record traceRecord = StoredRecords.get(recordID); Record traceRecord = StoredRecords.get(recordID);
if (traceRecord == null) { if (traceRecord == null) {
BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player); BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player);
@ -197,8 +167,7 @@ public class TraceCommand extends SWCommand {
} }
@Register(value = {"record", "tnt", "delete"}, noTabComplete = true) @Register(value = {"record", "tnt", "delete"}, noTabComplete = true)
public void deleteRecordTNT(Player player, int recordID, int tntID) { public void deleteRecordTNT(@Guard Player player, int recordID, int tntID) {
if (!permissionCheck(player)) return;
Record record = StoredRecords.get(recordID); Record record = StoredRecords.get(recordID);
if (record == null) { if (record == null) {
BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player); BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player);
@ -209,13 +178,7 @@ public class TraceCommand extends SWCommand {
} }
@Register(value = "record", noTabComplete = true) @Register(value = "record", noTabComplete = true)
public void recordTNTPositions(Player player, int recordID, @StaticValue("tnt") String tnt, int tntID) { public void recordTNTPositions(@Guard Player player, int recordID, @StaticValue("tnt") String tnt, int tntID, @OptionalValue("0") int page) {
recordTNTPositions(player, recordID, tnt, tntID, 0);
}
@Register(value = "record", noTabComplete = true)
public void recordTNTPositions(Player player, int recordID, @StaticValue("tnt") String tnt, int tntID, int page) {
if (!permissionCheck(player)) return;
Record record = StoredRecords.get(recordID); Record record = StoredRecords.get(recordID);
if (record == null) { if (record == null) {
BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player); BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player);
@ -242,8 +205,7 @@ public class TraceCommand extends SWCommand {
} }
@Register(value = "record", noTabComplete = true) @Register(value = "record", noTabComplete = true)
public void recordTNTPositions(Player player, int recordID, @StaticValue("tnt") String tnt, int tntID, @StaticValue("fuse") String fuse, int fuseTicks) { public void recordTNTPositions(@Guard Player player, int recordID, @StaticValue("tnt") String tnt, int tntID, @StaticValue("fuse") String fuse, int fuseTicks) {
if (!permissionCheck(player)) return;
Record record = StoredRecords.get(recordID); Record record = StoredRecords.get(recordID);
if (record == null) { if (record == null) {
BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player); BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player);
@ -266,50 +228,40 @@ public class TraceCommand extends SWCommand {
BauSystem.MESSAGE.sendPrefixless("TRACE_CHAT_POSITION_EXPLODED", player, tntPosition.isExploded()); BauSystem.MESSAGE.sendPrefixless("TRACE_CHAT_POSITION_EXPLODED", player, tntPosition.isExploded());
} }
@Register({"start"}) @Register(value = {"start"}, description = "TRACE_COMMAND_HELP_START")
public void startCommand(Player p) { public void startCommand(@Guard Player p) {
if (!permissionCheck(p)) return;
RecordStateMachine.commandStart(); RecordStateMachine.commandStart();
BauSystem.MESSAGE.send("TRACE_MESSAGE_START", p); BauSystem.MESSAGE.send("TRACE_MESSAGE_START", p);
} }
@Register({"single"}) @Register(value = {"single"}, description = "TRACE_COMMAND_HELP_SINGLE")
public void singleCommand(Player p) { public void singleCommand(@Guard Player p) {
if (!permissionCheck(p)) return;
RecordStateMachine.commandSingle(); RecordStateMachine.commandSingle();
BauSystem.MESSAGE.send("TRACE_MESSAGE_SINGLE", p); BauSystem.MESSAGE.send("TRACE_MESSAGE_SINGLE", p);
} }
@Register({"stop"}) @Register(value = {"stop"}, description = "TRACE_COMMAND_HELP_STOP")
public void stopCommand(Player p) { public void stopCommand(@Guard Player p) {
if (!permissionCheck(p)) return;
RecordStateMachine.commandStop(); RecordStateMachine.commandStop();
BauSystem.MESSAGE.send("TRACE_MESSAGE_STOP", p); BauSystem.MESSAGE.send("TRACE_MESSAGE_STOP", p);
} }
@Register({"auto"}) @Register(value = {"auto"}, description = "TRACE_COMMAND_HELP_AUTO")
@Register({"toggleauto"}) @Register({"toggleauto"})
public void autoCommand(Player p) { public void autoCommand(@Guard Player p) {
if (!permissionCheck(p)) return;
RecordStateMachine.commandAuto(); RecordStateMachine.commandAuto();
BauSystem.MESSAGE.send(RecordStateMachine.getRecordStatus().getAutoMessage(), p); BauSystem.MESSAGE.send(RecordStateMachine.getRecordStatus().getAutoMessage(), p);
} }
@Register(value = {"delete"}, description = "TRACE_COMMAND_HELP_DELETE")
@Register({"clear"}) @Register({"clear"})
public void clearCommand(Player p) { public void deleteCommand(@Guard Player p) {
deleteCommand(p);
}
@Register({"delete"})
public void deleteCommand(Player p) {
if (!permissionCheck(p)) return;
StoredRecords.clear(); StoredRecords.clear();
BauSystem.MESSAGE.send("TRACE_MESSAGE_DELETE", p); BauSystem.MESSAGE.send("TRACE_MESSAGE_DELETE", p);
} }
@Register({"show"}) @Register(value = {"show"}, description = "TRACE_COMMAND_HELP_SHOW")
public void showCommand(Player p, @OptionalValue("entity") ShowModeType showModeType, ShowModeParameterType... showModeParameterTypes) { public void showCommand(@Guard Player p, @OptionalValue("entity") ShowModeType showModeType, ShowModeParameterType... showModeParameterTypes) {
if (!permissionCheck(p)) return;
ShowModeParameter showModeParameter = new ShowModeParameter(); ShowModeParameter showModeParameter = new ShowModeParameter();
for (ShowModeParameterType showModeParameterType : showModeParameterTypes) { for (ShowModeParameterType showModeParameterType : showModeParameterTypes) {
showModeParameterType.getShowModeParameterConsumer().accept(showModeParameter); showModeParameterType.getShowModeParameterConsumer().accept(showModeParameter);
@ -329,25 +281,28 @@ public class TraceCommand extends SWCommand {
private ShowModeParameterType[] removedTypes; private ShowModeParameterType[] removedTypes;
} }
@Register({"show", "gui"}) @Register(value = {"show", "gui"}, description = "TRACE_COMMAND_HELP_SHOW_GUI")
public void showGuiCommand(Player p) { public void showGuiCommand(@Guard Player p) {
if (!permissionCheck(p)) return;
TraceShowGui.openGui(p); TraceShowGui.openGui(p);
} }
@Register({"hide"}) @Register(value = {"hide"}, description = "TRACE_COMMAND_HELP_HIDE")
public void hideCommand(Player p) { public void hideCommand(@Guard Player p) {
if (!permissionCheck(p)) return;
TraceShowManager.hide(p); TraceShowManager.hide(p);
BauSystem.MESSAGE.send("TRACE_MESSAGE_HIDE", p); BauSystem.MESSAGE.send("TRACE_MESSAGE_HIDE", p);
} }
@ClassGuard(value = Player.class, local = true)
private boolean permissionCheck(Player player) { public GuardChecker guardChecker() {
if (!Permission.hasPermission(player, Permission.WORLD)) { return (commandSender, guardCheckType, strings, s) -> {
BauSystem.MESSAGE.send("TRACE_MESSAGE_DISALLOWED", player); Player player = (Player) commandSender;
return false; if (Permission.hasPermission(player, Permission.WORLD)) {
return GuardResult.ALLOWED;
} }
return true; if (guardCheckType != GuardCheckType.TAB_COMPLETE) {
BauSystem.MESSAGE.send("TRACE_MESSAGE_DISALLOWED", player);
}
return GuardResult.DENIED;
};
} }
} }

14
BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java
Datei anzeigen

@ -55,36 +55,36 @@ public class TracerBauGuiItem extends BauGuiItem {
SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("TRACE_GUI_NAME", p)); SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("TRACE_GUI_NAME", p));
if (status.isTracing()) { if (status.isTracing()) {
if (status.isAutoTrace()) { 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 { } 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"); p.performCommand("trace stop");
open(p); open(p);
})); }));
} }
} else { } 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"); p.performCommand("trace start");
open(p); open(p);
})); }));
} }
if (status.isAutoTrace()) { 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"); p.performCommand("trace auto");
open(p); open(p);
})); }));
} else { } 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"); p.performCommand("trace auto");
open(p); open(p);
})); }));
} }
if (TraceShowManager.hasActiveShow(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"); p.performCommand("trace show gui");
})); }));
} else { } 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"); p.performCommand("trace show gui");
})); }));
} }

4
BauSystem_Main/src/de/steamwar/bausystem/features/tracer/gui/TraceShowGui.java
Datei anzeigen

@ -56,13 +56,13 @@ public class TraceShowGui {
swInventory.setItem(5, water); swInventory.setItem(5, water);
swInventory.setCallback(5, clickType -> toggleHideTNTinWaterExploded(player, swInventory, 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.setItem(6, interpolateY);
swInventory.setCallback(6, clickType -> toggleInterpolateYPosition(player, swInventory, interpolateY)); swInventory.setCallback(6, clickType -> toggleInterpolateYPosition(player, swInventory, interpolateY));
Material xzMaterial = VersionedCallable.call(new VersionedCallable<>(TNTTracer_15::getTraceXZMaterial, 14)); 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.setItem(7, interpolateXZ);
swInventory.setCallback(7, clickType -> toggleInterpolateXZPosition(player, swInventory, interpolateXZ)); swInventory.setCallback(7, clickType -> toggleInterpolateXZPosition(player, swInventory, interpolateXZ));

12
BauSystem_Main/src/de/steamwar/bausystem/features/tracer/record/RecordStatus.java
Datei anzeigen

@ -21,12 +21,12 @@ package de.steamwar.bausystem.features.tracer.record;
public enum RecordStatus { public enum RecordStatus {
RECORD("TRACE_RECORD", true, "TRACE_MESSAGE-AUTO_RECORD"), RECORD("TRACE_RECORD", true, "TRACE_MESSAGE_AUTO_RECORD"),
RECORD_AUTO("TRACE_RECORD-AUTO", true, "TRACE_MESSAGE-AUTO_RECORD-AUTO"), RECORD_AUTO("TRACE_RECORD_AUTO", true, "TRACE_MESSAGE_AUTO_RECORD_AUTO"),
RECORD_SINGLE("TRACE_RECORD-SINGLE", true, ""), RECORD_SINGLE("TRACE_RECORD_SINGLE", true, ""),
IDLE("TRACE_IDLE", false, "TRACE_MESSAGE-AUTO_IDLE"), IDLE("TRACE_IDLE", false, "TRACE_MESSAGE_AUTO_IDLE"),
IDLE_AUTO("TRACE_IDLE-AUTO", false, "TRACE_MESSAGE-AUTO_IDLE-AUTO"), IDLE_AUTO("TRACE_IDLE_AUTO", false, "TRACE_MESSAGE_AUTO_IDLE_AUTO"),
IDLE_SINGLE("TRACE_IDLE-SINGLE", false, ""); IDLE_SINGLE("TRACE_IDLE_SINGLE", false, "");
String name; String name;
boolean tracing; boolean tracing;

4
BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java
Datei anzeigen

@ -19,7 +19,6 @@
package de.steamwar.bausystem.features.util; package de.steamwar.bausystem.features.util;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.SWUtils; import de.steamwar.bausystem.SWUtils;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
@ -35,9 +34,8 @@ public class DebugStickCommand extends SWCommand {
super("debugstick"); super("debugstick");
} }
@Register(description = "DEBUG-STICK_COMMAND_HELP") @Register(description = "DEBUG_STICK_COMMAND_HELP")
public void genericCommand(Player p) { public void genericCommand(Player p) {
SWUtils.giveItemToPlayer(p, new ItemStack(Material.DEBUG_STICK)); SWUtils.giveItemToPlayer(p, new ItemStack(Material.DEBUG_STICK));
} }
} }

4
BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java
Datei anzeigen

@ -108,7 +108,7 @@ public class MaterialCommand extends SWCommand implements Listener {
public SWListInv.SWListEntry<Material> toSWItem(Player p) { public SWListInv.SWListEntry<Material> toSWItem(Player p) {
List<String> lore = new ArrayList<>(); List<String> 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(blastResistance > 9 ? "MATERIAL_TNT_UNBREAKABLE" : "MATERIAL_TNT_BREAKABLE", p));
lore.add(BauSystem.MESSAGE.parse("MATERIAL_HARDNESS", p, hardness)); lore.add(BauSystem.MESSAGE.parse("MATERIAL_HARDNESS", p, hardness));
if (transparent) { if (transparent) {
@ -124,7 +124,7 @@ public class MaterialCommand extends SWCommand implements Listener {
lore.add(BauSystem.MESSAGE.parse("MATERIAL_OCCLUDING", p)); lore.add(BauSystem.MESSAGE.parse("MATERIAL_OCCLUDING", p));
} }
if (interacteable) { if (interacteable) {
lore.add(BauSystem.MESSAGE.parse("MATERIAL_INTERACT-ABLE", p)); lore.add(BauSystem.MESSAGE.parse("MATERIAL_INTERACTABLE", p));
} }
if (flammable) { if (flammable) {
lore.add(BauSystem.MESSAGE.parse("MATERIAL_FLAMMABLE", p)); lore.add(BauSystem.MESSAGE.parse("MATERIAL_FLAMMABLE", p));

14
BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java
Datei anzeigen

@ -20,10 +20,10 @@
package de.steamwar.bausystem.features.util; package de.steamwar.bausystem.features.util;
import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.SWUtils;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import net.md_5.bungee.api.ChatMessageType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
@ -35,20 +35,14 @@ public class NightVisionCommand extends SWCommand {
super("nightvision", "nv", "light"); super("nightvision", "nv", "light");
} }
@Register(help = true) @Register(description = "VISION_COMMAND_HELP")
public void genericHelp(Player p, String... args) {
BauSystem.MESSAGE.sendPrefixless("COMMAND_HELP_HEAD", p, "DebugStick");
BauSystem.MESSAGE.sendPrefixless("NIGHT-VISION_COMMAND_HELP", p);
}
@Register
public void genericCommand(Player p) { public void genericCommand(Player p) {
if (p.hasPotionEffect(PotionEffectType.NIGHT_VISION)) { if (p.hasPotionEffect(PotionEffectType.NIGHT_VISION)) {
p.removePotionEffect(PotionEffectType.NIGHT_VISION); p.removePotionEffect(PotionEffectType.NIGHT_VISION);
SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("NIGHT-VISION_OFF", p)); BauSystem.MESSAGE.sendPrefixless("NIGHT_VISION_OFF", p, ChatMessageType.ACTION_BAR);
return; return;
} }
p.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, 1000000, 255, false, false)); p.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, 1000000, 255, false, false));
SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("NIGHT-VISION_ON", p)); BauSystem.MESSAGE.sendPrefixless("NIGHT_VISION_ON", p, ChatMessageType.ACTION_BAR);
} }
} }

62
BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
Datei anzeigen

@ -8,6 +8,9 @@ import de.steamwar.bausystem.region.Point;
import de.steamwar.bausystem.region.Region; import de.steamwar.bausystem.region.Region;
import de.steamwar.bausystem.region.utils.RegionExtensionType; import de.steamwar.bausystem.region.utils.RegionExtensionType;
import de.steamwar.bausystem.region.utils.RegionType; import de.steamwar.bausystem.region.utils.RegionType;
import de.steamwar.command.GuardCheckType;
import de.steamwar.command.GuardChecker;
import de.steamwar.command.GuardResult;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.core.VersionedRunnable; import de.steamwar.core.VersionedRunnable;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -19,65 +22,39 @@ public class SelectCommand extends SWCommand {
super("select"); super("select");
} }
@Register(help = true) @Register(description = {"SELECT_HELP", "SELECT_EXTENSION_HELP"})
public void genericHelp(Player p, String... args) { public void baurahmenCommand(@Guard Player p, RegionType regionType, @OptionalValue("NORMAL") RegionExtensionType regionExtensionType) {
p.sendMessage("§8/§eselect §8[§7RegionsTyp§8] §8- §7Wähle einen RegionsTyp aus");
p.sendMessage("§8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Wähle einen RegionsTyp aus mit oder ohne Extension");
}
@Register
public void baurahmenCommand(Player p, RegionType regionType) {
if (!permissionCheck(p)) {
return;
}
Region region = Region.getRegion(p.getLocation()); Region region = Region.getRegion(p.getLocation());
if (region.isGlobal()) { if (region.isGlobal()) {
p.sendMessage(BauSystem.PREFIX + "§cDie globale Region kannst du nicht auswählen"); BauSystem.MESSAGE.send("SELECT_GLOBAL_REGION", p);
return; return;
} }
if (!region.hasType(regionType)) { if (!region.hasType(regionType)) {
p.sendMessage(BauSystem.PREFIX + "§cDiese Region hat keinen " + BauSystem.MESSAGE.parse(regionType.getChatValue(), p)); BauSystem.MESSAGE.send("SELECT_NO_TYPE", p, BauSystem.MESSAGE.parse(regionType.getChatValue(), p));
return;
}
setSelection(regionType, RegionExtensionType.NORMAL, region, p);
}
@Register
public void baurahmenCommand(Player p, RegionType regionType, RegionExtensionType regionExtensionType) {
if (!permissionCheck(p)) {
return;
}
Region region = Region.getRegion(p.getLocation());
if (region.isGlobal()) {
p.sendMessage(BauSystem.PREFIX + "§cDie globale Region kannst du nicht auswählen");
return;
}
if (!region.hasType(regionType)) {
p.sendMessage(BauSystem.PREFIX + "§cDiese Region hat keinen " + BauSystem.MESSAGE.parse(regionType.getChatValue(), p));
return; return;
} }
if (regionExtensionType == RegionExtensionType.EXTENSION && !region.hasExtensionType(regionType)) { if (regionExtensionType == RegionExtensionType.EXTENSION && !region.hasExtensionType(regionType)) {
p.sendMessage(BauSystem.PREFIX + "§cDiese Region hat keine Ausfahrmaße"); BauSystem.MESSAGE.send("SELECT_NO_EXTENSION", p);
return; return;
} }
setSelection(regionType, regionExtensionType, region, p); setSelection(regionType, regionExtensionType, region, p);
} }
@ClassGuard(value = Player.class, local = true)
private boolean permissionCheck(Player player) { public GuardChecker guardChecker() {
return (commandSender, guardCheckType, strings, s) -> {
Player player = (Player) commandSender;
if (Permission.hasPermission(player, Permission.WORLDEDIT)) { if (Permission.hasPermission(player, Permission.WORLDEDIT)) {
return true; return GuardResult.ALLOWED;
} }
player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier nicht den Select Befehl verwenden"); if (guardCheckType != GuardCheckType.TAB_COMPLETE) {
return false; BauSystem.MESSAGE.send("SELECT_NO_PERMS", player);
}
return GuardResult.DENIED;
};
} }
private void setSelection(RegionType regionType, RegionExtensionType regionExtensionType, Region region, Player p) { private void setSelection(RegionType regionType, RegionExtensionType regionExtensionType, Region region, Player p) {
@ -85,7 +62,6 @@ public class SelectCommand extends SWCommand {
Point maxPoint = region.getMaxPoint(regionType, regionExtensionType); Point maxPoint = region.getMaxPoint(regionType, regionExtensionType);
VersionedRunnable.call(new VersionedRunnable(() -> SelectCommand_15.setSelection(p, minPoint, maxPoint), 15)); VersionedRunnable.call(new VersionedRunnable(() -> SelectCommand_15.setSelection(p, minPoint, maxPoint), 15));
p.sendMessage(BauSystem.PREFIX + "WorldEdit auswahl auf " + minPoint.getX() + ", " + minPoint.getY() + ", " + minPoint.getZ() + " und " + maxPoint.getX() + ", " + maxPoint.getY() + ", " + maxPoint.getZ() + " gesetzt"); BauSystem.MESSAGE.send("SELECT_MESSAGE", p, minPoint.getX(), minPoint.getY(), minPoint.getZ(), maxPoint.getX(), maxPoint.getY(), maxPoint.getZ());
} }
} }

34
BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java
Datei anzeigen

@ -19,16 +19,22 @@
package de.steamwar.bausystem.features.util; package de.steamwar.bausystem.features.util;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.SWUtils; import de.steamwar.bausystem.SWUtils;
import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper;
import de.steamwar.inventory.SWItem; import de.steamwar.inventory.SWItem;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.inventory.meta.SkullMeta;
import java.util.List;
import java.util.stream.Collectors;
@Linked(LinkageType.COMMAND) @Linked(LinkageType.COMMAND)
public class SkullCommand extends SWCommand { public class SkullCommand extends SWCommand {
@ -36,18 +42,28 @@ public class SkullCommand extends SWCommand {
super("skull", "head"); super("skull", "head");
} }
@Register(help = true) @Register(description = "SKULL_HELP")
public void genericHelp(Player p, String... args) { public void giveCommand(Player p, @Mapper("player") String skull) {
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "skull " + ColorConfig.OTHER + "[" + ColorConfig.HIGHLIGHT + "Spieler" + ColorConfig.OTHER + "] - " + ColorConfig.BASE + "Gibt einen SpielerKopf");
}
@Register
public void giveCommand(Player p, String skull) {
ItemStack is = SWItem.getPlayerSkull(skull).getItemStack(); ItemStack is = SWItem.getPlayerSkull(skull).getItemStack();
SkullMeta sm = (SkullMeta) is.getItemMeta(); SkullMeta sm = (SkullMeta) is.getItemMeta();
assert sm != null; assert sm != null;
sm.setDisplayName(ColorConfig.HIGHLIGHT + skull + ColorConfig.OTHER + "s Kopf"); sm.setDisplayName(BauSystem.MESSAGE.parse("SKULL_ITEM", p, skull));
is.setItemMeta(sm); is.setItemMeta(sm);
SWUtils.giveItemToPlayer(p, is); SWUtils.giveItemToPlayer(p, is);
} }
@Mapper(value = "player", local = true)
public TypeMapper<String> typeMapper() {
return new TypeMapper<String>() {
@Override
public String map(CommandSender commandSender, String[] previousArguments, String s) {
return s;
}
@Override
public List<String> tabCompletes(CommandSender commandSender, String[] strings, String s) {
return Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList());
}
};
}
} }

11
BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java
Datei anzeigen

@ -20,7 +20,6 @@
package de.steamwar.bausystem.features.util; package de.steamwar.bausystem.features.util;
import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
@ -35,21 +34,21 @@ public class SpeedCommand extends SWCommand {
@Register(help = true) @Register(help = true)
public void genericHelp(Player p, String... args) { public void genericHelp(Player p, String... args) {
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "speed " + ColorConfig.OTHER + "[" + ColorConfig.HIGHLIGHT + "1" + ColorConfig.OTHER + "-" + ColorConfig.HIGHLIGHT + "10" + ColorConfig.OTHER + "] - " + ColorConfig.BASE + "Setzte deine Flug- und Laufgeschindigkeit."); BauSystem.MESSAGE.sendPrefixless("SPEED_HELP", p);
p.sendMessage(BauSystem.PREFIX + "Aktuelle geschwindigkeit: " + ColorConfig.HIGHLIGHT + (p.getFlySpeed() * 10F)); BauSystem.MESSAGE.send("SPEED_CURRENT", p, (p.getFlySpeed() * 10F));
} }
@Register @Register
public void speedCommand(Player p, float speed) { public void speedCommand(Player p, float speed) {
speed = speed / 10F; speed = speed / 10F;
if (speed < -1F) { if (speed < -1F) {
p.sendMessage(BauSystem.PREFIX + ColorConfig.DISABLE + speed + " ist zu klein"); BauSystem.MESSAGE.send("SPEED_TOO_SMALL", p, speed);
} else if (speed > 1F) { } else if (speed > 1F) {
p.sendMessage(BauSystem.PREFIX + ColorConfig.DISABLE + speed + " ist zu hoch"); BauSystem.MESSAGE.send("SPEED_TOO_HIGH", p, speed);
} else { } else {
p.setFlySpeed(speed); p.setFlySpeed(speed);
p.setWalkSpeed(Math.min(speed + 0.1F, 1F)); p.setWalkSpeed(Math.min(speed + 0.1F, 1F));
p.sendMessage(BauSystem.PREFIX + "Aktuelle geschwindigkeit: " + ColorConfig.HIGHLIGHT + (p.getFlySpeed() * 10F)); BauSystem.MESSAGE.send("SPEED_CURRENT", p, (p.getFlySpeed() * 10F));
} }
} }

12
BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java
Datei anzeigen

@ -19,7 +19,6 @@
package de.steamwar.bausystem.features.util; package de.steamwar.bausystem.features.util;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.SWUtils; import de.steamwar.bausystem.SWUtils;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
@ -33,18 +32,9 @@ public class StructureVoidCommand extends SWCommand {
public StructureVoidCommand() { public StructureVoidCommand() {
super("structureVoid", "structure", "void", "structurevoid"); super("structureVoid", "structure", "void", "structurevoid");
setMessage(BauSystem.MESSAGE);
} }
/* @Register(description = "STRUCTURE_VOID_COMMAND_HELP")
@Register(help = true)
public void genericHelp(Player p, String... args) {
BauSystem.MESSAGE.send("COMMAND_HELP_HEAD", p, "structureVoid");
BauSystem.MESSAGE.send("STRUCTURE-VOID_COMMAND_HELP", p);
}
*/
@Register(description = "STRUCTURE-VOID_COMMAND_HELP")
public void genericCommand(Player p) { public void genericCommand(Player p) {
SWUtils.giveItemToPlayer(p, new ItemStack(Material.STRUCTURE_VOID, 1)); SWUtils.giveItemToPlayer(p, new ItemStack(Material.STRUCTURE_VOID, 1));
} }

15
BauSystem_Main/src/de/steamwar/bausystem/features/util/WaterVisionCommand.java
Datei anzeigen

@ -19,11 +19,11 @@
package de.steamwar.bausystem.features.util; package de.steamwar.bausystem.features.util;
import de.steamwar.bausystem.SWUtils; import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import net.md_5.bungee.api.ChatMessageType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
@ -35,19 +35,14 @@ public class WaterVisionCommand extends SWCommand {
super("watervision", "wv"); super("watervision", "wv");
} }
@Register(help = true) @Register(description = "WATER_VISION_HELP")
public void help(final Player p, final String... args) {
p.sendMessage(ColorConfig.OTHER + "/" + ColorConfig.HIGHLIGHT + "watervision " + ColorConfig.OTHER + "-" + ColorConfig.BASE + " Schalte Watervision an oder aus.");
}
@Register
public void genericCommand(Player p) { public void genericCommand(Player p) {
if (p.hasPotionEffect(PotionEffectType.WATER_BREATHING)) { if (p.hasPotionEffect(PotionEffectType.WATER_BREATHING)) {
p.removePotionEffect(PotionEffectType.WATER_BREATHING); p.removePotionEffect(PotionEffectType.WATER_BREATHING);
SWUtils.sendToActionbar(p, ColorConfig.HIGHLIGHT + "Wassersicht deaktiviert"); BauSystem.MESSAGE.sendPrefixless("WATER_VISION_DISABLE", p, ChatMessageType.ACTION_BAR);
return; return;
} }
p.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 1000000, 255, false, false)); p.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 1000000, 255, false, false));
SWUtils.sendToActionbar(p, ColorConfig.HIGHLIGHT + "Wassersicht aktiviert"); BauSystem.MESSAGE.sendPrefixless("WATER_VISION_ENABLE", p, ChatMessageType.ACTION_BAR);
} }
} }

4
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
Datei anzeigen

@ -19,8 +19,8 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.linkage.specific.BauGuiItem; import de.steamwar.bausystem.linkage.specific.BauGuiItem;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
@ -39,7 +39,7 @@ public class DebugstickBauGuiItem extends BauGuiItem {
@Override @Override
public ItemStack getItem(Player player) { public ItemStack getItem(Player player) {
return new SWItem(Material.DEBUG_STICK, ColorConfig.HIGHLIGHT + "Debugstick").getItemStack(); return new SWItem(Material.DEBUG_STICK, BauSystem.MESSAGE.parse("DEBUG_STICK_NAME", player)).getItemStack();
} }
@Override @Override

12
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
Datei anzeigen

@ -19,6 +19,7 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
@ -38,19 +39,16 @@ public class NavWandBauGuiItem extends BauGuiItem {
super(27); super(27);
} }
@Override @Override public Permission permission() {
public Permission permission() {
return Permission.WORLDEDIT; return Permission.WORLDEDIT;
} }
@Override @Override public ItemStack getItem(Player player) {
public ItemStack getItem(Player player) { return new SWItem(Material.COMPASS, BauSystem.MESSAGE.parse("NAVIGATION_WAND", player), Arrays.asList(BauSystem.MESSAGE.parse("NAVIGATION_WAND_LEFT_CLICK", player), BauSystem.MESSAGE.parse("NAVIGATION_WAND_RIGHT_CLICK", player)), false, clickType -> {
return new SWItem(Material.COMPASS, "Navigation Wand", Arrays.asList("Left click: jump to location", "Right click: pass through walls"), false, clickType -> {
}).getItemStack(); }).getItemStack();
} }
@Override @Override public boolean click(ClickType click, Player p) {
public boolean click(ClickType click, Player p) {
p.performCommand("/wand -n"); p.performCommand("/wand -n");
p.closeInventory(); p.closeInventory();
return false; return false;

8
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
Datei anzeigen

@ -19,11 +19,11 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; 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.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.bausystem.linkage.specific.BauGuiItem;
import de.steamwar.inventory.SWItem; import de.steamwar.inventory.SWItem;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -46,12 +46,12 @@ public class NightVisionBauGuiItem extends BauGuiItem {
ItemStack itemStack = new ItemStack(Material.POTION); ItemStack itemStack = new ItemStack(Material.POTION);
PotionMeta meta = (PotionMeta) itemStack.getItemMeta(); PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
meta.setColor(PotionEffectType.NIGHT_VISION.getColor()); meta.setColor(PotionEffectType.NIGHT_VISION.getColor());
meta.setDisplayName(ColorConfig.BASE + "Nightvision: " + ColorConfig.HIGHLIGHT + "Aktiviert"); meta.setDisplayName(BauSystem.MESSAGE.parse("NIGHT_VISION_ITEM_ON", player));
meta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS); meta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS);
itemStack.setItemMeta(meta); itemStack.setItemMeta(meta);
return itemStack; return itemStack;
} else { } else {
return new SWItem(Material.GLASS_BOTTLE, ColorConfig.BASE + "Nightvision: " + ColorConfig.HIGHLIGHT + "Deaktiviert").getItemStack(); return new SWItem(Material.GLASS_BOTTLE, BauSystem.MESSAGE.parse("NIGHT_VISION_ITEM_OFF", player)).getItemStack();
} }
} }

20
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
Datei anzeigen

@ -19,11 +19,11 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; 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.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.bausystem.linkage.specific.BauGuiItem;
import de.steamwar.bausystem.region.utils.RegionExtensionType; import de.steamwar.bausystem.region.utils.RegionExtensionType;
import de.steamwar.bausystem.region.utils.RegionType; import de.steamwar.bausystem.region.utils.RegionType;
import de.steamwar.inventory.SWInventory; import de.steamwar.inventory.SWInventory;
@ -51,9 +51,9 @@ public class SelectBauGuiItem extends BauGuiItem {
private static void selectExtension(Player p, RegionType type) { private static void selectExtension(Player p, RegionType type) {
p.closeInventory(); p.closeInventory();
SWInventory inv = new SWInventory(p, 9, "Extension auswählen"); SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("SELECT_ITEM_CHOOSE_EXTENSION", p));
inv.setItem(2, new SWItem(Material.END_STONE, ColorConfig.HIGHLIGHT + "Normal", clickType -> selectFinish(p, type, RegionExtensionType.NORMAL))); inv.setItem(2, new SWItem(Material.END_STONE, BauSystem.MESSAGE.parse("SELECT_ITEM_NORMAL_EXTENSION", p), clickType -> selectFinish(p, type, RegionExtensionType.NORMAL)));
inv.setItem(6, new SWItem(Material.PISTON, ColorConfig.HIGHLIGHT + "Ausfahrmaße", clickType -> selectFinish(p, type, RegionExtensionType.EXTENSION))); inv.setItem(6, new SWItem(Material.PISTON, BauSystem.MESSAGE.parse("SELECT_ITEM_EXTENDED_EXTENSION", p), clickType -> selectFinish(p, type, RegionExtensionType.EXTENSION)));
inv.open(); inv.open();
} }
@ -66,7 +66,7 @@ public class SelectBauGuiItem extends BauGuiItem {
@Override @Override
public ItemStack getItem(Player player) { public ItemStack getItem(Player player) {
LastSelect last = LAST_SELECT_MAP.getOrDefault(player, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL)); LastSelect last = LAST_SELECT_MAP.getOrDefault(player, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
return new SWItem(Material.SCAFFOLDING, ColorConfig.HIGHLIGHT + "Select", Arrays.asList(ColorConfig.BASE + "Auswahl: " + ColorConfig.HIGHLIGHT + last.toString(), ColorConfig.BASE + "Rechtklick zum ändern"), false, clickType -> { return new SWItem(Material.SCAFFOLDING, BauSystem.MESSAGE.parse("SELECT_ITEM_SELECT", player), Arrays.asList(BauSystem.MESSAGE.parse("SELECT_ITEM_AUSWAHL", player, BauSystem.MESSAGE.parse(last.type.getChatValue(), player), last.extensionType.name()), BauSystem.MESSAGE.parse("SELECT_ITEM_RIGHT_CLICK", player)), false, clickType -> {
}).getItemStack(); }).getItemStack();
} }
@ -74,10 +74,10 @@ public class SelectBauGuiItem extends BauGuiItem {
public boolean click(ClickType click, Player p) { public boolean click(ClickType click, Player p) {
if (click == ClickType.RIGHT) { if (click == ClickType.RIGHT) {
p.closeInventory(); p.closeInventory();
SWInventory inv = new SWInventory(p, 9, "Auswahl auswählen"); SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("SELECT_ITEM_CHOOSE_SELECTION", p));
inv.setItem(2, new SWItem(Material.REDSTONE_BLOCK, ColorConfig.HIGHLIGHT + "Baurahmen", clickType -> selectExtension(p, RegionType.BUILD))); inv.setItem(2, new SWItem(Material.REDSTONE_BLOCK, BauSystem.MESSAGE.parse("SELECT_ITEM_BAURAHMEN", p), clickType -> selectExtension(p, RegionType.BUILD)));
inv.setItem(4, new SWItem(Material.LECTERN, ColorConfig.HIGHLIGHT + "Bauplattform", clickType -> selectFinish(p, RegionType.NORMAL, RegionExtensionType.NORMAL))); inv.setItem(4, new SWItem(Material.LECTERN, BauSystem.MESSAGE.parse("SELECT_ITEM_BAUPLATTFORM", p), clickType -> selectFinish(p, RegionType.NORMAL, RegionExtensionType.NORMAL)));
inv.setItem(6, new SWItem(Material.END_STONE, ColorConfig.HIGHLIGHT + "Testblock", clickType -> selectExtension(p, RegionType.TESTBLOCK))); inv.setItem(6, new SWItem(Material.END_STONE, BauSystem.MESSAGE.parse("SELECT_ITEM_TESTBLOCK", p), clickType -> selectExtension(p, RegionType.TESTBLOCK)));
inv.open(); inv.open();
} else { } else {
p.closeInventory(); p.closeInventory();

3
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
Datei anzeigen

@ -19,6 +19,7 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.config.ColorConfig; import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.linkage.specific.BauGuiItem; import de.steamwar.bausystem.linkage.specific.BauGuiItem;
@ -46,7 +47,7 @@ public class SkullBauGuiItem extends BauGuiItem {
@Override @Override
public boolean click(ClickType click, Player p) { public boolean click(ClickType click, Player p) {
p.closeInventory(); p.closeInventory();
SWAnvilInv inv = new SWAnvilInv(p, "Spieler namen"); SWAnvilInv inv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("ANVIL_INV_NAME",p));
inv.setItem(Material.NAME_TAG); inv.setItem(Material.NAME_TAG);
inv.setCallback(s -> p.performCommand("skull " + s)); inv.setCallback(s -> p.performCommand("skull " + s));
inv.open(); inv.open();

5
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
Datei anzeigen

@ -19,6 +19,7 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.config.ColorConfig; import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.linkage.specific.BauGuiItem; import de.steamwar.bausystem.linkage.specific.BauGuiItem;
@ -42,14 +43,14 @@ public class SpeedBauGuiItem extends BauGuiItem {
@Override @Override
public ItemStack getItem(Player player) { public ItemStack getItem(Player player) {
return new SWItem(Material.SUGAR, ColorConfig.HIGHLIGHT + "Geschwindigkeit", Arrays.asList(ColorConfig.BASE + "Aktuell: " + ColorConfig.HIGHLIGHT + player.getFlySpeed() * 10f), false, clickType -> { return new SWItem(Material.SUGAR, BauSystem.MESSAGE.parse("SPEED_ITEM", player), Arrays.asList(BauSystem.MESSAGE.parse("SPEED_ITEM_LORE", player) + player.getFlySpeed() * 10f), false, clickType -> {
}).getItemStack(); }).getItemStack();
} }
@Override @Override
public boolean click(ClickType click, Player p) { public boolean click(ClickType click, Player p) {
p.closeInventory(); p.closeInventory();
SWAnvilInv inv = new SWAnvilInv(p, "Geschwindigkeit eingeben"); SWAnvilInv inv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("SPEED_TAB_NAME", p));
inv.setItem(Material.SUGAR); inv.setItem(Material.SUGAR);
inv.setCallback(s -> p.performCommand("speed " + s)); inv.setCallback(s -> p.performCommand("speed " + s));
inv.open(); inv.open();

5
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WaterVisionBauGuiItem.java
Datei anzeigen

@ -19,6 +19,7 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.config.ColorConfig; import de.steamwar.bausystem.config.ColorConfig;
import de.steamwar.bausystem.linkage.specific.BauGuiItem; import de.steamwar.bausystem.linkage.specific.BauGuiItem;
@ -41,9 +42,9 @@ public class WaterVisionBauGuiItem extends BauGuiItem {
@Override @Override
public ItemStack getItem(Player player) { public ItemStack getItem(Player player) {
if (player.hasPotionEffect(PotionEffectType.WATER_BREATHING)) { if (player.hasPotionEffect(PotionEffectType.WATER_BREATHING)) {
return new SWItem(Material.WATER_BUCKET, ColorConfig.BASE + "Wassersicht: " + ColorConfig.HIGHLIGHT + "Aktiviert").getItemStack(); return new SWItem(Material.WATER_BUCKET, BauSystem.MESSAGE.parse("WATER_SIGHT_ON", player)).getItemStack();
} else { } else {
return new SWItem(Material.BUCKET, ColorConfig.BASE + "Wassersicht: " + ColorConfig.HIGHLIGHT + "Deaktiviert").getItemStack(); return new SWItem(Material.BUCKET, BauSystem.MESSAGE.parse("WATER_SIGHT_OFF", player)).getItemStack();
} }
} }

3
BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
Datei anzeigen

@ -19,6 +19,7 @@
package de.steamwar.bausystem.features.util.items; package de.steamwar.bausystem.features.util.items;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.linkage.LinkageType; import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
@ -45,7 +46,7 @@ public class WorldEditBauGuiItem extends BauGuiItem {
@Override @Override
public ItemStack getItem(Player player) { public ItemStack getItem(Player player) {
return new SWItem(Material.WOODEN_AXE, "WorldEdit Wand", Arrays.asList("Left click: select pos #1", "Right click: select pos #2"), false, clickType -> { return new SWItem(Material.WOODEN_AXE, BauSystem.MESSAGE.parse("WORLDEDIT_WAND", player), Arrays.asList(BauSystem.MESSAGE.parse("WORLDEDIT_LEFTCLICK", player), BauSystem.MESSAGE.parse("WORLDEDIT_RIGHTCLICK", player)), false, clickType -> {
}).getItemStack(); }).getItemStack();
} }

51
BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
Datei anzeigen

@ -27,9 +27,7 @@ import de.steamwar.bausystem.linkage.LinkageType;
import de.steamwar.bausystem.linkage.Linked; import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.bausystem.utils.ListChatView; import de.steamwar.bausystem.utils.ListChatView;
import de.steamwar.bausystem.worlddata.WorldData; import de.steamwar.bausystem.worlddata.WorldData;
import de.steamwar.command.SWCommand; import de.steamwar.command.*;
import de.steamwar.command.SWCommandUtils;
import de.steamwar.command.TypeMapper;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
@ -58,25 +56,14 @@ public class WarpCommand extends SWCommand implements Disable, Enable {
return SWCommandUtils.createMapper(Warp::getWarp, (commandSender, s) -> new ArrayList<>(Warp.getWarpNames())); return SWCommandUtils.createMapper(Warp::getWarp, (commandSender, s) -> new ArrayList<>(Warp.getWarpNames()));
} }
@Register(help = true) @Register(value = "moon", noTabComplete = true)
public void genericHelp(Player player, String... args) { public void tpMoon(Player p) {
if (args.length > 0 && args[0].equals("moon")) { Moon.startMoon(p);
Moon.startMoon(player);
return;
}
BauSystem.MESSAGE.sendPrefixless("COMMAND_HELP_HEAD", player, "Warp");
BauSystem.MESSAGE.sendPrefixless("WARP_HELP_1", player);
BauSystem.MESSAGE.sendPrefixless("WARP_HELP_2", player);
BauSystem.MESSAGE.sendPrefixless("WARP_HELP_3", player);
BauSystem.MESSAGE.sendPrefixless("WARP_HELP_4", player);
BauSystem.MESSAGE.sendPrefixless("WARP_HELP_5", player);
BauSystem.MESSAGE.sendPrefixless("WARP_HELP_6", player);
} }
@Register("add") @Register(value = "add", description = "WARP_HELP_ADD")
@Register("create") @Register("create")
public void addWarp(Player player, String name) { public void addWarp(@Guard Player player, String name) {
if (!permissionCheck(player)) return;
for (String forbiddenName : FORBIDDEN_NAMES) { for (String forbiddenName : FORBIDDEN_NAMES) {
if (name.equalsIgnoreCase(forbiddenName)) { if (name.equalsIgnoreCase(forbiddenName)) {
BauSystem.MESSAGE.send("WARP_NAME_RESERVED", player, name); BauSystem.MESSAGE.send("WARP_NAME_RESERVED", player, name);
@ -91,24 +78,23 @@ public class WarpCommand extends SWCommand implements Disable, Enable {
BauSystem.MESSAGE.send("WARP_CREATED", player, name); BauSystem.MESSAGE.send("WARP_CREATED", player, name);
} }
@Register @Register(description = "WARP_HELP_TELEPORT")
public void tpWarp(Player player, Warp warp) { public void tpWarp(Player player, Warp warp) {
warp.teleport(player); warp.teleport(player);
} }
@Register("delete") @Register(value = "delete", description = "WARP_HELP_DELETE")
public void deleteWarp(Player player, Warp warp) { public void deleteWarp(@Guard Player player, Warp warp) {
if (!permissionCheck(player)) return;
warp.delete(); warp.delete();
BauSystem.MESSAGE.send("WARP_DELETED", player, warp.getName()); BauSystem.MESSAGE.send("WARP_DELETED", player, warp.getName());
} }
@Register("gui") @Register(value = "gui", description = "WARP_HELP_GUI")
public void gui(Player player) { public void gui(Player player) {
WarpGui.openGui(player); WarpGui.openGui(player);
} }
@Register("list") @Register(value = "list", description = "WARP_HELP_LIST")
public void listWarps(Player player) { public void listWarps(Player player) {
listWarps(player, 0); listWarps(player, 0);
} }
@ -131,7 +117,7 @@ public class WarpCommand extends SWCommand implements Disable, Enable {
}); });
} }
@Register("info") @Register(value = "info", description = "WARP_HELP_INFO")
public void warpInfo(Player player, Warp warp) { public void warpInfo(Player player, Warp warp) {
BauSystem.MESSAGE.send("COMMAND_HELP_HEAD", player, warp.getName()); BauSystem.MESSAGE.send("COMMAND_HELP_HEAD", player, warp.getName());
BauSystem.MESSAGE.sendPrefixless("WARP_INFO_NAME", player, warp.getName()); BauSystem.MESSAGE.sendPrefixless("WARP_INFO_NAME", player, warp.getName());
@ -141,13 +127,18 @@ public class WarpCommand extends SWCommand implements Disable, Enable {
BauSystem.MESSAGE.sendPrefixless("WARP_GUI_DISTANCE", player, warp.getLocation().distance(player.getLocation())); BauSystem.MESSAGE.sendPrefixless("WARP_GUI_DISTANCE", player, warp.getLocation().distance(player.getLocation()));
} }
@SuppressWarnings("BooleanMethodIsAlwaysInverted") @ClassGuard(value = Player.class, local = true)
private boolean permissionCheck(Player player) { public GuardChecker commandGuard() {
return (commandSender, guardCheckType, strings, s) -> {
Player player = (Player) commandSender;
if (!Permission.hasPermission(player, Permission.WORLD)) { if (!Permission.hasPermission(player, Permission.WORLD)) {
if (guardCheckType != GuardCheckType.TAB_COMPLETE) {
BauSystem.MESSAGE.send("WARP_DISALLOWED", player); BauSystem.MESSAGE.send("WARP_DISALLOWED", player);
return false;
} }
return true; return GuardResult.DENIED;
}
return GuardResult.ALLOWED;
};
} }
@Linked(LinkageType.COMMAND) @Linked(LinkageType.COMMAND)

3
BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java
Datei anzeigen

@ -37,9 +37,8 @@ public class WorldEditListener implements Listener {
if (!isWorldEditCommand(e.getMessage().split(" ")[0])) return; if (!isWorldEditCommand(e.getMessage().split(" ")[0])) return;
Player p = e.getPlayer(); Player p = e.getPlayer();
if (!Permission.hasPermission(p, Permission.WORLDEDIT)) { if (!Permission.hasPermission(p, Permission.WORLDEDIT)) {
p.sendMessage(BauSystem.PREFIX + "§cDu darfst hier kein WorldEdit benutzen"); BauSystem.MESSAGE.send("WORLD_EDIT_NO_PERMS", p);
e.setCancelled(true); e.setCancelled(true);
} }
} }

4
BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java
Datei anzeigen

@ -30,12 +30,12 @@ public enum ColorMode implements Flag.Value<ColorMode> {
WHITE("FLAG_COLOR_WHITE", Color.WHITE), WHITE("FLAG_COLOR_WHITE", Color.WHITE),
ORANGE("FLAG_COLOR_ORANGE", Color.ORANGE), ORANGE("FLAG_COLOR_ORANGE", Color.ORANGE),
MAGENTA("FLAG_COLOR_MAGENTA", Color.MAGENTA), 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), YELLOW("FLAG_COLOR_YELLOW", Color.YELLOW),
LIME("FLAG_COLOR_LIME", Color.LIME), LIME("FLAG_COLOR_LIME", Color.LIME),
PINK("FLAG_COLOR_PINK", Color.PINK), PINK("FLAG_COLOR_PINK", Color.PINK),
GRAY("FLAG_COLOR_GRAY", Color.GRAY), 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), CYAN("FLAG_COLOR_CYAN", Color.CYAN),
PURPLE("FLAG_COLOR_PURPLE", Color.PURPLE), PURPLE("FLAG_COLOR_PURPLE", Color.PURPLE),
BLUE("FLAG_COLOR_BLUE", Color.BLUE), BLUE("FLAG_COLOR_BLUE", Color.BLUE),

2
BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
Datei anzeigen

@ -29,7 +29,7 @@ public enum TNTMode implements Flag.Value<TNTMode> {
ALLOW("FLAG_TNT_ALLOW"), ALLOW("FLAG_TNT_ALLOW"),
DENY("FLAG_TNT_DENY"), DENY("FLAG_TNT_DENY"),
ONLY_TB("FLAG_TNT_ONLY-TB"); ONLY_TB("FLAG_TNT_ONLY_TB");
private static TNTMode[] values; private static TNTMode[] values;
private final String chatValue; private final String chatValue;