Merge branch 'master' into commonDB

BauSystem_Main/src/BauSystem.properties

@@ -123,6 +123,7 @@ BAU_INFO_ITEM_NAME = §eBau-Management
 ## This is used in BauInfoBauGuiItem.java
 BAU_INFO_ITEM_LORE_TNT = §7TNT§8: §e{0}
 BAU_INFO_ITEM_LORE_FREEZE = §7Freeze§8: §e{0}
+BAU_INFO_ITEM_LORE_DAMAGE=
 BAU_INFO_ITEM_LORE_FIRE = §7Fire§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR = §7Color§8: §e{0}
 BAU_INFO_ITEM_LORE_PROTECT = §7Protect§8: §e{0}
@@ -200,6 +201,7 @@ GUI_EDITOR_ITEM_ROW_M=§e-1 Row
 GUI_EDITOR_ITEM_TRASH=§cTrashcan
 GUI_EDITOR_ITEM_TRASH_LORE=§7Drop item here
 GUI_EDITOR_ITEM_MORE=§eMore items
+GUI_EDITOR_ITEM_CLOSE=§eClose
 GUI_EDITOR_TITLE_MORE=Select item
 
 # Script
@@ -882,7 +884,7 @@ OTHER_TIME_RESULT=§7§oWhooosh
 OTHER_TPS_HEAD = §7TPS: 1s     10s    1m     5m     10m
 OTHER_TPS_MESSAGE = §7      §e{0}§7     §e{1}§7     §e{2}§7     §e{3}§7     §e{4}
 OTHER_TPS_SINGLE = §8TPS: §e{0}
-OTHER_WORLDSPAWN_HELP=§8/§eworldspawn §8-§e Teleprot to the spawn
+OTHER_WORLDSPAWN_HELP=§8/§eworldspawn §8-§e Teleport to the spawn
 # DebugStick
 DEBUG_STICK_COMMAND_HELP=§8/§edebugstick §8-§7 receive a debugstick
 DEBUG_STICK_NAME=§eDebugstick
@@ -948,7 +950,7 @@ RT_ACTIVATE=§7Positions deleted§8.
 # Region Items
 REGION_ITEM_COLOR=§7Color: §e{0}
 REGION_ITEM_COLOR_CHOOSE=Choose color
-REGION_ITEM_FIRE_ALLOW=§7Fire: §eAcitvated
+REGION_ITEM_FIRE_ALLOW=§7Fire: §eActivated
 REGION_ITEM_FIRE_DISALLOW=§7Fire: §eDeactivated
 REGION_ITEM_FREEZE_ALLOW=§7Freeze: §eActivated
 REGION_ITEM_FREEZE_DISALLOW=§7Freeze: §eDeactivated
@@ -1287,3 +1289,6 @@ XRAY_OFF = §cXray deactivated
 COLORREPLACE_HELP = §8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Replace all blocks of one color with another
 
 TYPEREPLACE_HELP = §8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
+
+# Schematic
+SCHEMATIC_GUI_ITEM=§eSchematics

BauSystem_Main/src/BauSystem_de.properties

@@ -200,6 +200,7 @@ GUI_EDITOR_ITEM_ROW_M=§e-1 Zeile
 GUI_EDITOR_ITEM_TRASH=§cTrashcan
 GUI_EDITOR_ITEM_TRASH_LORE=§7Item hier rein Legen
 GUI_EDITOR_ITEM_MORE=§eMehr Items
+GUI_EDITOR_ITEM_CLOSE=§eSchließen
 GUI_EDITOR_TITLE_MORE=Item auswählen
 
 # Script
@@ -1187,7 +1188,7 @@ 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}
 TNT_CLICK_COUNT = §7Anzahl §8: §e{0}
-
+TNT_CLICK_ISOLATE=§eIsolieren
 SELECT_ITEM_CHOOSE_EXTENSION = Extension auswählen
 SELECT_ITEM_CHOOSE_SELECTION = Auswahl auswählen
 SELECT_ITEM_NORMAL_EXTENSION = §eNormal
@@ -1257,3 +1258,6 @@ XRAY_OFF = §cXray deaktiviert
 COLORREPLACE_HELP = §8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Ersetzt eine Farbe mit einer anderen
 
 TYPEREPLACE_HELP = §8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Ersetzt einen Blockgruppe mit einer anderen
+
+# Schematics
+SCHEMATIC_GUI_ITEM=§eSchematics

BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java

@@ -39,6 +39,7 @@ import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
@@ -72,6 +73,7 @@ public class BauGuiEditor implements Listener {
         inv.setItem(mapping.getSize() + 5, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH", p), Arrays.asList(BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH_LORE", p)), false, clickType -> {
         }).getItemStack());
         inv.setItem(mapping.getSize() + 6, new SWItem(Material.SCUTE, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_MORE", p)).getItemStack());
+        inv.setItem(mapping.getSize() + 8, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_CLOSE", p)).getItemStack());
 
         p.openInventory(inv);
         p.getOpenInventory().setCursor(cursor == null ? new SWItem().getItemStack() : cursor);
@@ -155,6 +157,10 @@ public class BauGuiEditor implements Listener {
                 });
                 inv.open();
                 break;
+            case 8:
+                saveMapping(p);
+                BauGUI.openBauGui(p);
+                break;
             default:
         }
     }
@@ -188,14 +194,17 @@ public class BauGuiEditor implements Listener {
     }
 
     private void saveMapping(Player p) {
-        BauGuiMapping mapping = BauGuiMapping.getGuiMapping(p);
+        saveMapping(p.getOpenInventory(), BauGuiMapping.getGuiMapping(p));
+    }
+
+    private void saveMapping(InventoryView view, BauGuiMapping mapping) {
         if (mapping.isSaved()) {
             return;
         }
         HashMap<Integer, Integer> newMapping = new HashMap<>();
 
-        for (int i = 0; i < p.getOpenInventory().getTopInventory().getContents().length; i++) {
-            ItemStack itemStack = p.getOpenInventory().getTopInventory().getContents()[i];
+        for (int i = 0; i < view.getTopInventory().getContents().length; i++) {
+            ItemStack itemStack = view.getTopInventory().getContents()[i];
             if (itemStack == null || itemStack.getType() == Material.AIR || i >= mapping.getSize()) continue;
             newMapping.put(getId(itemStack), i);
         }
@@ -218,7 +227,7 @@ public class BauGuiEditor implements Listener {
 
         Player p = (Player) event.getPlayer();
 
-        saveMapping(p);
+        saveMapping(event.getView(), BauGuiMapping.getGuiMapping(p));
         open_Edits.remove(p);
     }
 }

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

@@ -0,0 +1,34 @@
+package de.steamwar.bausystem.features.util.items;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
+import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+@Linked
+public class SchemBauGuiItem extends BauGuiItem {
+    public SchemBauGuiItem() {
+        super(35);
+    }
+
+    @Override
+    public Permission permission() {
+        return Permission.WORLDEDIT;
+    }
+
+    @Override
+    public ItemStack getItem(Player player) {
+        return new SWItem(Material.CHEST, BauSystem.MESSAGE.parse("SCHEMATIC_GUI_ITEM", player)).getItemStack();
+    }
+
+    @Override
+    public boolean click(ClickType click, Player p) {
+        p.performCommand("schematic gui");
+        return false;
+    }
+}