Merge remote-tracking branch 'origin/master'

BauSystem_Main/src/BauSystem.properties

@@ -3,13 +3,25 @@ TIME = HH:mm:ss
 DATE = ........
 
 # 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_DISABLE=§cDer Spieler darf nun nicht mehr {0}
+PERMISSION_CHANGE_OTHER_ENABLE=§aDu kannst nun auf der Welt von §6{0} §a{1}
+PERMISSION_CHANGE_OTHER_DISABLE=§cDu kannst nun nicht mehr auf der Welt von §6{0} §c{1}
 
-PERMISSION_CHANGE_YOU_ENABLE = §aDer Spieler darf nun {0}
+# Feature
-PERMISSION_CHANGE_YOU_DISABLE = §cDer Spieler darf nun nicht mehr {0}
+FEATURE_OTHER_ITEMS_TELEPORT_GUI_NAME=Teleportieren
-PERMISSION_CHANGE_OTHER_ENABLE = §aDu kannst nun auf der Welt von §6{0} §a{1}
+FEATURE_OTHER_ITEMS_TELEPORT_PLAYER_OFFLINE=§cDer Spieler ist Offline
-PERMISSION_CHANGE_OTHER_DISABLE = §cDu kannst nun nicht mehr auf der Welt von §6{0} §c{1}
+FEATURE_GUI_EDITOR_ITEM_NAME=§eGui Editor
+FEATURE_TRACER_GUI_NAME=Tracer Gui
+FEATURE_TRACER_GUI_TRACE_INACTIVE=§eTracer Starten
+FEATURE_TRACER_GUI_TRACE_ACTIVE=§eTracer Stoppen
+FEATURE_TRACER_GUI_TRACE_ACTIVE_AUTO=§eAuto-Trace ist Aktiv
+FEATURE_TRACER_GUI_AUTO_TRACE_INACTIVE=§eAuto-Tracer Aktivieren
+FEATURE_TRACER_GUI_AUTO_TRACE_ACTIVE=§eAuto-Tracer Deaktivieren
+FEATURE_TRACER_GUI_SHOW_GUI=§eTrace Show Gui
+FEATURE_TRACER_GUI_DELETE=§eTrace Löschen
 
 # Scoreboard
 SCOREBOARD_TIME = Uhrzeit
@@ -22,6 +34,13 @@ SCOREBOARD_TRACE_TICKS = Ticks
 SCOREBOARD_TRACE_TNT_COUNT = Anzahl TNT
 
 # Flags
+FLAG_COLOR=Color
+FLAG_TNT=TNT
+FLAG_FIRE=Fire
+FLAG_FREEZE=Freeze
+FLAG_PROTECT=Protect
+FLAG_FIRE_ALLOW=§can
+FLAG_FIRE_DENY=§aaus
 FLAG_COLOR = Color
 FLAG_TNT = TNT
 FLAG_FIRE = Fire

BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java

@@ -55,6 +55,9 @@ public class BauGUI {
     }
 
     public static void addItem(BauGuiItem item) {
+        if (ITEMS.containsKey(item.getId())) {
+            throw new IllegalArgumentException("Duplicate Id Key: " + item.getId() + ". From Classes: " + ITEMS.get(item.getId()).getClass().getName() + " and " + item.getClass().getName());
+        }
         ITEMS.put(item.getId(), item);
     }
 

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

@@ -0,0 +1,55 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2021  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.gui.editor;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.Permission;
+import de.steamwar.bausystem.linkage.LinkageType;
+import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.inventory.SWItem;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+@Linked(LinkageType.BAU_GUI_ITEM)
+public class BauGuiEditorGuiItem extends BauGuiItem {
+
+    public BauGuiEditorGuiItem() {
+        super(23);
+    }
+
+    @Override
+    public Permission permission() {
+        return Permission.MEMBER;
+    }
+
+    @Override
+    public ItemStack getItem(Player player) {
+        return new SWItem(Material.IRON_PICKAXE, BauSystem.MESSAGE.parse("FEATURE_GUI_EDITOR_ITEM_NAME", player)).getItemStack();
+    }
+
+    @Override
+    public boolean click(ClickType click, Player p) {
+        p.performCommand("gui editor");
+        return false;
+    }
+}

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

@@ -19,18 +19,22 @@
 
 package de.steamwar.bausystem.features.other.items;
 
+import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.ColorConfig;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.linkage.LinkageType;
 import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.inventory.SWAnvilInv;
+import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.inventory.SWListInv;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.UUID;
+
 @Linked(LinkageType.BAU_GUI_ITEM)
 public class TeleportBauGuiItem extends BauGuiItem {
 
@@ -46,9 +50,14 @@ public class TeleportBauGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         p.closeInventory();
-        SWAnvilInv inv = new SWAnvilInv(p, "Teleportieren");
+        SWListInv<UUID> inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("FEATURE_OTHER_ITEMS_TELEPORT_GUI_NAME", p), SWListInv.createPlayerList(p.getUniqueId()), (clickType, o) -> {
-        inv.setItem(Material.ENDER_PEARL);
+            Player t = Bukkit.getPlayer(o);
-        inv.setCallback(s -> p.performCommand("tp " + s));
+            if (t == null) {
+                BauSystem.MESSAGE.send("FEATURE_OTHER_ITEMS_TELEPORT_PLAYER_OFFLINE", p);
+            } else {
+                p.performCommand("tp " + t.getName());
+            }
+        });
         inv.open();
         return false;
     }

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TracerBauGuiItem.java

@@ -23,9 +23,12 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.ColorConfig;
 import de.steamwar.bausystem.features.tracer.record.RecordStateMachine;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.features.tracer.record.RecordStatus;
+import de.steamwar.bausystem.features.tracer.show.TraceShowManager;
 import de.steamwar.bausystem.linkage.LinkageType;
 import de.steamwar.bausystem.linkage.Linked;
+import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -47,8 +50,55 @@ public class TracerBauGuiItem extends BauGuiItem {
         }).getItemStack();
     }
 
+    private static void open(Player p) {
+        RecordStatus status = RecordStateMachine.getRecordStatus();
+        SWInventory inv = new SWInventory(p, 9, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_NAME", p));
+        if (status.isTracing()) {
+            if (status.isAutoTrace()) {
+                inv.setItem(1, new SWItem(Material.GRAY_DYE, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_TRACE_ACTIVE_AUTO", p)));
+            } else {
+                inv.setItem(1, new SWItem(Material.GREEN_DYE, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_TRACE_ACTIVE", p), clickType -> {
+                    p.performCommand("trace stop");
+                    open(p);
+                }));
+            }
+        } else {
+            inv.setItem(1, new SWItem(Material.RED_DYE, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_TRACE_INACTIVE", p), clickType -> {
+                p.performCommand("trace start");
+                open(p);
+            }));
+        }
+        if (status.isAutoTrace()) {
+            inv.setItem(3, new SWItem(Material.ENDER_EYE, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_AUTO_TRACE_ACTIVE", p), clickType -> {
+                p.performCommand("trace auto");
+                open(p);
+            }));
+        } else {
+            inv.setItem(3, new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_AUTO_TRACE_INACTIVE", p), clickType -> {
+                p.performCommand("trace auto");
+                open(p);
+            }));
+        }
+        if (TraceShowManager.hasActiveShow(p)) {
+            inv.setItem(5, new SWItem(Material.TNT, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_SHOW_GUI", p), clickType -> {
+                p.performCommand("trace show gui");
+            }));
+        } else {
+            inv.setItem(5, new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_SHOW_GUI", p), clickType -> {
+                p.performCommand("trace show gui");
+            }));
+        }
+        inv.setItem(7, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("FEATURE_TRACER_GUI_DELETE", p), clickType -> {
+            p.performCommand("trace delete");
+            open(p);
+        }));
+
+        inv.open();
+    }
+
     @Override
     public boolean click(ClickType click, Player p) {
+        open(p);
         return false;
     }