Add SettingsCommand

Signed-off-by: Chaoscaot <max@maxsp.de>

BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/TickManager21.java

@@ -100,7 +100,6 @@ public class TickManager21 implements TickManager {
             manager.setFrozen(true);
             bukkitTask.cancel();
         }, 1, 1);
-        manager.tick();
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java

@@ -31,10 +31,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class DesignEndStone {
@@ -56,11 +53,10 @@ public class DesignEndStone {
         this.maxY = region.getBuildArea().getMaxPoint(false).getY();
         this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
 
-        limited = region.getGameModeConfig().Schematic.Limited
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getValue() == 0)
-                .flatMap(entry -> entry.getKey().stream())
+        limited = Arrays.stream(Material.values())
+                .filter(Material::isBlock)
+                .filter(material -> !material.isLegacy())
+                .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
                 .collect(Collectors.toSet());
         calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java

@@ -46,6 +46,16 @@ import org.bukkit.event.player.PlayerInteractEvent;
 @Linked
 public class FreezeListener implements Listener, ScoreboardElement {
 
+    @EventHandler
+    public void onBlockExplode(BlockExplodeEvent e) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        e.setCancelled(true);
+        BlockState state = e.getBlock().getState();
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            state.update(true, false);
+        }, 1L);
+    }
+
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
         if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java

@@ -150,11 +150,13 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         Consumer<Integer> setter = observerPhase::setTickOffset;
         return new SWItem[] {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 observer,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java

@@ -32,6 +32,7 @@ import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -97,6 +98,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = observer.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -113,6 +115,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -120,6 +123,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = observer.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -138,6 +142,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java

@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -67,6 +68,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = observer.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -81,6 +83,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 observer.changeBaseTicks(-baseTicks);
             } else {
@@ -91,6 +94,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
 
         //Pos X
         inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -102,12 +106,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -119,12 +125,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -136,6 +144,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java

@@ -165,11 +165,13 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         Consumer<Integer> setter = redstoneSubPhase.place ? redstoneSubPhase.phase::setTickOffset : redstoneSubPhase.phase::setLifetime;
         return new SWItem[] {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 redstone,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java

@@ -31,6 +31,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -98,6 +99,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = redstone.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -114,6 +116,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -121,6 +124,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Lifetime
         int lifetime = redstone.getLifetime();
         inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -137,6 +141,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(20, lifetimeItem);
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -144,6 +149,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = redstone.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -162,6 +168,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java

@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -66,6 +67,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = redstone.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -80,6 +82,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 redstone.changeBaseTicks(-baseTicks);
             } else {
@@ -90,6 +93,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
 
         //Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -101,12 +105,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -118,12 +124,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -135,6 +143,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java

@@ -138,11 +138,13 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
 
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 tnt,
                 new SWItem(SWItem.getDye(tntSetting.getCount() > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java

@@ -31,6 +31,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -78,6 +79,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Count
         int count = tnt.getCount();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -94,6 +96,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(18, countItem);
 
         inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -101,6 +104,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = tnt.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -117,6 +121,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -124,6 +129,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Lifetime
         int lifetime = tnt.getLifetime();
         inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -140,6 +146,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(20, lifetimeItem);
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -147,6 +154,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = tnt.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -165,30 +173,35 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Jump
         SWItem jumpX = new SWItem(tnt.isXJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump X§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setXJump(!tnt.isXJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(33, jumpX);
 
         SWItem jumpY = new SWItem(tnt.isYJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Y§8: " + (tnt.isYJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setYJump(!tnt.isYJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(16, jumpY);
 
         SWItem jumpZ = new SWItem(tnt.isZJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Z§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setZJump(!tnt.isZJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(35, jumpZ);
 
         SWItem jumpAll = new SWItem(Material.TNT, "§7TNT §eJump §8: " + (tnt.hasJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setJump(!tnt.hasJump());
             SimulatorWatcher.update(simulator);
         });

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java

@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -75,6 +76,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = tnt.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -89,6 +91,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 tnt.changeBaseTicks(-baseTicks);
             } else {
@@ -136,6 +139,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
 
         // Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -147,12 +151,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -164,12 +170,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -181,6 +189,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java

@@ -101,7 +101,7 @@ public class BlockBoundingBox {
         addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);
 
         addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
-        addPixel(Material.SOUL_SAND.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
+        addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
 
         Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();
         cocoaNorth.setAge(2);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java

@@ -25,12 +25,14 @@ import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
 @Linked
+@MinVersion(19)
 public class LaufbauCommand extends SWCommand {
 
     public LaufbauCommand() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java

@@ -1,189 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 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.worldedit;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Point;
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.FlatteningWrapper;
-import de.steamwar.core.SWPlayer;
-import de.steamwar.core.WorldEditRenderer;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.util.Vector;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-@Linked
-@MinVersion(20)
-public class SelectAdjacent implements Listener {
-
-    private Vector[] FACES = {
-            new Vector(1, 0, 0),
-            new Vector(-1, 0, 0),
-            new Vector(0, 1, 0),
-            new Vector(0, -1, 0),
-            new Vector(0, 0, 1),
-            new Vector(0, 0, -1),
-
-            new Vector(1, 1, 0),
-            new Vector(1, -1, 0),
-            new Vector(1, 0, 1),
-            new Vector(1, 0, -1),
-            new Vector(-1, 1, 0),
-            new Vector(-1, -1, 0),
-            new Vector(-1, 0, 1),
-            new Vector(-1, 0, -1),
-            new Vector(0, 1, 1),
-            new Vector(0, 1, -1),
-            new Vector(0, -1, 1),
-            new Vector(0, -1, -1),
-    };
-
-    @EventHandler
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!event.hasItem()) return;
-        if (event.getItem().getType() != Material.WOODEN_AXE) return;
-        if (!event.getPlayer().isSneaking()) return;
-        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
-        Material material = event.getPlayer().getInventory().getItemInOffHand().getType();
-        Selector selector;
-        if (material.isAir()) {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
-        } else {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), type -> type == material);
-        }
-        SWPlayer.of(event.getPlayer()).setComponent(selector);
-    }
-
-    private class Selector implements SWPlayer.Component {
-
-        private static final int MAX_BLOCKS = 500_000;
-
-        private int minX;
-        private int minY;
-        private int minZ;
-        private int maxX;
-        private int maxY;
-        private int maxZ;
-
-        private BukkitTask bukkitTask;
-        private Predicate<Material> predicate;
-        private Set<Location> seen = new HashSet<>();
-        private Set<Location> toCalc = new HashSet<>();
-
-        private Region.Area area;
-
-        public Selector(Block block, Player player, Predicate<Material> predicate) {
-            this.predicate = predicate;
-            toCalc.add(block.getLocation());
-            minX = block.getX();
-            minY = block.getY();
-            minZ = block.getZ();
-            maxX = block.getX();
-            maxY = block.getY();
-            maxZ = block.getZ();
-
-            Region region = Region.getRegion(block.getLocation());
-            area = Region.Area.EMPTY;
-            if (region.getBuildArea().inRegion(block.getLocation(), true)) {
-                area = region.getBuildArea();
-            } else if (region.getTestblockArea().inRegion(block.getLocation(), true)) {
-                area = region.getTestblockArea();
-            } else if (region.getArea().inRegion(block.getLocation(), true)) {
-                area = region.getArea();
-            }
-
-            bukkitTask = Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-                run();
-
-                long volume = (long)(maxX - minX + 1) * (long)(maxY - minY + 1) * (long)(maxZ - minZ + 1);
-                player.sendTitle("", "§e" + volume + " §7Blocks", 0, 5, 0);
-
-                Point minPoint = new Point(minX, minY, minZ);
-                Point maxPoint = new Point(maxX, maxY, maxZ);
-
-                FlatteningWrapper.impl.setSelection(player, minPoint, maxPoint);
-                WorldEditRenderer.renderPlayer(player);
-
-                // boolean finished = toCalc.stream().allMatch(location -> {
-                //     return location.getBlockX() >= minX && location.getBlockY() >= minY && location.getBlockZ() >= minZ &&
-                //             location.getBlockX() <= maxX && location.getBlockY() <= maxY && location.getBlockZ() <= maxZ;
-                // });
-
-                if (toCalc.isEmpty() || seen.size() > MAX_BLOCKS) {
-                    bukkitTask.cancel();
-                    player.sendTitle("§aDone", "§e" + volume + " §7Blocks", 0, 20, 5);
-                    SWPlayer.of(player).removeComponent(Selector.class);
-                }
-            }, 1, 1);
-        }
-
-        private void cancel() {
-            bukkitTask.cancel();
-        }
-
-        private void run() {
-            Set<Location> current = toCalc;
-            toCalc = new HashSet<>();
-
-            for (Location location : current) {
-                Block block = location.getBlock();
-                if (block.isEmpty() || block.isLiquid()) continue;
-                if (!predicate.test(block.getType())) continue;
-                seen.add(location);
-                if (!area.inRegion(block.getLocation(), true)) continue;
-
-                minX = Math.min(minX, location.getBlockX());
-                maxX = Math.max(maxX, location.getBlockX());
-                minY = Math.min(minY, location.getBlockY());
-                maxY = Math.max(maxY, location.getBlockY());
-                minZ = Math.min(minZ, location.getBlockZ());
-                maxZ = Math.max(maxZ, location.getBlockZ());
-
-                for (Vector face : FACES) {
-                    Block next = block.getRelative(face.getBlockX(), face.getBlockY(), face.getBlockZ());
-                    if (next.isEmpty() || next.isLiquid()) continue;
-                    if (!predicate.test(next.getType())) continue;
-                    Location loc = next.getLocation();
-                    if (seen.contains(loc)) continue;
-                    toCalc.add(loc);
-                }
-            }
-        }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            cancel();
-        }
-    }
-}

CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.kt

@@ -35,7 +35,11 @@ import java.time.Instant
 object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
     val userId = reference("UserID", SteamwarUserTable)
     val timestamp = timestamp("Timestamp")
-    val ip = varchar("IP", 45)
+    val ip = varchar("IP", 45).entityId()
+
+    init {
+        addIdColumn(userId)
+    }
 
     override val primaryKey = PrimaryKey(userId, ip)
 }

CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java

@@ -402,6 +402,13 @@ public final class GameModeConfig<M, W> {
          */
         public final int WaterDepth;
 
+        /**
+         * If TNT should break blocks even underwater
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean WaterDamage;
+
         /**
          * The outer border of the arena, measured in blocks around the schematic areas
          */
@@ -457,6 +464,7 @@ public final class GameModeConfig<M, W> {
         private ArenaConfig(YMLWrapper loader, SchematicConfig.SizeConfig Size, List<Integer> EnterStages) {
             loaded = loader.canLoad();
             WaterDepth = loader.getInt("WaterDepth", 0);
+            WaterDamage = loader.getBoolean("WaterDamage", true);
             Schem2Border = new Schem2BorderConfig(loader.with("Schem2Border"));
             SpawnOffset = new SpawnOffsetConfig(loader.with("SpawnOffset"), Size);
             BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
@@ -597,18 +605,18 @@ public final class GameModeConfig<M, W> {
         public final boolean IgnorePublicOnly;
 
         /**
-         * If obsidian and bedrock should be replaced during PRE_RUNNING
+         * Replacements that should be done during PRE_RUNNING with no block updates
          *
-         * @implSpec {@code false} by default
+         * @implSpec {@code {}} by default
          */
-        public final boolean ReplaceObsidianBedrock;
+        public final Map<M, M> ReplacementsWithoutBlockUpdates;
 
         /**
-         * If the replacement should happen with block updates
+         * Replacements that should be done during PRE_RUNNING with block updates
          *
-         * @implSpec {@code false} by default
+         * @implSpec {@code {}} by default
          */
-        public final boolean ReplaceWithBlockupdates;
+        public final Map<M, M> ReplacementsWithBlockUpdates;
 
         /**
          * If the schematic perparation arena mode is time limited
@@ -641,7 +649,7 @@ public final class GameModeConfig<M, W> {
         /**
          * Maximal blast resistance for the design blocks
          *
-         * @implSpec {@code Double.MAX_VALUE} by default
+         * @implSpec {@link SchematicConfig#MaxBlastResistance} by default
          */
         public final double MaxDesignBlastResistance;
 
@@ -665,13 +673,11 @@ public final class GameModeConfig<M, W> {
             PasteAligned = loader.getBoolean("PasteAligned", false);
             OnlyPublicSchematics = loader.getBoolean("OnlyPublicSchematics", false);
             IgnorePublicOnly = loader.getBoolean("IgnorePublicOnly", false);
-            ReplaceObsidianBedrock = loader.getBoolean("ReplaceObsidianBedrock", false);
-            ReplaceWithBlockupdates = loader.getBoolean("ReplaceWithBlockupdates", false);
             UnlimitedPrepare = loader.getBoolean("UnlimitedPrepare", false);
             MaxBlocks = loader.getInt("MaxBlocks", 0);
             MaxDispenserItems = loader.getInt("MaxDispenserItems", 128);
             MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE);
-            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE);
+            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", MaxBlastResistance);
 
             Map<Set<M>, Integer> Limited = new HashMap<>();
             for (Map<?, ?> entry : loader.getMapList("Limited")) {
@@ -690,6 +696,9 @@ public final class GameModeConfig<M, W> {
                 Limited.put(Collections.singleton((M) material), 0);
             });
             this.Limited = Collections.unmodifiableMap(Limited);
+
+            this.ReplacementsWithoutBlockUpdates = loader.getMap("ReplacementsWithoutBlockUpdates", loader.materialMapper, loader.materialMapper);
+            this.ReplacementsWithBlockUpdates = loader.getMap("ReplacementsWithBlockUpdates", loader.materialMapper, loader.materialMapper);
         }
 
         @ToString

CommonCore/SQL/src/de/steamwar/sql/NodeData.kt

@@ -88,8 +88,6 @@ class NodeData(id: EntityID<CompositeID>): CompositeEntity(id) {
         schemData.inputStream.let { if(decompress) GZIPInputStream(it) else it }
     }
 
-    fun schemData() = schemData(true)
-
     override fun delete() = useDb { super.delete() }
 
     enum class SchematicFormat(val fileEnding: String) {

CommonCore/SQL/src/de/steamwar/sql/SchematicNode.kt

@@ -146,7 +146,91 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
 
         @JvmStatic
         fun parentsOfNode(user: SteamwarUser, id: Int) = fromSql(
-            "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.Config FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId",
+            """
+            WITH RECURSIVE
+                ESN_R AS (
+                    SELECT SchematicNode.NodeId AS NodeId,
+                           NM.UserId AS EffectiveOwner,
+                           NM.ParentId AS ParentNode
+                    FROM SchematicNode
+                    INNER JOIN NodeMember NM ON NM.NodeId = SchematicNode.NodeId
+                    UNION ALL
+                    SELECT S.NodeId AS NodeId,
+                           ESN_R.EffectiveOwner AS EffectiveOwner,
+                           S.ParentNode AS ParentNode
+                    FROM SchematicNode S
+                    INNER JOIN ESN_R ON S.ParentNode = ESN_R.NodeId
+                ),
+                ESN_R2 AS (
+                    SELECT SchematicNode.NodeId AS NodeId,
+                           NM.UserId AS UserId,
+                           SchematicNode.NodeOwner AS EffectiveOwner,
+                           SchematicNode.ParentNode AS ParentNode
+                    FROM SchematicNode
+                    INNER JOIN NodeMember NM ON NM.NodeId = SchematicNode.NodeId
+                    UNION ALL
+                    SELECT S.NodeId AS NodeId,
+                           ESN_R2.EffectiveOwner AS EffectiveOwner,
+                           ESN_R2.UserId AS UserId,
+                           S.ParentNode AS ParentNode
+                    FROM SchematicNode S
+                    INNER JOIN ESN_R2 ON S.ParentNode = ESN_R2.NodeId
+                    WHERE S.NodeOwner <> ESN_R2.EffectiveOwner
+                ),
+                ESN_R3 AS (
+                    SELECT SchematicNode.NodeId AS NodeId,
+                           SchematicNode.NodeOwner AS NodeOwner,
+                           SchematicNode.NodeOwner AS EffectiveOwner,
+                           SchematicNode.ParentNode AS ParentNode
+                    FROM SchematicNode
+                    UNION ALL
+                    SELECT S.NodeId AS NodeId,
+                           S.NodeOwner AS NodeOwner,
+                           ESN_R3.EffectiveOwner AS EffectiveOwner,
+                           S.ParentNode AS ParentNode
+                    FROM SchematicNode S
+                    INNER JOIN ESN_R3 ON S.ParentNode = ESN_R3.NodeId
+                    WHERE ESN_R3.NodeOwner <> S.NodeOwner
+                ),
+                ResolvedNodes AS (
+                    SELECT ESN_R.NodeId AS NodeId,
+                           ESN_R.EffectiveOwner AS EffectiveOwner,
+                           ESN_R.ParentNode AS ParentNode
+                    FROM ESN_R
+                    UNION
+                    SELECT ESN_R2.NodeId AS NodeId,
+                           ESN_R2.UserId AS EffectiveOwner,
+                           ESN_R2.ParentNode AS ParentNode
+                    FROM ESN_R2
+                    INNER JOIN SchematicNode SN2 ON ESN_R2.NodeId = SN2.NodeId
+                    WHERE ESN_R2.ParentNode IS NOT NULL
+                      AND SN2.NodeOwner <> ESN_R2.EffectiveOwner
+                    UNION
+                    SELECT ESN_R3.NodeId AS NodeId,
+                           ESN_R3.EffectiveOwner AS EffectiveOwner,
+                           ESN_R3.ParentNode AS ParentNode
+                    FROM ESN_R3
+                    WHERE ESN_R3.NodeOwner <> ESN_R3.EffectiveOwner
+                    UNION
+                    SELECT SchematicNode.NodeId AS NodeId,
+                           SchematicNode.NodeOwner AS EffectiveOwner,
+                           SchematicNode.ParentNode AS ParentNode
+                    FROM SchematicNode
+                ),
+                R AS (
+                    SELECT NodeId, ParentNode
+                    FROM ResolvedNodes
+                    WHERE NodeId = ?
+                    UNION
+                    SELECT E.NodeId, E.ParentNode
+                    FROM R
+                    INNER JOIN ResolvedNodes E ON R.ParentNode = E.NodeId
+                    WHERE E.EffectiveOwner = ?
+                )
+            SELECT SN.NodeId, SN.NodeOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.Config
+            FROM R
+            INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId
+            """.trimIndent(),
             listOf(
                 IntegerColumnType() to id,
                 IntegerColumnType() to user.getId()
@@ -284,7 +368,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
             val list = mutableListOf<String>()
             if (s.contains("/")) {
                 val preTab = s.take(s.lastIndexOf("/") + 1)
-                val pa = getNodeFromPath(user, preTab) ?: return emptyList()
+                val pa = getNodeFromPath(user, preTab) ?: return mutableListOf()
                 val nodes: List<SchematicNode> = list(user, pa.getId())
                 val br = pa.generateBreadcrumbs(user)
                 nodes.forEach(Consumer { node: SchematicNode? -> list.add((if (sws) "/" else "") + br + node!!.name + (if (node.isDir()) "/" else "")) })

CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt

@@ -186,10 +186,10 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
 
             val salt = ByteArray(16)
             random.nextBytes(salt)
-            val saltString = Base64.getEncoder().encode(salt)
+            val saltString = Base64.getEncoder().encodeToString(salt)
 
             val hash = generateHash(value, salt)
-            val hashString = Base64.getEncoder().encode(hash)
+            val hashString = Base64.getEncoder().encodeToString(hash)
 
             useDb {
                 passwordInternal = "$hashString:$saltString"
@@ -254,12 +254,27 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
         punishments[punishment] = Punishment.createPunishment(this@SteamwarUser.id.value, from, punishment, reason, time, perma)
     }
 
-    fun setLocale(locale: Locale?, manualeLocale: Boolean) {
-        if (locale == null || (this.manualLocale && !manualLocale)) return
+    fun setJoinLocale(locale: Locale?) {
+        if (locale == null || this.manualLocale) return
+        setCurrentLocale(locale)
+    }
 
+    fun setCurrentLocale(locale: Locale?) {
+        if (locale == null) return
         useDb {
             this@SteamwarUser.locale = locale
-            this@SteamwarUser.manualLocale = manualeLocale
+        }
+    }
+
+    fun lockLocale() {
+        useDb {
+            this@SteamwarUser.manualLocale = true
+        }
+    }
+
+    fun unlockLocale() {
+        useDb {
+            this@SteamwarUser.manualLocale = false
         }
     }
 

CommonCore/SQL/src/de/steamwar/sql/Team.kt

@@ -32,12 +32,12 @@ object TeamTable : IntIdTable("Team", "TeamID") {
     val color = char("TeamColor", 1).default("8")
     val name = varchar("TeamName", 16)
     val deleted = bool("TeamDeleted").default(false)
-    val address = text("Address").nullable()
-    val port = ushort("Port").default(25565u)
 }
 
 class Team(id: EntityID<Int>) : IntEntity(id) {
     companion object : IntEntityClass<Team>(TeamTable) {
+        const val PUBLIC: Int = 0
+
         private val teamCache = mutableMapOf<Int, Team>()
 
         @JvmStatic
@@ -67,8 +67,6 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
     private var name by TeamTable.name
     var deleted by TeamTable.deleted
         private set
-    private var teamAddress by TeamTable.address
-    private var teamPort by TeamTable.port
     val members by lazy { useDb { SteamwarUserTable.select(SteamwarUserTable.id).where { SteamwarUserTable.team eq teamId }.map { it[SteamwarUserTable.id].value } } }
 
     fun size() = useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.count().toInt() }
@@ -96,16 +94,4 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
         set(value) = useDb {
             name = value
         }
-
-    var address: String?
-        get() = teamAddress
-        set(value) = useDb {
-            teamAddress = value
-        }
-
-    var port: Int
-        get() = teamPort.toInt()
-        set(value) = useDb {
-            teamPort = value.toUShort()
-        }
 }

CommonCore/SQL/src/de/steamwar/sql/YMLWrapper.java

@@ -24,10 +24,7 @@ import org.yaml.snakeyaml.Yaml;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -160,6 +157,22 @@ final class YMLWrapper<M, W> {
         }
     }
 
+    public <K, V> Map<K, V> getMap(String path, Function<String, K> keyFunction, Function<String, V> valueFunction) {
+        Object data = this.document.get(path);
+        if (data instanceof Map) {
+            Map<K, V> result = new HashMap<>();
+            ((Map<String, String>) data).forEach((keyString, valueString) -> {
+                K key = keyFunction.apply(keyString.toUpperCase());
+                V value = valueFunction.apply(valueString.toUpperCase());
+                if (key == null || value == null) return;
+                result.put(key, value);
+            });
+            return Collections.unmodifiableMap(result);
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
     public List<Map<?, ?>> getMapList(String path) {
         Object value = this.document.get(path);
         if (value instanceof List) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -45,6 +45,7 @@ import org.bukkit.util.Vector;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.logging.Level;
 
@@ -179,20 +180,26 @@ public class FightSchematic extends StateDependent {
 
     @Override
     public void disable() {
-        if(!Config.GameModeConfig.Schematic.ReplaceObsidianBedrock || Config.mode == ArenaMode.PREPARE)
+        if (Config.mode == ArenaMode.PREPARE) {
             return;
+        }
 
         FreezeWorld freezer = null;
-        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
+        if (!Config.GameModeConfig.Schematic.ReplacementsWithoutBlockUpdates.isEmpty()) {
             freezer = new FreezeWorld();
-
-        replaceSync(Material.OBSIDIAN, Material.TNT);
-        replaceSync(Material.BEDROCK, Material.SLIME_BLOCK);
-
-        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
+        }
+        for (Map.Entry<Material, Material> replacement : Config.GameModeConfig.Schematic.ReplacementsWithoutBlockUpdates.entrySet()) {
+            replaceSync(replacement.getKey(), replacement.getValue());
+        }
+        if (freezer != null) {
             freezer.disable();
         }
 
+        for (Map.Entry<Material, Material> replacement : Config.GameModeConfig.Schematic.ReplacementsWithBlockUpdates.entrySet()) {
+            replaceSync(replacement.getKey(), replacement.getValue());
+        }
+    }
+
     public void pasteTeamName(){
         char[] chars = team.getName().toCharArray();
         Clipboard[] characters = new Clipboard[chars.length];

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java

@@ -182,6 +182,7 @@ public class Permanent implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onExplosion(EntityExplodeEvent e) {
         if (!(e.getEntity() instanceof TNTPrimed)) return;
+        if (!Config.GameModeConfig.Arena.WaterDamage) return;
         e.blockList().removeIf(block -> {
             if(block.getType() == Material.TNT) {
                 return false;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java

@@ -73,7 +73,7 @@ public class WaterRemover implements Listener {
         event.setYield(0); //No drops (additionally to world config)
 
         FightTeam spawn = tnt.remove(event.getEntity().getEntityId());
-        if(spawn != null && !spawn.getExtendRegion().inRegion(event.getLocation())) {
+        if(Config.GameModeConfig.Arena.WaterDamage && spawn != null && !spawn.getExtendRegion().inRegion(event.getLocation())) {
             Block b = event.getLocation().getBlock();
             for(int y = -1; y <= 1; y++) {
                 for(int z = -1; z <= 1; z++) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -36,7 +36,6 @@ import de.steamwar.fightsystem.fight.FreezeWorld;
 import de.steamwar.fightsystem.listener.FightScoreboard;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.utils.*;
-import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;
@@ -520,12 +519,12 @@ public class PacketProcessor implements Listener {
 
     private void pasteEmbeddedSchem(FightTeam team) throws IOException {
         int schemId = source.readInt();
-        Clipboard clipboard = SchematicData.clipboardFromStream(new FilterInputStream(source) {
+        Clipboard clipboard = WorldEditWrapper.impl.getClipboard(new FilterInputStream(source) {
             @Override
             public void close() {
                 // FAWE 1.12 calls close...
             }
-        }, WorldEditWrapper.impl.getNativeFormat());
+        });
 
         execSync(() -> team.pasteSchem(schemId, clipboard));
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java

@@ -283,7 +283,7 @@ public interface Recorder {
 
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         try{
-            copy(NodeData.getLatest(SchematicNode.getSchematicNode(schemId)).schemData(), buffer);
+            copy(NodeData.getLatest(SchematicNode.getSchematicNode(schemId)).schemData(true), buffer);
         }catch (EOFException e) {
             Bukkit.getLogger().log(Level.INFO, "EOFException ignored");
         } catch (IOException e) {

SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java

@@ -53,7 +53,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
                         checkInventory(result, block, material, new BlockPos(x, y, z));
                     }
 
-                    if(x == 0 || x == max.getBlockX() - 1 || y == max.getBlockY() - 1 || z == 0 || z == max.getBlockZ() - 1) {
+                    if(x == min.getBlockX() || x == max.getBlockX() || y == max.getBlockY() || z == min.getBlockZ() || z == max.getBlockZ()) {
                         result.getDesignBlocks().computeIfAbsent(material, m -> new ArrayList<>()).add(new BlockPos(x, y, z));
                     }
                 }

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java

@@ -20,9 +20,8 @@
 package de.steamwar.schematicsystem.autocheck;
 
 import de.steamwar.core.Core;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
-import de.steamwar.sql.SchematicType;
+import de.steamwar.sql.GameModeConfig;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
@@ -102,7 +101,9 @@ public class AutoCheckerResult {
     }
 
     public boolean isDesignBlastResistanceOK() {
-        return blockScanResult.getDesignBlocks().keySet().stream().map(Material::getBlastResistance).noneMatch(i -> i > type.Schematic.MaxDesignBlastResistance);
+        return blockScanResult.getDesignBlocks().keySet().stream()
+                .filter(material -> material != Material.WATER && material != Material.LAVA)
+                .map(Material::getBlastResistance).noneMatch(i -> i > type.Schematic.MaxDesignBlastResistance);
     }
 
     public void sendErrorMessage(Player p, String schemName) {
@@ -148,6 +149,7 @@ public class AutoCheckerResult {
         });
         if(Core.getVersion() > 12) {
             blockScanResult.getDesignBlocks().forEach((material, poss) -> {
+                if (material == Material.WATER || material == Material.LAVA) return;
                 if(material.getBlastResistance() > type.Schematic.MaxDesignBlastResistance) {
                     poss.forEach(pos -> {
                         SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_DESIGN_BLOCK", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(pos), material.name(), pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());

SpigotCore/SpigotCore_14/src/de/steamwar/core/ChaosSchematicReader.kt

@@ -1,355 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 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.core
-
-import com.sk89q.jnbt.ByteArrayTag
-import com.sk89q.jnbt.ByteTag
-import com.sk89q.jnbt.CompoundTag
-import com.sk89q.jnbt.DoubleTag
-import com.sk89q.jnbt.EndTag
-import com.sk89q.jnbt.FloatTag
-import com.sk89q.jnbt.IntArrayTag
-import com.sk89q.jnbt.IntTag
-import com.sk89q.jnbt.ListTag
-import com.sk89q.jnbt.LongArrayTag
-import com.sk89q.jnbt.LongTag
-import com.sk89q.jnbt.ShortTag
-import com.sk89q.jnbt.StringTag
-import com.sk89q.jnbt.Tag
-import com.sk89q.worldedit.WorldEdit
-import com.sk89q.worldedit.WorldEditException
-import com.sk89q.worldedit.extension.input.ParserContext
-import com.sk89q.worldedit.extension.platform.Capability
-import com.sk89q.worldedit.extension.platform.Platform
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard
-import com.sk89q.worldedit.math.BlockVector3
-import com.sk89q.worldedit.regions.CuboidRegion
-import com.sk89q.worldedit.world.DataFixer
-import com.sk89q.worldedit.world.block.BaseBlock
-import com.sk89q.worldedit.world.block.BlockState
-import com.sk89q.worldedit.world.block.BlockTypes
-import java.io.DataInputStream
-import java.io.IOException
-import kotlin.collections.map
-import kotlin.collections.set
-
-class ChaosSchematicReader(
-    val stream: DataInputStream,
-    val wrapper: WorldEditWrapper14
-) {
-    init {
-        println("ChaosSchematicReader init")
-    }
-
-    /**
-     * In reinen Unit-Tests (ohne Bukkit/WorldEdit-Plugin-Lifecycle) ist keine WorldEdit-Platform registriert.
-     * Daher darf der Reader beim Laden nicht hart daran scheitern.
-     */
-    private val platform: Platform? = runCatching {
-        WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING)
-    }.getOrNull()
-
-    private val liveDataVersion: Int? = platform?.dataVersion
-
-    private var wrapped = false
-
-    var schematicVersion: Int? = null
-    var dataVersion: Int? = null
-    var metadata: Map<String, Any>? = null
-
-    var width: Short? = null
-    var height: Short? = null
-    var length: Short? = null
-
-    var offset: IntArray? = null
-
-    val blocks: Blocks = Blocks(null, null, null)
-    val entities = mutableListOf<Any>()
-
-    var fixer: DataFixer? = null
-
-    fun read(): BlockArrayClipboard {
-        require(stream.readByte() == 0x0A.toByte())
-        val tagName = stream.readUTF()
-        if (tagName != "Schematic") {
-            wrapped = true
-            stream.readByte()
-            stream.readUTF()
-        }
-
-        while (stream.readByte() != 0.toByte()) {
-            val name = stream.readUTF()
-            when (name) {
-                "Version" -> schematicVersion = stream.readInt()
-                "DataVersion" -> {
-                    dataVersion = stream.readInt()
-                    val targetVersion = liveDataVersion
-                    if (targetVersion != null && dataVersion!! < targetVersion) {
-                        fixer = platform?.dataFixer
-                    }
-                }
-                "Metadata" -> metadata = readCompoundTag()
-                "Width" -> width = stream.readShort()
-                "Height" -> height = stream.readShort()
-                "Length" -> length = stream.readShort()
-                "Blocks" -> {
-                    while (stream.readByte() != 0.toByte()) {
-                        val n = stream.readUTF()
-                        when (n) {
-                            "Palette" -> blocks.palette = readCompoundTag() as Map<String, Int>
-                            "Data" -> blocks.data = readTag(7.toByte()) as ByteArray
-                            "BlockEntities" -> blocks.blockEntities = readTagCompoundList()
-                        }
-                    }
-                }
-                "PaletteMax" -> stream.readInt()
-                "Palette" -> blocks.palette = readCompoundTag() as Map<String, Int>
-                "BlockEntities" -> blocks.blockEntities = readTagCompoundList()
-                "BlockData" -> blocks.data = readTag(7.toByte()) as ByteArray
-                "Offset" -> offset = readTag(11.toByte()) as IntArray
-                "Entities" -> entities.addAll(readTagCompoundList() as List<Any>)
-                "BiomePaletteMax" -> stream.readInt()
-                "BiomePalette" -> readCompoundTag()
-                "BiomeData" -> readTag(7.toByte())
-                "Biomes" -> {
-                    while (stream.readByte() != 0.toByte()) {
-                        val n = stream.readUTF()
-                        when (n) {
-                            "Palette" -> readCompoundTag()
-                            "Data" -> readTag(7.toByte()) as ByteArray
-                        }
-                    }
-                }
-                else -> {
-                    println(this)
-                    error("Unknown tag $name")
-                }
-            }
-        }
-
-
-
-        if (wrapped) {
-            stream.readByte()
-        }
-
-        val parserContext = ParserContext()
-        parserContext.setRestricted(false)
-        parserContext.setTryLegacy(false)
-        parserContext.setPreferringWildcard(false)
-
-        val dv = dataVersion
-        val blockStates = blocks.palette!!.map {
-            val fixed = if (fixer != null && dv != null) {
-                fixer!!.fixUp(DataFixer.FixTypes.BLOCK_STATE, it.key, dv)
-            } else {
-                it.key
-            }
-
-            val blockstate = try {
-                WorldEdit.getInstance().blockFactory.parseFromInput(fixed, parserContext).toImmutableState()
-            } catch (e: Exception) {
-                BlockTypes.AIR!!.defaultState
-            }
-
-            it.value to blockstate
-        }.toMap()
-
-        val tileEntities = blocks.blockEntities!!.map {
-            val entity = it as? Map<String, Any?> ?: error("Invalid entity")
-            val pos = entity["Pos"] as? IntArray ?: error("Invalid pos")
-            val x = pos[0]
-            val y = pos[1]
-            val z = pos[2]
-
-            val data = mutableMapOf<String, Any?>()
-            data.putAll(entity)
-            if (entity.containsKey("Data")) {
-                //data.putAll(entity["Data"] as Map<String, Any?>)
-            }
-
-            val fixed = if (fixer != null) {
-                wrapper.applyDataFixer(fixer!!, dataVersion!!, (wrapNbt(data) as CompoundTag).value)
-            } else (wrapNbt(data) as CompoundTag).value
-
-            BlockVector3.at(x, y, z) to fixed
-        }.toMap()
-
-        val offset = BlockVector3.at(offset!![0], offset!![1], offset!![2])
-        val region = CuboidRegion(offset, offset.add(width!! - 1, height!! - 1, length!! - 1))
-
-        val clipboard = BlockArrayClipboard(region)
-        clipboard.setOrigin(offset)
-
-        var index = 0
-        var i = 0
-        var value: Int
-        var varintLength: Int
-        while (i < blocks.data!!.size) {
-            value = 0
-            varintLength = 0
-
-            while (true) {
-                value = value or ((blocks.data!![i].toInt() and 127) shl (varintLength++ * 7))
-                if (varintLength > 5) {
-                    throw IOException("VarInt too big (probably corrupted data)")
-                }
-                if ((blocks.data!![i].toInt() and 128) != 128) {
-                    i++
-                    break
-                }
-                i++
-            }
-            // index = (y * length * width) + (z * width) + x
-            val y = index / (width!! * length!!)
-            val z = (index % (width!! * length!!)) / width!!
-            val x = (index % (width!! * length!!)) % width!!
-            val state: BlockState = blockStates[value] ?: error("Unknown block state $value")
-            val pt = BlockVector3.at(x, y, z)
-            try {
-                if (tileEntities.containsKey(pt)) {
-                    clipboard.setBlock<BaseBlock?>(
-                        clipboard.minimumPoint.add(pt),
-                        state.toBaseBlock(CompoundTag(tileEntities[pt])
-                    ))
-                } else {
-                    clipboard.setBlock<BlockState?>(clipboard.minimumPoint.add(pt), state)
-                }
-            } catch (e: WorldEditException) {
-                throw IOException("Failed to load a block in the schematic")
-            }
-
-            index++
-        }
-
-        return clipboard
-    }
-
-    private fun readCompoundTag(): Map<String, Any> {
-        var tagId = 0.toByte()
-        val map = mutableMapOf<String, Any>()
-
-        while (stream.readByte().also { tagId = it } != 0.toByte()) {
-            val name = stream.readUTF()
-            map[name] = readTag(tagId)!!
-        }
-        return map
-    }
-
-    private fun readTagCompoundList(): List<Any?> {
-        val typeId = stream.readByte()
-        val length = stream.readInt()
-
-        if (typeId == 0.toByte()) {
-            if (length != 0) {
-                throw IOException("Invalid TAG_List: typeId=TAG_End but length=$length")
-            }
-            return emptyList()
-        }
-
-        if (typeId != 10.toByte()) {
-            throw IOException("Invalid TAG_List element type for (Block)Entities: expected TAG_Compound(10) but got $typeId")
-        }
-
-        val list = ArrayList<Any?>(length)
-        repeat(length) { list.add(readCompoundTag()) }
-        return list
-    }
-
-    private fun readTag(tagId: Byte): Any? = when (tagId.toInt()) {
-        0 -> null
-        1 -> stream.readByte()
-        2 -> stream.readShort()
-        3 -> stream.readInt()
-        4 -> stream.readLong()
-        5 -> stream.readFloat()
-        6 -> stream.readDouble()
-        7 -> {
-            val length = stream.readInt()
-            val ba = ByteArray(length)
-            stream.readFully(ba)
-            ba
-        }
-        8 -> stream.readUTF()
-        9 -> {
-            val typeId = stream.readByte()
-            val length = stream.readInt()
-            if (typeId == 0.toByte() && length != 0) {
-                throw IOException("Invalid TAG_List: typeId=TAG_End but length=$length")
-            }
-            val list = mutableListOf<Any?>()
-            repeat(length) { list.add(readTag(typeId)) }
-            list
-        }
-        10 -> readCompoundTag()
-        11 -> {
-            val length = stream.readInt()
-            IntArray(length) { stream.readInt() }
-        }
-        12 -> {
-            val length = stream.readInt()
-            LongArray(length) { stream.readLong() }
-        }
-        else -> error("Unknown tag type $tagId")
-    }
-
-    private fun wrapNbt(data: Any): Tag = when (data) {
-        is Byte -> ByteTag(data)
-        is Short -> ShortTag(data)
-        is Int -> IntTag(data)
-        is Long -> LongTag(data)
-        is Float -> FloatTag(data)
-        is Double -> DoubleTag(data)
-        is String -> StringTag(data)
-        is ByteArray -> ByteArrayTag(data)
-        is IntArray -> IntArrayTag(data)
-        is LongArray -> LongArrayTag(data)
-        is Map<*, *> -> CompoundTag(data.map { it.key as String to wrapNbt(it.value!!) }.toMap())
-        is List<*> -> ListTag(data.firstOrNull()?.let { nbtClass(it) } ?: EndTag::class.java, data.map { wrapNbt(it!!) })
-        else -> error("Unknown tag type $data")
-    }
-
-    private fun nbtClass(data: Any): Class<out Tag> = when (data) {
-        is Byte -> ByteTag::class.java
-        is Short -> ShortTag::class.java
-        is Int -> IntTag::class.java
-        is Long -> LongTag::class.java
-        is Float -> FloatTag::class.java
-        is Double -> DoubleTag::class.java
-        is String -> StringTag::class.java
-        is ByteArray -> ByteArrayTag::class.java
-        is IntArray -> IntArrayTag::class.java
-        is LongArray -> LongArrayTag::class.java
-        is Map<*, *> -> CompoundTag::class.java
-        is List<*> -> ListTag::class.java
-        else -> error("Unknown tag type $data, ${data::class.java.simpleName}")
-    }
-
-    override fun toString(): String {
-        return "ChaosSchematicReader(platform=$platform, liveDataVersion=$liveDataVersion, wrapped=$wrapped, schematicVersion=$schematicVersion, dataVersion=$dataVersion, metadata=$metadata, width=$width, height=$height, length=$length, offset=${offset.contentToString()}, blocks=$blocks, entities=$entities, fixer=$fixer)"
-    }
-
-
-    data class Blocks(
-        var data: ByteArray?,
-        var palette: Map<String, Int>?,
-        var blockEntities: List<Any?>?
-    )
-}

SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java

@@ -67,37 +67,32 @@ public class WorldEditWrapper14 implements WorldEditWrapper {
     }
 
     @Override
-    public void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat) {
-        Clipboard clipboard = null;
-        try {
-            clipboard = getClipboard(is, schemFormat);
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-
-        if (clipboard == null)
-            throw new NoClipboardException();
-
+    public void setPlayerClipboard(Player player, Clipboard clipboard) {
         Actor actor = WorldEditWrapper.getWorldEditPlugin().wrapCommandSender(player);
         WorldEditWrapper.getWorldEditPlugin().getWorldEdit().getSessionManager().get(actor).setClipboard(new ClipboardHolder(clipboard));
     }
 
     @Override
-    public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat schemFormat) throws IOException {
-        try {
+    public Clipboard getClipboard(NodeData data) throws IOException {
+        InputStream is = data.schemData(true);
+        return readClipboard(is, data.getNodeFormat());
+    }
 
-            switch (schemFormat) {
+    @Override
+    public Clipboard getClipboard(InputStream inputStream) throws IOException {
+        return readClipboard(inputStream, getNativeFormat());
+    }
+
+    private Clipboard readClipboard(InputStream is, NodeData.SchematicFormat format) throws IOException {
+        switch (format) {
             case SPONGE_V2:
             case SPONGE_V3:
-                    return new ChaosSchematicReader(new DataInputStream(is), this).read();
+                return new SpongeSchematicReader(new NBTInputStream(is), this).read();
             case MCEDIT:
                 return new MCEditSchematicReader(new NBTInputStream(is)).read();
             default:
                 throw new IOException("This schematic format is currently not supported");
         }
-        } catch (NullPointerException e) {
-            throw new NoClipboardException();
-        }
     }
 
     @Override
@@ -576,6 +571,8 @@ public class WorldEditWrapper14 implements WorldEditWrapper {
                         values.putIfAbsent("z", new IntTag(pt.getBlockZ()));
                     }
                     values.putIfAbsent("id", values.get("Id"));
+                    values.remove("Id");
+                    values.remove("Pos");
                     if (fixer != null) {
                         tileEntity = wrapper.applyDataFixer(fixer, dataVersion, values);
                     } else {

SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldEditWrapper21.java

@@ -19,33 +19,33 @@
 
 package de.steamwar.core;
 
+import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReaderV2;
+import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReaderV3;
 import com.sk89q.jnbt.NBTInputStream;
-import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
-import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
-import com.sk89q.worldedit.extent.clipboard.io.MCEditSchematicReader;
+import com.sk89q.worldedit.extent.clipboard.io.*;
+import com.sk89q.worldedit.extent.clipboard.io.sponge.SpongeSchematicV1Reader;
+import com.sk89q.worldedit.extent.clipboard.io.sponge.SpongeSchematicV2Reader;
+import com.sk89q.worldedit.extent.clipboard.io.sponge.SpongeSchematicV3Reader;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.world.DataFixer;
 import de.steamwar.sql.NodeData;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
-import org.enginehub.linbus.tree.LinCompoundTag;
-import org.enginehub.linbus.tree.LinTag;
+import org.enginehub.linbus.stream.LinBinaryIO;
 
 import java.io.DataInputStream;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.function.Function;
 
-public class WorldEditWrapper21 extends WorldEditWrapper18 {
+public class WorldEditWrapper21 implements WorldEditWrapper {
 
     @Override
     public InputStream getPlayerClipboard(Player player) {
@@ -57,31 +57,68 @@ public class WorldEditWrapper21 extends WorldEditWrapper18 {
     }
 
     @Override
-    public void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat) {
-        Clipboard clipboard = null;
-        try {
-            clipboard = getClipboard(is, schemFormat);
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-
-        if (clipboard == null)
-            throw new SecurityException("Clipboard is null");
-
+    public void setPlayerClipboard(Player player, Clipboard clipboard) {
         Actor actor = WorldEditWrapper.getWorldEditPlugin().wrapCommandSender(player);
         WorldEditWrapper.getWorldEditPlugin().getWorldEdit().getSessionManager().get(actor).setClipboard(new ClipboardHolder(clipboard));
     }
 
     @Override
-    @SuppressWarnings("removal")
-    public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat ignored) throws IOException {
-        return switch (ignored) {
-            case MCEDIT -> new MCEditSchematicReader(new NBTInputStream(is)).read();
-            case SPONGE_V2, SPONGE_V3 -> new ChaosSchematicReader(new DataInputStream(is), this).read();
+    public Clipboard getClipboard(NodeData data) throws IOException {
+        ResetableInputStream is = new ResetableInputStream(data.schemData(false));
+        for (ClipboardFormat clipboardFormat : ClipboardFormats.getAll()) {
+            FilterInputStream fis = new FilterInputStream(is) {
+                @Override
+                public void close() throws IOException {
+                    // Ignore close call!
+                }
             };
+            boolean canBeRead = clipboardFormat.isFormat(fis);
+            is.reset();
+            if (!canBeRead) continue;
+            return clipboardFormat.load(is);
+        }
+        throw new IOException("No clipboard found");
     }
 
-    private class ResetableInputStream extends InputStream {
+    private static final Function<InputStream, ClipboardReader> FastV3 = FastSchematicReaderV3::new;
+    @SuppressWarnings("removal")
+    private static final Function<InputStream, ClipboardReader> FastV2 = inputStream -> new FastSchematicReaderV2(new NBTInputStream(inputStream));
+    @SuppressWarnings("removal")
+    private static final Function<InputStream, ClipboardReader> McEdit = inputStream -> new MCEditSchematicReader(new NBTInputStream(inputStream));
+    private static final Function<InputStream, ClipboardReader> SpongeV3 = inputStream -> new SpongeSchematicV3Reader(LinBinaryIO.read(new DataInputStream(inputStream)));
+    private static final Function<InputStream, ClipboardReader> SpongeV2 = inputStream -> new SpongeSchematicV2Reader(LinBinaryIO.read(new DataInputStream(inputStream)));
+    private static final Function<InputStream, ClipboardReader> SpongeV1 = inputStream -> new SpongeSchematicV1Reader(LinBinaryIO.read(new DataInputStream(inputStream)));
+
+    private static final Function<InputStream, ClipboardReader>[] READERS = new Function[]{
+            FastV3,
+            FastV2,
+            SpongeV3,
+            SpongeV2,
+            SpongeV1,
+            McEdit
+    };
+
+    @Override
+    public Clipboard getClipboard(InputStream inputStream) throws IOException {
+        ResetableInputStream is = new ResetableInputStream(inputStream);
+        for (Function<InputStream, ClipboardReader> reader : READERS) {
+            FilterInputStream fis = new FilterInputStream(is) {
+                @Override
+                public void close() throws IOException {
+                    // Ignore close call!
+                }
+            };
+            try {
+                return reader.apply(fis).read();
+            } catch (Exception e) {
+                is.reset();
+            }
+        }
+        is.close();
+        throw new IOException("No clipboard found");
+    }
+
+    private static class ResetableInputStream extends InputStream {
 
         private InputStream inputStream;
         private int pointer = 0;

SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditWrapper8.java

@@ -22,7 +22,10 @@ package de.steamwar.core;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.sk89q.jnbt.*;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.extension.input.ParserContext;
@@ -57,22 +60,25 @@ public class WorldEditWrapper8 implements WorldEditWrapper {
     }
 
     @Override
-    public void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat) {
+    public void setPlayerClipboard(Player player, Clipboard clipboard) {
         WorldData world = new BukkitWorld(player.getWorld()).getWorldData();
-        Clipboard clipboard;
-        try {
-            clipboard = getClipboard(is, schemFormat);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
         Actor actor = WorldEditWrapper.getWorldEditPlugin().wrapCommandSender(player);
         WorldEditWrapper.getWorldEditPlugin().getWorldEdit().getSessionManager().get(actor).setClipboard(new ClipboardHolder(clipboard, world));
     }
 
     @Override
-    public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat schemFormat) throws IOException {
-        switch (schemFormat) {
+    public Clipboard getClipboard(NodeData data) throws IOException {
+        InputStream is = data.schemData(true);
+        return readClipboard(is, data.getNodeFormat());
+    }
+
+    @Override
+    public Clipboard getClipboard(InputStream inputStream) throws IOException {
+        return readClipboard(inputStream, getNativeFormat());
+    }
+
+    private Clipboard readClipboard(InputStream is, NodeData.SchematicFormat format) throws IOException {
+        switch (format) {
             case MCEDIT:
                 return new SchematicReader(new NBTInputStream(is)).read(WorldEdit.getInstance().getServer().getWorlds().get(0).getWorldData());
             case SPONGE_V2:

SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java

@@ -22,10 +22,10 @@ package de.steamwar.core;
 import com.sk89q.worldedit.EmptyClipboardException;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.session.ClipboardHolder;
-import de.steamwar.sql.NoClipboardException;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.session.ClipboardHolder;
+import de.steamwar.sql.NoClipboardException;
 import de.steamwar.sql.NodeData;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -38,8 +38,10 @@ public interface WorldEditWrapper {
     WorldEditWrapper impl = VersionDependent.getVersionImpl(Core.getInstance());
 
     InputStream getPlayerClipboard(Player player);
-    void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat);
-    Clipboard getClipboard(InputStream is, NodeData.SchematicFormat schemFormat) throws IOException;
+
+    void setPlayerClipboard(Player player, Clipboard clipboard);
+    Clipboard getClipboard(NodeData data) throws IOException;
+    Clipboard getClipboard(InputStream inputStream) throws IOException;
 
     Vector getOrigin(Clipboard clipboard);
     Vector getMinimum(Region region);

SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java

@@ -29,14 +29,6 @@ import java.io.InputStream;
 
 public class SchematicData {
 
-    public static Clipboard clipboardFromStream(InputStream is, NodeData.SchematicFormat schemFormat) {
-        try {
-            return WorldEditWrapper.impl.getClipboard(is, schemFormat);
-        } catch (IOException e) {
-            throw new SecurityException("Could not read schem", e);
-        }
-    }
-
     private final NodeData data;
 
     public SchematicData(SchematicNode node) {
@@ -60,11 +52,11 @@ public class SchematicData {
     }
 
     public Clipboard load() throws IOException, NoClipboardException {
-        return WorldEditWrapper.impl.getClipboard(data.schemData(), data.getNodeFormat());
+        return WorldEditWrapper.impl.getClipboard(data);
     }
 
     public void loadToPlayer(Player player) throws IOException, NoClipboardException {
-        WorldEditWrapper.impl.setPlayerClipboard(player, data.schemData(), data.getNodeFormat());
+        WorldEditWrapper.impl.setPlayerClipboard(player, WorldEditWrapper.impl.getClipboard(data));
     }
 
     public static void saveFromPlayer(Player player, SchematicNode node) throws IOException, NoClipboardException {

Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java

@@ -1,181 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 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.teamserver.listener;
-
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.world.World;
-import de.steamwar.core.WorldEditRenderer;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
-import de.steamwar.teamserver.Builder;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.util.Vector;
-
-import java.util.*;
-import java.util.function.Predicate;
-
-@Linked
-@MinVersion(20)
-public class SelectAdjacent implements Listener {
-
-    private Vector[] FACES = {
-            new Vector(1, 0, 0),
-            new Vector(-1, 0, 0),
-            new Vector(0, 1, 0),
-            new Vector(0, -1, 0),
-            new Vector(0, 0, 1),
-            new Vector(0, 0, -1),
-
-            new Vector(1, 1, 0),
-            new Vector(1, -1, 0),
-            new Vector(1, 0, 1),
-            new Vector(1, 0, -1),
-            new Vector(-1, 1, 0),
-            new Vector(-1, -1, 0),
-            new Vector(-1, 0, 1),
-            new Vector(-1, 0, -1),
-            new Vector(0, 1, 1),
-            new Vector(0, 1, -1),
-            new Vector(0, -1, 1),
-            new Vector(0, -1, -1),
-    };
-
-    private Map<Player, Selector> selectors = new HashMap<>();
-
-    @EventHandler
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!event.hasItem()) return;
-        if (event.getItem().getType() != Material.WOODEN_AXE) return;
-        if (!event.getPlayer().isSneaking()) return;
-        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
-        Selector selector = selectors.get(event.getPlayer());
-        if (selector != null) selector.cancel();
-        Material material = event.getPlayer().getInventory().getItemInOffHand().getType();
-        if (material.isAir()) {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
-        } else {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), type -> type == material);
-        }
-        selectors.put(event.getPlayer(), selector);
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Selector selector = selectors.remove(event.getPlayer());
-        if (selector != null) selector.cancel();
-    }
-
-    private static final WorldEditPlugin WORLDEDIT_PLUGIN = Objects.requireNonNull((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
-    private static final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
-
-    private class Selector {
-
-        private static final int MAX_BLOCKS = 1_000_000;
-
-        private int minX;
-        private int minY;
-        private int minZ;
-        private int maxX;
-        private int maxY;
-        private int maxZ;
-
-        private BukkitTask bukkitTask;
-        private Predicate<Material> predicate;
-        private Set<Location> seen = new HashSet<>();
-        private Set<Location> toCalc = new HashSet<>();
-
-        public Selector(Block block, Player player, Predicate<Material> predicate) {
-            this.predicate = predicate;
-            toCalc.add(block.getLocation());
-            minX = block.getX();
-            minY = block.getY();
-            minZ = block.getZ();
-            maxX = block.getX();
-            maxY = block.getY();
-            maxZ = block.getZ();
-
-            bukkitTask = Bukkit.getScheduler().runTaskTimer(Builder.getInstance(), () -> {
-                run();
-
-                long volume = (long)(maxX - minX + 1) * (long)(maxY - minY + 1) * (long)(maxZ - minZ + 1);
-                player.sendTitle("", "§e" + volume + " §7Blocks", 0, 5, 0);
-
-                WORLDEDIT_PLUGIN.getSession(player).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, BlockVector3.at(minX, minY, minZ), BlockVector3.at(maxX, maxY, maxZ)));
-                WorldEditRenderer.renderPlayer(player);
-
-                // boolean finished = toCalc.stream().allMatch(location -> {
-                //     return location.getBlockX() >= minX && location.getBlockY() >= minY && location.getBlockZ() >= minZ &&
-                //             location.getBlockX() <= maxX && location.getBlockY() <= maxY && location.getBlockZ() <= maxZ;
-                // });
-
-                if (toCalc.isEmpty() || seen.size() > MAX_BLOCKS) {
-                    bukkitTask.cancel();
-                    player.sendTitle("§aDone", "§e" + volume + " §7Blocks", 0, 20, 5);
-                }
-            }, 1, 1);
-        }
-
-        private void cancel() {
-            bukkitTask.cancel();
-        }
-
-        private void run() {
-            Set<Location> current = toCalc;
-            toCalc = new HashSet<>();
-
-            for (Location location : current) {
-                Block block = location.getBlock();
-                if (block.isEmpty() || block.isLiquid()) continue;
-                if (!predicate.test(block.getType())) continue;
-                seen.add(location);
-
-                minX = Math.min(minX, location.getBlockX());
-                maxX = Math.max(maxX, location.getBlockX());
-                minY = Math.min(minY, location.getBlockY());
-                maxY = Math.max(maxY, location.getBlockY());
-                minZ = Math.min(minZ, location.getBlockZ());
-                maxZ = Math.max(maxZ, location.getBlockZ());
-
-                for (Vector face : FACES) {
-                    Block next = block.getRelative(face.getBlockX(), face.getBlockY(), face.getBlockZ());
-                    if (next.isEmpty() || next.isLiquid()) continue;
-                    if (!predicate.test(next.getType())) continue;
-                    Location loc = next.getLocation();
-                    if (seen.contains(loc)) continue;
-                    toCalc.add(loc);
-                }
-            }
-        }
-    }
-}

VelocityCore/Dependencies/build.gradle.kts

@@ -57,7 +57,6 @@ dependencies {
     implementation(libs.mysql)
 
     implementation(libs.msgpack)
-    implementation(libs.apolloprotos)
 
     implementation(libs.nbt)
 

VelocityCore/src/de/steamwar/messages/BungeeCore.properties

@@ -17,6 +17,19 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+LOCALE = English
+
+SETTINGS_TITLE = Settings
+SETTINGS_LOCALE_ITEM = §fLocale
+SETTINGS_LOCALE_CURRENT = §fCurrent locale §e{0}§8.
+SETTINGS_LOCALE_LOCKED = §cLocked§f to the current locale§8.
+SETTINGS_LOCALE_UNLOCKED = §aChanged§f by Client locale§8.
+SETTINGS_PREFIX_ITEM = §fChat prefix
+SETTINGS_PREFIX_SELECTED = §a> {0}
+SETTINGS_PREFIX_UNSELECTED = §f> {0}
+SETTINGS_PREFIX_SW = §eS§8W
+SETTINGS_PREFIX_TEAM = §{0}{1}
+
 COMMAND_SYSTEM_ERROR = §cError executing the command!
 COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===---
 
@@ -419,7 +432,6 @@ TEAM_NOT_IN_EVENT=§cThis is not possible during an event.
 TEAM_HELP_HEADER=§7Manage your team with §e/team.
 TEAM_HELP_LIST=§8/§7team list §8- §7List all teams.
 TEAM_HELP_INFO=§8/§7team info §8- §7Get information on a team.
-TEAM_HELP_TP=§8/§7team tp §8(§7Team§8) §8- §7Teleport to a team server.
 TEAM_HELP_CREATE=§8/§7team create §8- §7Create your own team.
 TEAM_HELP_JOIN=§8/§7team join §8- §7Join a team.
 TEAM_HELP_CHAT=§8/§7teamchat §8- §7Send messages to your team.

VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties

@@ -17,6 +17,8 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+LOCALE = Deutsch
+
 COMMAND_SYSTEM_ERROR = §cFehler beim Ausführen des Befehls!
 
 PREFIX=§eSteam§8War»
@@ -391,7 +393,6 @@ TEAM_NOT_IN_EVENT=§cDies ist während eines Events nicht möglich.
 TEAM_HELP_HEADER=§7Mit §e/team §7verwaltest du dein Team.
 TEAM_HELP_LIST=§8/§7team list §8- §7Liste alle Teams auf.
 TEAM_HELP_INFO=§8/§7team info §8- §7Informiere dich über ein Team.
-TEAM_HELP_TP=§8/§7team tp §8(§7Team§8) §8- §7Teleportiert zum Teamserver.
 TEAM_HELP_CREATE=§8/§7team create §8- §7Erstelle dein eigenes Team.
 TEAM_HELP_JOIN=§8/§7team join §8- §7Trete einem Team bei.
 TEAM_HELP_CHAT=§8/§7teamchat §8- §7Sende Nachrichten an dein Team.

VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java

@@ -128,8 +128,10 @@ public class DevCommand extends SWCommand {
         if (serverFiles != null) {
             for (String serverFile : serverFiles) {
                 String[] server = serverFile.split("\\.");
+                int version = Integer.parseInt(server[2]);
+                if (version == 0) continue;
                 devServerPorts.put(server[0], Integer.parseInt(server[1]));
-                devServerVersions.put(server[0], Integer.parseInt(server[2]));
+                devServerVersions.put(server[0], version);
             }
         }
 

VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java

@@ -19,14 +19,14 @@
 
 package de.steamwar.velocitycore.commands;
 
-import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import de.steamwar.sql.internal.Statement;
+import de.steamwar.velocitycore.VelocityCore;
 
 import java.io.*;
 import java.util.zip.ZipEntry;
@@ -76,13 +76,11 @@ public class GDPRQuery extends SWCommand {
         sqlCSV(user, out, bauweltMember, "BuildMember.csv");
         sqlCSV(user, out, bauweltMembers, "BuildMembers.csv");
         sqlCSV(user, out, checkedSchems, "SchematicChecksessions.csv");
-        sqlCSV(user, out, userElo, "UserElo.csv");
         sqlCSV(user, out, fights, "Fights.csv");
         sqlCSV(user, out, ignoredPlayers, "IgnoredPlayers.csv");
         sqlCSV(user, out, ignoringPlayers, "IgnoringPlayers.csv");
         sqlCSV(user, out, schematicMember, "SchematicMember.csv");
         sqlCSV(user, out, schematicMembers, "SchematicMembers.csv");
-        sqlCSV(user, out, pollAnswers, "PollAnswers.csv");
         sqlCSV(user, out, punishments, "Punishments.csv");
         sqlCSV(user, out, sessions, "Sessions.csv");
         sqlCSV(user, out, userData, "UserData.csv");
@@ -104,13 +102,11 @@ public class GDPRQuery extends SWCommand {
     private static final Statement bauweltMember = new Statement("SELECT BauweltID AS Bauwelt, WorldEdit, World FROM BauweltMember WHERE MemberID = ?");
     private static final Statement bauweltMembers = new Statement("SELECT u.UserName AS 'User', m.WorldEdit AS WorldEdit, m.World AS World FROM BauweltMember m INNER JOIN UserData u ON m.MemberID = u.id WHERE m.BauweltID = ?");
     private static final Statement checkedSchems = new Statement("SELECT NodeName AS Schematic, StartTime, EndTime, DeclineReason AS Result FROM CheckedSchematic WHERE NodeOwner = ? ORDER BY StartTime ASC");
-    private static final Statement userElo = new Statement("SELECT GameMode, Elo, Season FROM Elo WHERE UserID = ?");
     private static final Statement fights = new Statement("SELECT p.Team AS Team, p.Kit AS Kit, p.Kills AS Kills, p.IsOut AS Died, f.GameMode AS GameMode, f.Server AS Server, f.StartTime AS StartTime, f.Duration AS Duration, (f.BlueLeader = p.UserID) AS IsBlueLeader, (f.RedLeader = p.UserID) AS IsRedLeader, f.Win AS Winner, f.WinCondition AS WinCondition FROM Fight f INNER JOIN FightPlayer p ON f.FightID = p.FightID WHERE p.UserID = ? ORDER BY StartTime ASC");
     private static final Statement ignoredPlayers = new Statement("SELECT u.UserName AS IgnoredPlayer FROM IgnoredPlayers i INNER JOIN UserData u ON i.Ignored = u.id WHERE Ignorer = ?");
     private static final Statement ignoringPlayers = new Statement("SELECT Ignorer AS IgnoringPlayers FROM IgnoredPlayers WHERE Ignored = ?");
     private static final Statement schematicMember = new Statement("SELECT s.NodeName AS SchematicName, u.UserName AS SchematicOwner FROM NodeMember m INNER JOIN SchematicNode s ON m.NodeId = s.NodeId INNER JOIN UserData u ON s.NodeOwner = u.id WHERE m.UserId = ?");
     private static final Statement schematicMembers = new Statement("SELECT s.NodeName AS SchematicName, u.UserName AS Member FROM NodeMember m INNER JOIN SchematicNode s ON m.NodeId = s.NodeId INNER JOIN UserData u ON m.UserId = u.id WHERE s.NodeOwner = ?");
-    private static final Statement pollAnswers = new Statement("SELECT Question, Answer FROM PollAnswer WHERE UserID = ?");
     private static final Statement punishments = new Statement("SELECT Type, StartTime, EndTime, Perma, Reason FROM Punishments WHERE UserId = ?");
     private static final Statement sessions = new Statement("SELECT StartTime, EndTime FROM Session WHERE UserID = ?");
     private static final Statement userData = new Statement("SELECT * FROM UserData WHERE id = ?");

VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java

@@ -1,41 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 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.velocitycore.commands;
-
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-import de.steamwar.messages.PlayerChatter;
-import de.steamwar.network.packets.server.LocaleInvalidationPacket;
-import de.steamwar.velocitycore.network.NetworkSender;
-
-@Linked
-public class SetLocaleCommand extends SWCommand {
-
-    public SetLocaleCommand() {
-        super("setlocale", "setlanguage");
-    }
-
-    @Register
-    public void genericCommand(PlayerChatter sender) {
-        sender.user().setLocale(sender.getPlayer().getPlayerSettings().getLocale(), true);
-        sender.withPlayer(player -> NetworkSender.send(player, new LocaleInvalidationPacket(sender.user().getId())));
-        sender.system("LOCK_LOCALE_CHANGED");
-    }
-}

VelocityCore/src/de/steamwar/velocitycore/commands/SettingsCommand.java

@@ -0,0 +1,74 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 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.velocitycore.commands;
+
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import de.steamwar.messages.Message;
+import de.steamwar.messages.PlayerChatter;
+import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.Team;
+import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.inventory.SWItem;
+
+@Linked
+public class SettingsCommand extends SWCommand {
+
+    public SettingsCommand() {
+        super("settings");
+    }
+
+    @Register
+    public void genericCommand(PlayerChatter sender) {
+        SWInventory inventory = new SWInventory(sender, 9, new Message("SETTINGS_TITLE"));
+        SteamwarUser user = sender.user();
+        String localeItem = user.getManualLocale() ? "BOOK" : "BOOK_AND_QUILL";
+        SWItem localeSwItem = new SWItem(localeItem, new Message("SETTINGS_LOCALE_ITEM"));
+        localeSwItem.addLore(new Message("SETTINGS_LOCALE_CURRENT", new Message("LOCALE")));
+        if (user.getManualLocale()) {
+            localeSwItem.addLore(new Message("SETTINGS_LOCALE_LOCKED"));
+        } else {
+            localeSwItem.addLore(new Message("SETTINGS_LOCALE_UNLOCKED"));
+        }
+        inventory.addItem(2, localeSwItem, click -> {
+            if (user.getManualLocale()) {
+                user.unlockLocale();
+            } else {
+                user.lockLocale();
+            }
+            genericCommand(sender);
+        });
+
+        Team team = Team.byId(user.getTeam());
+        String chatPrefixItem = !user.hasPerm(UserPerm.TEAM) ? "BARRIER" : "NAME_TAG";
+        SWItem swItem = new SWItem(chatPrefixItem, new Message("SETTINGS_PREFIX_ITEM"));
+        if (user.hasPerm(UserPerm.TEAM)) {
+            swItem.addLore(new Message("SETTINGS_PREFIX_SELECTED", new Message("SETTINGS_PREFIX_SW")));
+        }
+        if (user.getTeam() != Team.PUBLIC) {
+            swItem.addLore(new Message("SETTINGS_PREFIX_UNSELECTED", new Message("SETTINGS_PREFIX_TEAM", team.getTeamColor(), team.getTeamKuerzel())));
+        }
+        inventory.addItem(6, swItem, click -> {
+        });
+
+        inventory.open();
+    }
+}

VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java

@@ -19,12 +19,6 @@
 
 package de.steamwar.velocitycore.commands;
 
-import com.velocitypowered.api.proxy.ConnectionRequestBuilder;
-import com.velocitypowered.api.proxy.server.RegisteredServer;
-import com.velocitypowered.api.proxy.server.ServerInfo;
-import com.velocitypowered.api.proxy.server.ServerPing;
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -33,19 +27,19 @@ import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
-import de.steamwar.persistent.Storage;
-import de.steamwar.sql.*;
+import de.steamwar.sql.Event;
+import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.Team;
+import de.steamwar.sql.TeamTeilnahme;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.inventory.SWListInv;
-import lombok.val;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 
-import java.net.*;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -63,10 +57,10 @@ public class TeamCommand extends SWCommand {
 
     @Register(noTabComplete = true)
     public void help(Chatter sender, String... args){
-        helpMessages(sender, "TEAM_HELP_HEADER", "TEAM_HELP_LIST", "TEAM_HELP_INFO", "TEAM_HELP_TP");
+        helpMessages(sender, "TEAM_HELP_HEADER", "TEAM_HELP_LIST", "TEAM_HELP_INFO");
 
         SteamwarUser user = sender.user();
-        if(user.getTeam() == 0) {
+        if(user.getTeam() == Team.PUBLIC) {
             helpMessages(sender, "TEAM_HELP_CREATE", "TEAM_HELP_JOIN");
         }else{
             helpMessages(sender, "TEAM_HELP_CHAT", "TEAM_HELP_EVENT", "TEAM_HELP_LEAVE");
@@ -168,7 +162,7 @@ public class TeamCommand extends SWCommand {
             return;
         }
 
-        user.setTeam(0);
+        user.setTeam(Team.PUBLIC);
 
         if(teamSize == 1)
             team.disband(user);
@@ -188,7 +182,7 @@ public class TeamCommand extends SWCommand {
         if(notDuringEvent(sender))
             return;
 
-        if(target.getTeam() != 0){
+        if(target.getTeam() != Team.PUBLIC){
             sender.system("TEAM_INVITE_IN_TEAM");
             return;
         }
@@ -224,7 +218,7 @@ public class TeamCommand extends SWCommand {
             return;
         }
 
-        target.setTeam(0);
+        target.setTeam(Team.PUBLIC);
 
         sender.system("TEAM_REMOVE_REMOVED");
         Chatter.of(target).system("TEAM_REMOVE_REMOVED_TARGET");
@@ -430,83 +424,6 @@ public class TeamCommand extends SWCommand {
         DiscordBot.withBot(bot -> bot.getEventChannel().update());
     }
 
-    @Register("tp")
-    public void tp(@Validator("isInTeam") PlayerChatter sender) {
-        Team team = Team.byId(sender.user().getTeam());
-        tp(sender, team);
-    }
-
-    @Register("tp")
-    public void tp(PlayerChatter sender, @ErrorMessage("TEAM_TP_NO_TEAM") Team targetTeam) {
-        if (targetTeam.getAddress() == null || targetTeam.getAddress().isEmpty()) {
-            sender.system("TEAM_NO_ADDRESS");
-            return;
-        }
-
-        InetSocketAddress address;
-        ServerInfo serverInfo;
-        try {
-            address = new InetSocketAddress(targetTeam.getAddress(), targetTeam.getPort());
-            serverInfo = Storage.teamServers.computeIfAbsent(targetTeam.getTeamId(), integer -> {
-                ServerInfo info = new ServerInfo("Team " + targetTeam.getTeamKuerzel(), address);
-                RegisteredServer server = VelocityCore.getProxy().registerServer(info);
-                ServerPing serverPing = server.ping().join();
-                ((VelocityViaConfig) Via.getConfig()).getVelocityServerProtocols().put(info.getName(), serverPing.getVersion().getProtocol());
-                return info;
-            });
-        } catch (Exception e) {
-            sender.system("TEAM_NO_ADDRESS");
-            return;
-        }
-
-        if (!address.equals(serverInfo.getAddress())) {
-            VelocityCore.getProxy().unregisterServer(Storage.teamServers.remove(targetTeam.getTeamId()));
-            tp(sender, targetTeam);
-            return;
-        }
-
-        sender.getPlayer().createConnectionRequest(VelocityCore.getProxy().getServer(serverInfo.getName()).orElseThrow()).connect().whenComplete((result, throwable) -> {
-            if(result.getStatus() != ConnectionRequestBuilder.Status.SUCCESS || throwable != null)
-                sender.system("TEAM_OFFLINE");
-        });
-    }
-
-    @Register(value = "server", description = "TEAM_SERVER_USAGE")
-    public void server(@Validator("isLeader") Chatter sender, String server, @Min(intValue = 1) @Max(intValue = 65535) @ErrorMessage("TEAM_SERVER_PORT_INVALID") int port){
-        Team team = Team.byId(sender.user().getTeam());
-        if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoTeamServer)) {
-            return;
-        }
-
-        try {
-            if (isLocalhost(InetAddress.getByName(server))) {
-                sender.system("TEAM_SERVER_ADDRESS_INVALID");
-                return;
-            }
-        } catch (UnknownHostException e) {
-            sender.system("TEAM_SERVER_ADDRESS_INVALID");
-            return;
-        }
-
-        team.setAddress(server);
-        team.setPort(port);
-        Storage.teamServers.remove(team.getTeamId());
-        sender.system("TEAM_SERVER_SET");
-    }
-
-    public static boolean isLocalhost(InetAddress addr) {
-        // Check if the address is a valid special local or loop back
-        if (addr.isAnyLocalAddress() || addr.isLoopbackAddress())
-            return true;
-
-        // Check if the address is defined on any interface
-        try {
-            return NetworkInterface.getByInetAddress(addr) != null;
-        } catch (SocketException e) {
-            return false;
-        }
-    }
-
     private static final Map<String, Integer> COLOR_CODES = new HashMap<>();
 
     static {
@@ -546,10 +463,14 @@ public class TeamCommand extends SWCommand {
 
     @ClassMapper(Event.class)
     public TypeMapper<Event> eventTypeMapper() {
-        return new TypeMapper<Event>() {
+        return new TypeMapper<>() {
             @Override
             public Event map(Chatter sender, PreviousArguments previousArguments, String s) {
-                return Event.get(s);
+                return Event.getComing()
+                        .stream()
+                        .filter(event -> event.getEventName().replace(" ", "").equalsIgnoreCase(s))
+                        .findFirst()
+                        .orElse(null);
             }
 
             @Override
@@ -564,7 +485,7 @@ public class TeamCommand extends SWCommand {
 
             @Override
             public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) {
-                return Event.getComing().stream().map(Event::getEventName).toList();
+                return Event.getComing().stream().map(Event::getEventName).map(e -> e.replace(" ", "")).toList();
             }
         };
     }
@@ -572,7 +493,7 @@ public class TeamCommand extends SWCommand {
     @Validator(value = "isNotInTeam", local = true)
     public TypeValidator<Chatter> isNotInTeamValidator() {
         return (sender, value, messageSender) -> {
-            if (sender.user().getTeam() != 0) {
+            if (sender.user().getTeam() != Team.PUBLIC) {
                 messageSender.send("TEAM_IN_TEAM");
                 return false;
             }
@@ -583,7 +504,7 @@ public class TeamCommand extends SWCommand {
     @Validator(value = "isInTeam", local = true)
     public TypeValidator<Chatter> isInTeamValidator() {
         return (sender, value, messageSender) -> {
-            if (sender.user().getTeam() == 0) {
+            if (sender.user().getTeam() == Team.PUBLIC) {
                 messageSender.send("TEAM_NOT_IN_TEAM");
                 return false;
             }
@@ -595,7 +516,7 @@ public class TeamCommand extends SWCommand {
     public TypeValidator<Chatter> isLeaderValidator() {
         return (sender, value, messageSender) -> {
             SteamwarUser user = sender.user();
-            if (user.getTeam() == 0) {
+            if (user.getTeam() == Team.PUBLIC) {
                 messageSender.send("TEAM_NOT_IN_TEAM");
                 return false;
             }

VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java

@@ -27,7 +27,6 @@ import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
-import com.velocitypowered.api.proxy.messages.ChannelMessageSource;
 import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
@@ -37,7 +36,6 @@ import de.steamwar.network.packets.NetworkPacket;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.commands.TeamCommand;
 import de.steamwar.velocitycore.mods.*;
 import de.steamwar.velocitycore.network.ServerMetaInfo;
 import io.netty.buffer.ByteBuf;
@@ -470,7 +468,7 @@ public class PluginMessage extends BasicListener {
         register("minecraft:brand", false, directional(this::steamWarBrand, UNKNOWN));
 
         //Needs to be registered cause paper refuses to send PluginMessages on unregistered channels...
-        register("sw:bridge", true, directional(onlySWSource(async(event -> NetworkPacket.handle(new ServerMetaInfo((ServerConnection) event.getSource()), event.getData()))), UNKNOWN));
+        register("sw:bridge", true, directional(async(event -> NetworkPacket.handle(new ServerMetaInfo((ServerConnection) event.getSource()), event.getData())), UNKNOWN));
         registerPassthroughToServer("sw:hotkeys");
         register("fabricmodsender:mods", true, directional(UNKNOWN, async(new FabricModSender()::handlePluginMessage)));
 
@@ -516,11 +514,8 @@ public class PluginMessage extends BasicListener {
         Player player = event.getPlayer();
 
         String brand = event.getBrand();
-        boolean lunarclient = brand.startsWith("lunarclient:");
 
-        VelocityCore.getLogger().log(knownBrands.contains(brand) || lunarclient ? Level.INFO : Level.WARNING, () -> player.getUsername() + " joins with brand: " + brand);
-        if(lunarclient)
-            lunar.sendRestrictions(player);
+        VelocityCore.getLogger().log(knownBrands.contains(brand) ? Level.INFO : Level.WARNING, () -> player.getUsername() + " joins with brand: " + brand);
         if(brand.equals("badlion"))
             badlion.sendRestrictions(player);
     }
@@ -574,16 +569,6 @@ public class PluginMessage extends BasicListener {
         };
     }
 
-    private Parser onlySWSource(Parser parser) {
-        return event -> {
-            ChannelMessageSource sender = event.getSource();
-            if(TeamCommand.isLocalhost(sender instanceof Player player ? IPSanitizer.getTrueAddress(player) : ((ServerConnection) sender).getServerInfo().getAddress().getAddress()))
-                parser.handle(event);
-            else
-                UNKNOWN.handle(event);
-        };
-    }
-
     private Parser async(Parser parser) {
         return event -> VelocityCore.schedule(() -> parser.handle(event)).schedule();
     }

VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java

@@ -36,7 +36,7 @@ public class SettingsChangedListener extends BasicListener {
         VelocityCore.schedule(() -> {
             Player player = event.getPlayer();
             SteamwarUser user = SteamwarUser.get(player.getUniqueId());
-            user.setLocale(event.getPlayerSettings().getLocale(), false);
+            user.setJoinLocale(event.getPlayerSettings().getLocale());
             NetworkSender.send(player, new LocaleInvalidationPacket(user.getId()));
         }).schedule();
     }

VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java

@@ -19,25 +19,9 @@
 
 package de.steamwar.velocitycore.mods;
 
-import com.google.protobuf.Any;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.Value;
-import com.lunarclient.apollo.configurable.v1.ConfigurableSettings;
-import com.lunarclient.apollo.configurable.v1.OverrideConfigurableSettingsMessage;
-import com.lunarclient.apollo.player.v1.ModMessage;
-import com.lunarclient.apollo.player.v1.PlayerHandshakeMessage;
 import com.velocitypowered.api.event.connection.PluginMessageEvent;
 import com.velocitypowered.api.proxy.Player;
-import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import de.steamwar.messages.Chatter;
-import de.steamwar.sql.Mod;
-import de.steamwar.sql.SteamwarUser;
-import de.steamwar.sql.UserPerm;
-import de.steamwar.velocitycore.VelocityCore;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
 
 public class Lunar {
     // https://lunarclient.dev/apollo/introduction
@@ -45,61 +29,7 @@ public class Lunar {
 
     public static final String CHANNEL = "lunar:apollo";
 
-    private final byte[] packet;
-
-    public Lunar() {
-        ConfigurableSettings.Builder builder = ConfigurableSettings.newBuilder()
-                .setApolloModule("mod_setting")
-                .setEnable(true);
-
-        for(String property : List.of(
-                "freelook.enabled", "hypixel-mod.enabled", "minimap.enabled", "nametag.enabled", "replaymod.enabled",
-                "team-view.enabled", "tnt-countdown.enabled", "toggle-sneak.toggle-sneak-container"
-        ))
-            builder.putProperties(property, Value.newBuilder().setBoolValue(false).build());
-
-        packet = Any.pack(OverrideConfigurableSettingsMessage.newBuilder().addConfigurableSettings(builder).build()).toByteArray();
-    }
-
-    public void sendRestrictions(Player player) {
-        player.sendPluginMessage(MinecraftChannelIdentifier.from(CHANNEL), packet);
-    }
-
     public void handlePluginMessage(PluginMessageEvent event) {
-        try {
-            Any packet = Any.parseFrom(event.getData());
-            if(packet.is(PlayerHandshakeMessage.class))
-                handle((Player) event.getSource(), packet.unpack(PlayerHandshakeMessage.class));
-        } catch (InvalidProtocolBufferException e) {
-            throw new SecurityException(e);
-        }
-    }
-
-    private void handle(Player player, PlayerHandshakeMessage packet) {
-        if (!SteamwarUser.get(player.getUniqueId()).hasPerm(UserPerm.RESTRICTED_MODS)) {
-            Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "Lunar");
-            return;
-        }
-
-        List<Mod> mods = new ArrayList<>();
-
-        for(ModMessage mod : packet.getInstalledModsList()) {
-            switch(mod.getType()) {
-                case TYPE_FABRIC_INTERNAL, TYPE_FORGE_INTERNAL:
-                    // Controlled with ModSettings
-                    break;
-                case TYPE_FABRIC_EXTERNAL:
-                    mods.add(Mod.getOrCreate(mod.getName(), Mod.Platform.FABRIC));
-                    break;
-                case TYPE_FORGE_EXTERNAL:
-                    mods.add(Mod.getOrCreate(mod.getName(), Mod.Platform.FORGE));
-                    break;
-                default:
-                    VelocityCore.getLogger().log(Level.INFO, () -> player.getUsername() + " uses Lunar mod with unknown type " + mod);
-                    break;
-            }
-        }
-
-        ModUtils.handleMods(player, mods);
+        Chatter.disconnect((Player) event.getSource()).prefixless("MOD_YELLOW_SING", "lunar");
     }
 }

buildSrc/src/steamwar.devserver.gradle

@@ -109,11 +109,11 @@ class DevServer extends DefaultTask {
         Finalizer() {
             super()
             doLast {
-                running = false
                 if (processInput != null) {
                     processInput.write(template.endsWith("Velocity") ? "end\n" : "stop\n")
                     processInput.flush()
                 }
+                running = false
             }
         }
     }
@@ -245,10 +245,12 @@ class DevServer extends DefaultTask {
                 processInput.newLine()
                 processInput.flush()
             }
-            processInput.close()
         }).start()
 
         process.waitFor()
+        if (processInput != null) {
+            processInput.close()
+        }
         processInput = null
         running = false
     }

settings.gradle.kts

@@ -34,13 +34,6 @@ dependencyResolutionManagement {
             }
         }
 
-        maven {
-            url = URI("https://repo.lunarclient.dev")
-            content {
-                includeGroup("com.lunarclient")
-            }
-        }
-
         maven {
             if (isInCi) {
                 url = URI("file:///var/www/maven/")
@@ -141,7 +134,6 @@ dependencyResolutionManagement {
             library("viavelocity", "com.viaversion:viaversion-velocity:4.3.1")
             library("jda", "net.dv8tion:JDA:5.5.1")
             library("msgpack", "org.msgpack:msgpack-core:0.9.8")
-            library("apolloprotos", "com.lunarclient:apollo-protos:1.0-SNAPSHOT")
 
             library("logback", "ch.qos.logback:logback-classic:1.5.6")