Merge remote-tracking branch 'origin/Translatable' into Translatable

BauSystem_Main/src/BauSystem.properties

@@ -865,9 +865,11 @@ OTHER_TPS_SINGLE = §8TPS: §e{0}
 OTHER_WORLDSPAWN_HELP=§8/§eworldspawn §8-§e Teleportiere dich zum Spawn
 # DebugStick
 DEBUG-STICK_COMMAND_HELP=§8/§edebugstick §8-§7 Erhalte einen DebugStick
-DEBUG-STICK=&eDEBUGSTICK
+DEBUG-STICK_NAME=§eDEBUGSTICK
+#Skull Gui
+ANVIL-INV_NAME="Spieler namen"
 # StructureVoid
-STRUCTURE_VOID_COMMAND_HELP=§8/§estructureVoid §8-§7 Erhalte ein StructureVoid
+STRUCTURE-VOID_COMMAND_HELP=§8/§estructureVoid §8-§7 Erhalte ein StructureVoid
 # NightVision
 NIGHT-VISION_COMMAND_HELP=§8/§enightvision §8-§7 Schalte Nightvision an oder aus.
 NIGHT-VISION_OFF=§eNightvision deaktiviert
@@ -1066,13 +1068,17 @@ TNT_CLICK_VELOCITY_X = §7Velocity §eX§8: §e{0}
 TNT_CLICK_VELOCITY_Y = §7Velocity §eY§8: §e{0}
 TNT_CLICK_VELOCITY_Z = §7Velocity §eZ§8: §e{0}
 
-WATER_VISION_HELP = §8/§ewatervision §8- §7Schalte Watervision an oder aus.
-WATER_VISION_DISABLE = §eWassersicht deaktiviert
-WATER_VISION_ENABLE = §eWassersicht aktiviert
-
 #Select Util
-SELECT_GUI_CHOOSE_EXTENSION = Extension auswählen
+SELECT_ITEM_CHOOSE_EXTENSION ="Extension auswählen"
-SELECT_GUI_CHOOSE_SELECTION = Auswahl 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"
+SELECT_ITEM_RIGHT_CLICK="&7Rechtklick zum ändern"
+SELECT_ITEM_BAURAHMEN="§eBaurahmen"
+SELECT_ITEM_BAUPLATTFORM="§eBauplattform"
+SELECT_ITEM_TESTBLOCK="§eTestblock"
 
 # Warp
 WARP_DISALLOWED = §cDu darfst hier nicht das Warp System nutzen
@@ -1105,4 +1111,3 @@ WARP_MOON_COUNTDOOWN=§7Noch §e§l{0} §7Sekunden!
 STOP_HELP = §8/§estop §8- §7Stoppt den Server
 STOP_NO_PERMS = §cDu hast keine Rechte den Server zu stoppen
 STOP_MESSAGE = §eDer Server wird gestoppt
-WORLD_EDIT_NO_PERMS = §cDu darfst hier kein WorldEdit benutzen

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

@@ -52,9 +52,9 @@ public class SelectBauGuiItem extends BauGuiItem {
 
     private static void selectExtension(Player p, RegionType type) {
         p.closeInventory();
-        SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("SELECT_GUI_CHOOSE_EXTENSION", p));
+        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();
     }
 
@@ -67,7 +67,7 @@ public class SelectBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         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_EXTENDED_EXTENSION",player), Arrays.asList(BauSystem.MESSAGE.parse("EXTENDED_EXTENSION", player) + last.toString(), BauSystem.MESSAGE.parse("RIGHT_CLICK", player)), false, clickType -> {
         }).getItemStack();
     }
 
@@ -75,10 +75,10 @@ public class SelectBauGuiItem extends BauGuiItem {
     public boolean click(ClickType click, Player p) {
         if (click == ClickType.RIGHT) {
             p.closeInventory();
-            SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("SELECT_GUI_CHOOSE_SELECTION", p));
+            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();
         } else {
             p.closeInventory();

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

@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.features.util.items;
 
+import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.ColorConfig;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
@@ -46,7 +47,7 @@ public class SkullBauGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         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.setCallback(s -> p.performCommand("skull " + s));
         inv.open();