removed resolved todo

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

@@ -1,46 +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.utils;
-
-import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
-import net.minecraft.server.level.ServerPlayer;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-public class PlayerMovementWrapper21 implements PlayerMovementWrapper {
-
-    @Override
-    public void setPosition(Player player, Object object) {
-        ServerboundMovePlayerPacket packetPlayInFlying = ((ServerboundMovePlayerPacket) object);
-        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
-        if (packetPlayInFlying.hasPos) {
-            serverPlayer.setPosRaw(packetPlayInFlying.x, packetPlayInFlying.y, packetPlayInFlying.z);
-        }
-        if (packetPlayInFlying.hasRot) {
-            serverPlayer.setXRot(packetPlayInFlying.xRot);
-            serverPlayer.setYRot(packetPlayInFlying.yRot);
-        }
-    }
-
-    @Override
-    public Object convertToOut(Player player, Object object) {
-        return object;
-    }
-}

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -1030,7 +1030,6 @@ SCHEMATIC_GUI_ITEM=§eSchematics
 # TNTListener
 TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1}
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8)
-TLS_START_HELP=§8/§etls start §8- §7Start the TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8- §7Stop the TNT Listener
-TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon
-TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle the TNT Listener
+TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -961,7 +961,6 @@ TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Erset
 # Schematics
 SCHEMATIC_GUI_ITEM=§eSchematics
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8)
-TLS_START_HELP=§8/§etls start §8- §7Starte den TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8- §7Stope den TNT Listener
-TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan
-TLS_TOGGLE_HELP=§8/§etls §8: §7Toggle den TNT Listener
+TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java

@@ -1,20 +1,18 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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;
@@ -46,7 +44,6 @@ import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
 import lombok.Getter;
 import org.bukkit.Bukkit;
-import org.bukkit.GameRule;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -72,6 +69,7 @@ public class BauSystem extends JavaPlugin implements Listener {
     @Getter
     private static BauSystem instance;
 
+    @Getter
     private SpigotLinker linker;
 
     @Override
@@ -129,8 +127,6 @@ public class BauSystem extends JavaPlugin implements Listener {
         TraceRecorder.instance.init();
 
         new WorldEditRendererCUIEditor();
-
-        Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
     }
 
     @EventHandler
@@ -186,7 +182,8 @@ public class BauSystem extends JavaPlugin implements Listener {
 
             @Override
             public void run() {
-                if (TickManager.impl.isFrozen()) return;
+                if (TickManager.impl.isFrozen())
+                    return;
                 if (counter >= delay) {
                     runnable.run();
                     cancel();
@@ -204,7 +201,8 @@ public class BauSystem extends JavaPlugin implements Listener {
 
             @Override
             public void run() {
-                if (TickManager.impl.isFrozen()) return;
+                if (TickManager.impl.isFrozen())
+                    return;
                 if (counter >= (first ? delay : period)) {
                     first = false;
                     runnable.run();
@@ -220,4 +218,4 @@ public class BauSystem extends JavaPlugin implements Listener {
         AtomicReference<BukkitTask> task = new AtomicReference<>();
         task.set(runTaskTimer(plugin, () -> consumer.accept(task.get()), delay, period));
     }
-}
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java

@@ -27,6 +27,8 @@ import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
 import org.bukkit.entity.Player;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Predicate;
 
 @AllArgsConstructor
@@ -37,12 +39,13 @@ public enum Permission {
         return bauweltMember.isSupervisor();
     }),
     BUILD(bauweltMember -> {
+        if (isTempOnlySpectator(bauweltMember)) return false;
         return bauweltMember.isBuild() || SUPERVISOR.permissionPredicate.test(bauweltMember);
     }),
     /**
      * Only used for {@link BauMemberUpdate}
      */
-    SPECTATOR(bauweltMember -> {
+    REAL_SPECTATOR(bauweltMember -> {
         return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
     }),
     /**
@@ -52,6 +55,28 @@ public enum Permission {
         return true;
     });
 
+    private static final Set<Integer> TEMP_ONLY_SPECTATOR = new HashSet<>();
+
+    private static boolean isTempOnlySpectator(BauweltMember bauweltMember) {
+        return TEMP_ONLY_SPECTATOR.contains(bauweltMember.getMemberID());
+    }
+    
+    public static boolean isTempOnlySpectator(Player player) {
+        return TEMP_ONLY_SPECTATOR.contains(SteamwarUser.get(player.getUniqueId()).getId());
+    }
+
+    public static void forceOnlySpectator(Player player) {
+        TEMP_ONLY_SPECTATOR.add(SteamwarUser.get(player.getUniqueId()).getId());
+        BauMemberUpdate.baumemberUpdate();
+    }
+
+    /**
+     * Only used by {@link BauMemberUpdate}
+     */
+    public static void removeForceOnlySpectator(Player player) {
+        TEMP_ONLY_SPECTATOR.remove(SteamwarUser.get(player.getUniqueId()).getId());
+    }
+
     private final Predicate<BauweltMember> permissionPredicate;
 
     public boolean hasPermission(BauweltMember bauweltMember) {
@@ -61,10 +86,10 @@ public enum Permission {
 
     public boolean hasPermission(Player member) {
         if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
-            return this != SPECTATOR;
+            return this != REAL_SPECTATOR;
         }
         BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (bauweltMember == null) return this == SPECTATOR;
+        if (bauweltMember == null) return this == REAL_SPECTATOR;
         return permissionPredicate.test(bauweltMember);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/BauServer.java

@@ -36,7 +36,7 @@ public class BauServer {
     private Integer owner;
 
     public UUID getOwner() {
-        return SteamwarUser.byId(getOwnerID()).getUUID();
+        return SteamwarUser.get(getOwnerID()).getUUID();
     }
 
     public int getOwnerID() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java

@@ -32,7 +32,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Chest;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -121,7 +120,6 @@ public class AutostartListener implements Listener {
 
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
-        if (!(event.getEntity() instanceof TNTPrimed)) return;
         if (regionStartTime.isEmpty()) {
             return;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java

@@ -0,0 +1,71 @@
+/*
+ *   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.bau;
+
+import de.steamwar.bausystem.Permission;
+import de.steamwar.command.PreviousArguments;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+@Linked
+public class ForceSpectatorCommand extends SWCommand {
+
+    public ForceSpectatorCommand() {
+        super("forcespectator");
+    }
+
+    @Register
+    public void forceSpectator(@Validator("supervisor") Player player, @Mapper("builder") Player other) {
+        Permission.forceOnlySpectator(other);
+    }
+
+    @Mapper("builder")
+    public TypeMapper<Player> spectatorMapper() {
+        return new TypeMapper<>() {
+            @Override
+            public Player map(CommandSender commandSender, String[] previousArguments, String s) {
+                Player player = Bukkit.getPlayer(s);
+                if (player == null) {
+                    return null;
+                }
+                if (Permission.BUILD.hasPermission(player) && !Permission.SUPERVISOR.hasPermission(player)) {
+                    return player;
+                }
+                return null;
+            }
+
+            @Override
+            public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
+                return Bukkit.getOnlinePlayers().stream()
+                        .filter(Permission.BUILD::hasPermission)
+                        .filter(player -> !Permission.SUPERVISOR.hasPermission(player))
+                        .map(Player::getName)
+                        .collect(Collectors.toList());
+            }
+        };
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java

@@ -47,7 +47,7 @@ public class InfoCommand extends SWCommand {
 
     @Register(description = "BAU_INFO_COMMAND_HELP")
     public void genericCommand(Player p) {
-        BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.byId(bauServer.getOwnerID()).getUserName());
+        BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
         Region region = Region.getRegion(p.getLocation());
         for (Flag flag : Flag.getFlags()) {
             if (!region.getFlags().has(flag).isApplicable()) continue;
@@ -97,7 +97,7 @@ public class InfoCommand extends SWCommand {
                 st.append("§8, ");
             }
             st.append("§7");
-            st.append(SteamwarUser.byId(bauweltMembers.get(i).getMemberID()).getUserName());
+            st.append(SteamwarUser.get(bauweltMembers.get(i).getMemberID()).getUserName());
         }
         return st.toString();
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java

@@ -21,10 +21,9 @@ package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.ItemUtils;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWItem;
-import lombok.Data;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -32,32 +31,13 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
 
 @UtilityClass
 public class Countingwand {
 
-    @Data
-    public class CountingWandComponent implements SWPlayer.Component {
-        private Point pos1;
-        private Point pos2;
-
-        public boolean setPosition(boolean pos1, Point point) {
-            if (this.pos1 == null || this.pos2 == null) {
-                this.pos1 = point;
-                this.pos2 = point;
-                return true;
-            }
-            Point current = pos1 ? this.pos1 : this.pos2;
-            if (current.equals(point)) return false;
-            if (pos1) {
-                this.pos1 = point;
-            } else {
-                this.pos2 = point;
-            }
-            return true;
-        }
-    }
-
 	public static ItemStack getWandItem(Player player) {
 		ItemStack itemStack = new SWItem(Material.STICK, BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE1", player), BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE2", player)), false, null).getItemStack();
 		ItemUtils.setItem(itemStack, "countingwand");
@@ -67,20 +47,61 @@ public class Countingwand {
 		return itemStack;
 	}
 
-    public boolean isCountingwand(ItemStack itemStack) {
-        return ItemUtils.isItem(itemStack, "countingwand");
-    }
+	private final Map<String, Pair<Point, Point>> selections = new HashMap<>();
 
-    public void checkSelection(final Point point, final boolean pos1, final Player p) {
-        SWPlayer player = SWPlayer.of(p);
-        CountingWandComponent countingWandComponent = player.getComponentOrDefault(CountingWandComponent.class, CountingWandComponent::new);
-        if (countingWandComponent.setPosition(pos1, point)) {
-            Point point1 = countingWandComponent.pos1;
-            Point point2 = countingWandComponent.pos2;
-            int amount = (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
-            String dimension = player.using(BauSystem.MESSAGE).parse("COUNTINGWAND_MESSAGE_VOLUME", amount);
-            String volume = player.parse("COUNTINGWAND_MESSAGE_DIMENSION", Math.abs(point1.getX() - point2.getX()) + 1, Math.abs(point1.getY() - point2.getY()) + 1, Math.abs(point1.getZ() - point2.getZ()) + 1);
-            player.sendMessage(pos1 ? "COUNTINGWAND_MESSAGE_RCLICK" : "COUNTINGWAND_MESSAGE_LCLICK", point.getX(), point.getY(), point.getZ(), dimension, volume);
-        }
-    }
+	public boolean isCountingwand(ItemStack itemStack) {
+		return ItemUtils.isItem(itemStack, "countingwand");
+	}
+
+	public void checkSelection(final Point point, final boolean pos1, final Player p) {
+		Pair<Point, Point> selection = selections.get(p.getUniqueId().toString());
+		final boolean newPos;
+		if (selection != null) {
+			if (pos1) {
+				newPos = !point.equals(selection.setKey(point));
+			} else {
+				newPos = !point.equals(selection.setValue(point));
+			}
+		} else {
+			if (pos1) {
+				selection = new Pair<>(point, null);
+			} else {
+				selection = new Pair<>(null, point);
+			}
+			selections.put(p.getUniqueId().toString(), selection);
+			newPos = true;
+		}
+
+		if (newPos) {
+			String dimension = getDimensions(p, selection.getKey(), selection.getValue());
+			String volume = getVolume(p, selection.getKey(), selection.getValue());
+			if (pos1) {
+				BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_RCLICK", p, point.getX(), point.getY(), point.getZ(), dimension, volume);
+			} else {
+				BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_LCLICK", p, point.getX(), point.getY(), point.getZ(), dimension, volume);
+			}
+		}
+	}
+
+	public void removePlayer(Player p) {
+		selections.remove(p.getUniqueId().toString());
+	}
+
+	public String getVolume(Player player, final Point point1, final Point point2) {
+		if (point1 == null || point2 == null) {
+			return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_VOLUME", player, 0);
+		}
+		return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_VOLUME", player, getAmount(point1, point2));
+	}
+
+	public String getDimensions(Player player, final Point point1, final Point point2) {
+		if (point1 == null || point2 == null) {
+			return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_DIMENSION", player, 0, 0, 0);
+		}
+		return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_DIMENSION", player, Math.abs(point1.getX() - point2.getX()) + 1, Math.abs(point1.getY() - point2.getY()) + 1, Math.abs(point1.getZ() - point2.getZ()) + 1);
+	}
+
+	public int getAmount(final Point point1, final Point point2) {
+		return (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
+	}
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java

@@ -27,6 +27,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.util.RayTraceResult;
 
 import java.util.Objects;
@@ -66,4 +67,9 @@ public class CountingwandListener implements Listener {
 		event.setCancelled(true);
 		Countingwand.checkSelection(Point.fromLocation(Objects.requireNonNull(event.getClickedBlock()).getLocation()), false, event.getPlayer());
 	}
+
+	@EventHandler
+	public void onLeave(PlayerQuitEvent event) {
+		Countingwand.removePlayer(event.getPlayer());
+	}
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detonator.java

@@ -25,11 +25,8 @@ import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.autostart.AutostartListener;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.entity.RFallingBlockEntity;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -48,28 +45,7 @@ import java.util.*;
 @UtilityClass
 public class Detonator {
 
-    public class DetonatorComponent implements SWPlayer.Component {
-        private final REntityServer entities = new REntityServer();
-
-        @Getter
-        @Setter
-        private boolean hasUpdated = false;
-
-        @Override
-        public void onMount(SWPlayer player) {
-            entities.addPlayer(player.getPlayer());
-            entities.setCallback((player1, entity, action) -> {
-                Vector vector = new Vector(entity.getX(), entity.getY(), entity.getZ());
-                DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player1);
-            });
-        }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            entities.close();
-        }
-    }
-
+    private static final Map<Player, REntityServer> ENTITIES_MAP = new HashMap<>();
     private static final Vector HALF = new Vector(0.5, 0, 0.5);
 
     public static boolean isDetonator(ItemStack itemStack) {
@@ -77,19 +53,28 @@ public class Detonator {
     }
 
     public static void showDetonator(Player p, List<Location> locs) {
-        DetonatorComponent detonatorComponent = SWPlayer.of(p).getComponentOrDefault(DetonatorComponent.class, DetonatorComponent::new);
+        if (ENTITIES_MAP.containsKey(p)) return;
+        REntityServer entities = new REntityServer();
+        entities.setCallback((player, rEntity, entityAction) -> {
+            Vector vector = new Vector(rEntity.getX(), rEntity.getY(), rEntity.getZ());
+            DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player);
+            DetonatorListener.HAS_UPDATED.add(player);
+        });
+        entities.addPlayer(p);
+        ENTITIES_MAP.put(p, entities);
+
         locs.forEach(location -> {
-            RFallingBlockEntity entity = new RFallingBlockEntity(detonatorComponent.entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
+            RFallingBlockEntity entity = new RFallingBlockEntity(entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
             entity.setNoGravity(true);
         });
     }
 
     public static void hideDetonator(Player p) {
-        SWPlayer.of(p).removeComponent(DetonatorComponent.class);
+        ENTITIES_MAP.remove(p).close();
     }
 
     public static boolean hasActiveDetonatorShow(Player p) {
-        return SWPlayer.of(p).hasComponent(DetonatorComponent.class);
+        return ENTITIES_MAP.containsKey(p);
     }
 
     public static void activateDetonator(DetonatorStorage detonator) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java

@@ -24,7 +24,6 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -37,11 +36,15 @@ import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @Linked
 public class DetonatorListener implements Listener {
 
+    static final Set<Player> HAS_UPDATED = new HashSet<>();
+
     static void addLocationToDetonator(Location location, Player p) {
-        SWPlayer.of(p).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
         Detoblock detoblock = Detonator.getBlock(location.getBlock());
         if (detoblock == Detoblock.INVALID) {
             SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("DETONATOR_INVALID_BLOCK", p));
@@ -63,59 +66,64 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         Player p = event.getPlayer();
         if (Detonator.isDetonator(p.getInventory().getItemInMainHand())) {
             event.setCancelled(true);
             addLocationToDetonator(event.getBlock().getLocation(), p);
+            HAS_UPDATED.add(event.getPlayer());
         }
     }
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Detonator.isDetonator(event.getItem())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Detonator.isDetonator(event.getItem())) {
+            return;
+        }
 
         if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
             event.setCancelled(true);
             DetonatorStorage detonator = new ItemStorage(event.getPlayer());
             Detonator.activateDetonator(detonator);
-            SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
+            HAS_UPDATED.add(event.getPlayer());
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer()) || !Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer()) ||!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
             if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
                 Detonator.hideDetonator(event.getPlayer());
             }
-            return;
+        } else {
+            if (!Detonator.hasActiveDetonatorShow(event.getPlayer())) {
+                Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
+            }
         }
-        if (!Detonator.hasActiveDetonatorShow(event.getPlayer())) {
-            Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
-            return;
+
+        if (HAS_UPDATED.contains(event.getPlayer())) {
+            HAS_UPDATED.remove(event.getPlayer());
+            if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
+                Detonator.hideDetonator(event.getPlayer());
+                Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
+            }
         }
-        Detonator.DetonatorComponent component = SWPlayer.of(event.getPlayer())
-                .getComponentAndFilter(Detonator.DetonatorComponent.class, Detonator.DetonatorComponent::isHasUpdated)
-                .orElse(null);
-        if (component == null) return;
-        component.setHasUpdated(false);
-        Detonator.hideDetonator(event.getPlayer());
-        Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
     }
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) return;
-        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
+            HAS_UPDATED.add(event.getPlayer());
+        }
     }
 
     @EventHandler
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!(Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem()))) return;
-        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem())) {
+            HAS_UPDATED.add(event.getPlayer());
+        }
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java

@@ -26,7 +26,6 @@ import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
 import de.steamwar.bausystem.features.loader.elements.impl.LoaderTNT;
 import de.steamwar.bausystem.features.loader.elements.impl.LoaderWait;
 import de.steamwar.bausystem.shared.EnumDisplay;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
@@ -41,17 +40,21 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class Loader implements Listener, SWPlayer.Component {
+public class Loader implements Listener {
+
+    private static final Map<Player, Loader> LOADER_MAP = new HashMap<>();
 
     public static Loader getLoader(Player player) {
-        return SWPlayer.of(player).getComponent(Loader.class).orElse(null);
+        return LOADER_MAP.get(player);
     }
 
     public static void newLoader(Player player) {
-        SWPlayer.of(player).setComponent(new Loader(player));
+        LOADER_MAP.put(player, new Loader(player));
     }
 
     private final Player p;
@@ -142,7 +145,7 @@ public class Loader implements Listener, SWPlayer.Component {
             recorder = null;
         }
         elements.clear();
-        SWPlayer.of(p).removeComponent(Loader.class);
+        LOADER_MAP.remove(p);
     }
 
     public boolean setTicksBetweenShots(int delay) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java

@@ -29,7 +29,6 @@ import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
@@ -157,7 +156,6 @@ public class Loadtimer implements Listener {
     }
 
     public void onTntExplode(EntityExplodeEvent event) {
-        if (!(event.getEntity() instanceof TNTPrimed)) return;
         if (region.getBuildArea().inRegion(event.getLocation(), true) && stage == Stage.IGNITION) {
             stage = Stage.END;
             explode = TPSUtils.currentRealTick.get();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.Reflection;
 import de.steamwar.bausystem.region.Point;
-import de.steamwar.core.SWPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;
@@ -35,7 +34,7 @@ import org.bukkit.entity.Player;
 
 import java.util.*;
 
-public class ObserverTracer implements SWPlayer.Component {
+public class ObserverTracer {
 
     private static final Set<BlockFace> ALLOWED = EnumSet.of(BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST, BlockFace.UP, BlockFace.DOWN);
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.command.SWCommand;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -42,23 +41,23 @@ public class ObserverTracerCommand extends SWCommand {
     @Register(value = "disable", description = "OBSERVER_HELP_DISABLE")
     public void disable(Player p) {
         ObserverTracerListener.enabled.remove(p);
-        SWPlayer.of(p).removeComponent(ObserverTracer.class);
+        ObserverTracerListener.observerTracerMap.remove(p);
         BauSystem.MESSAGE.send("OBSERVER_DISABLE", p);
     }
 
     @Register(value = "delete", description = "OBSERVER_HELP_DELETE")
     public void delete(@Validator Player p) {
-        SWPlayer.of(p).removeComponent(ObserverTracer.class);
+        ObserverTracerListener.observerTracerMap.remove(p);
         BauSystem.MESSAGE.send("OBSERVER_DELETE", p);
     }
 
     @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE")
     public void retrace(@Validator Player p) {
-        if (SWPlayer.of(p).hasComponent(ObserverTracer.class)) {
+        if (ObserverTracerListener.observerTracerMap.containsKey(p)) {
             BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p);
             return;
         }
-        SWPlayer.of(p).getComponent(ObserverTracer.class).ifPresent(ObserverTracer::trace);
+        ObserverTracerListener.observerTracerMap.get(p).trace();
         BauSystem.MESSAGE.send("OBSERVER_RETRACE_DONE", p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.observer;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -35,19 +34,23 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 @Linked
 public class ObserverTracerListener implements Listener {
 
     static Set<Player> enabled = new HashSet<>();
+    static Map<Player, ObserverTracer> observerTracerMap = new HashMap<>();
 
     public ObserverTracerListener() {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-            SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                if (pair.getKey().getGameMode() != GameMode.SPECTATOR) return;
-                pair.getValue().show();
+            observerTracerMap.forEach((player, observerTracer) -> {
+                if (player.getGameMode() == GameMode.SPECTATOR) {
+                    observerTracer.show();
+                }
             });
         }, 15L, 15L);
     }
@@ -55,16 +58,20 @@ public class ObserverTracerListener implements Listener {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!enabled.contains(event.getPlayer())) return;
-        if (event.getClickedBlock() == null) return;
-        ObserverTracer observerTracer = SWPlayer.of(event.getPlayer()).getComponent(ObserverTracer.class).orElse(null);
-        if (observerTracer != null) {
+        if (!enabled.contains(event.getPlayer())) {
+            return;
+        }
+        if (event.getClickedBlock() == null) {
+            return;
+        }
+        if (observerTracerMap.containsKey(event.getPlayer())) {
+            ObserverTracer observerTracer = observerTracerMap.get(event.getPlayer());
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 if (!observerTracer.trace()) {
                     createNew(event);
                 }
-                SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                    pair.getValue().trace();
+                observerTracerMap.forEach((player, o) -> {
+                    o.trace();
                 });
             }, 1L);
         } else {
@@ -79,13 +86,13 @@ public class ObserverTracerListener implements Listener {
         if (event.getClickedBlock().getType() == Material.OBSERVER) {
             ObserverTracer observerTracer = new ObserverTracer(event.getPlayer(), event.getClickedBlock());
             observerTracer.trace();
-            SWPlayer.of(event.getPlayer()).setComponent(observerTracer);
+            observerTracerMap.put(event.getPlayer(), observerTracer);
         }
     }
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewBuilder().forEach(player -> SWPlayer.of(player).removeComponent(ObserverTracer.class));
+        event.getNewSpectator().forEach(observerTracerMap::remove);
     }
 
     @EventHandler
@@ -96,5 +103,6 @@ public class ObserverTracerListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         enabled.remove(event.getPlayer());
+        observerTracerMap.remove(event.getPlayer());
     }
 }

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

@@ -26,10 +26,8 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -41,14 +39,11 @@ import java.util.List;
 @Linked
 public class TNTListener implements Listener, ScoreboardElement {
 
-    private void explode(List<Block> blockList, boolean destroy) {
+    private void explode(List<Block> blockList) {
         blockList.removeIf(block -> {
             Region region = Region.getRegion(block.getLocation());
             TNTMode value = region.getFlags().get(Flag.TNT).getWithDefault();
             if (value == TNTMode.ALLOW) {
-                if (destroy && block.getType() != Material.TNT) {
-                    block.setType(Material.AIR);
-                }
                 return false;
             } else if (value == TNTMode.ONLY_TB) {
                 if (region.getBuildArea().inRegion(block.getLocation(), true)) {
@@ -62,16 +57,12 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onBlockExplode(BlockExplodeEvent event) {
-        explode(event.blockList(), false);
+        explode(event.blockList());
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onExplode(EntityExplodeEvent event) {
-        if (!(event.getEntity() instanceof TNTPrimed)) {
-            event.blockList().clear();
-            return;
-        }
-        explode(event.blockList(), true);
+        explode(event.blockList());
     }
 
     @Override

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

@@ -31,6 +31,7 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
+import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
@@ -72,14 +73,6 @@ public class TestblockCommand extends SWCommand {
         resetRegion(p, node, isExtension ? RegionExtensionType.EXTENSION : RegionExtensionType.NORMAL, isIgnoreAir, isOnlyColor, replaceTNT, replaceWater);
     }
 
-    @Register(value="default")
-    public void setTestblockDefault(Player p) {
-        Region region = regionCheck(p);
-        if (region == null) return;
-        region.getRegionData().setTestblockSchematic(null);
-        resetRegion(p, null, RegionExtensionType.EXTENSION, false, false, false, false);
-    }
-
     private void resetRegion(Player p, SchematicNode node, RegionExtensionType regionExtensionType, boolean ignoreAir, boolean onlyColors, boolean removeTNT, boolean removeWater) {
         Region region = regionCheck(p);
         if (region == null) return;
@@ -100,10 +93,29 @@ public class TestblockCommand extends SWCommand {
             }
         }
 
-        if (node == null) {
-            node = region.getRegionData().getTestblockSchematic();
-        } else {
-            region.getRegionData().setTestblockSchematic(node);
+        // Beta Tester enabled
+        switch (BauServer.getInstance().getOwnerID()) {
+            case 245:
+            case 403:
+            case 1898:
+            case 3320:
+            case 4603:
+            case 5262:
+            case 5399:
+            case 6032:
+            case 7862:
+            case 11077:
+            case 11888:
+            case 12258:
+            case 16009:
+                if (node == null) {
+                    node = region.getRegionData().getTestblockSchematic();
+                } else {
+                    region.getRegionData().setTestblockSchematic(node);
+                }
+                break;
+            default:
+                break;
         }
 
         PasteBuilder.ClipboardProvider clipboardProvider;
@@ -186,7 +198,7 @@ public class TestblockCommand extends SWCommand {
             @Override
             public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                 List<String> stringList = new ArrayList<>(SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s));
-                stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.byId(0), s));
+                stringList.addAll(SchematicNode.getNodeTabcomplete(SteamwarUser.get(0), s));
                 return stringList;
             }
 
@@ -194,7 +206,7 @@ public class TestblockCommand extends SWCommand {
             public SchematicNode map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                 SchematicNode node = SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
                 if (node == null) {
-                    node = SchematicNode.getNodeFromPath(SteamwarUser.byId(0), s);
+                    node = SchematicNode.getNodeFromPath(SteamwarUser.get(0), s);
                 }
                 return node;
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptHelper.java

@@ -38,7 +38,7 @@ public class ScriptHelper {
         BookMeta meta = (BookMeta) itemStack.getItemMeta();
         if(!writeable) {
             meta.setTitle(script.getName());
-            meta.setAuthor(SteamwarUser.byId(script.getUserId()).getUserName());
+            meta.setAuthor(SteamwarUser.get(script.getUserId()).getUserName());
         }
         meta.setPages(getScriptPages(script));
         itemStack.setItemMeta(meta);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java

@@ -67,7 +67,7 @@ public class ScriptListener implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        playerSet.remove(event.getPlayer());
+        ScriptRunner.remove(event.getPlayer());
     }
 
     @EventHandler

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptRunner.java

@@ -23,11 +23,8 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.lua.CommandRegister;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.SteamWarPlatform;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.sql.Script;
 import de.steamwar.sql.SteamwarUser;
-import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
@@ -47,25 +44,12 @@ public class ScriptRunner {
     // Key   -> bau-script-<BUCH NAME>
     // Value -> <LUA Script>
 
-    public class ScriptData implements SWPlayer.Component {
-        private Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>> events = new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class);
-        private Map<Hotkey, List<LuaFunction>> hotkeys = new HashMap<>();
-        private Map<String, CommandRegister> commands = new HashMap<>();
-
-        @Getter
-        private Set<String> calledCommands = new HashSet<>();
-
-        @Getter
-        @Setter
-        private Long lastF = Long.MAX_VALUE;
-
-        @Getter
-        @Setter
-        private boolean ignore;
-    }
+    private static final Map<Player, Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>>> EVENT_MAP = new HashMap<>();
+    private static final Map<Player, Map<Hotkey, List<LuaFunction>>> HOTKEY_MAP = new HashMap<>();
+    private static final Map<Player, Map<String, CommandRegister>> COMMAND_MAP = new HashMap<>();
 
     public Set<String> getCommandsOfPlayer(Player player) {
-        return SWPlayer.of(player).getComponentOrDefault(ScriptData.class, ScriptData::new).commands.keySet();
+        return COMMAND_MAP.getOrDefault(player, new HashMap<>()).keySet();
     }
 
     public static void runScript(String script, Player player) {
@@ -80,12 +64,10 @@ public class ScriptRunner {
 
     public static void createGlobalScript(List<String> scripts, Player player) {
         remove(player);
-        SWPlayer swPlayer = SWPlayer.of(player);
-        ScriptData scriptData = swPlayer.getComponentOrDefault(ScriptData.class, ScriptData::new);
         Globals globals = SteamWarPlatform.createGlobalGlobals(player,
-                (s, luaFunction) -> scriptData.events.computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
-                (s, luaFunction) -> scriptData.hotkeys.computeIfAbsent(Hotkey.fromString(s), s1 -> new ArrayList<>()).add(luaFunction),
-                commandRegister -> scriptData.commands.put(commandRegister.getName(), commandRegister));
+                (s, luaFunction) -> EVENT_MAP.computeIfAbsent(player, player1 -> new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class)).computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
+                (s, luaFunction) -> HOTKEY_MAP.computeIfAbsent(player, player1 -> new HashMap<>()).computeIfAbsent(Hotkey.fromString(s), s1 -> new ArrayList<>()).add(luaFunction),
+                commandRegister -> COMMAND_MAP.computeIfAbsent(player, player1 -> new HashMap<>()).put(commandRegister.getName(), commandRegister));
 
         for (String script : scripts) {
             catchScript("SCRIPT_ERROR_GLOBAL", player, () -> globals.load(script).call());
@@ -93,14 +75,13 @@ public class ScriptRunner {
     }
 
     public static void remove(Player player) {
-        SWPlayer.of(player).removeComponent(ScriptData.class);
+        EVENT_MAP.remove(player);
+        COMMAND_MAP.remove(player);
+        HOTKEY_MAP.remove(player);
     }
 
     public static void callEvent(Player player, SteamWarGlobalLuaPlugin.EventType event, LuaValue eventValue, Event wrappedEvent) {
-        List<LuaFunction> luaFunctions = SWPlayer.of(player).getComponent(ScriptData.class)
-                .map(scriptData -> scriptData.events)
-                .orElse(Collections.emptyMap())
-                .getOrDefault(event, Collections.emptyList());
+        List<LuaFunction> luaFunctions = EVENT_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(event, Collections.emptyList());
         if (luaFunctions.isEmpty()) {
             if(event == SteamWarGlobalLuaPlugin.EventType.DoubleSwap) {
                 player.performCommand("gui");
@@ -143,10 +124,7 @@ public class ScriptRunner {
     }
 
     public static boolean callCommand(Player player, String command, String[] argsArray) {
-        CommandRegister commandRegister = SWPlayer.of(player).getComponent(ScriptData.class)
-                .map(scriptData -> scriptData.commands)
-                .orElse(Collections.emptyMap())
-                .get(command);
+        CommandRegister commandRegister = COMMAND_MAP.getOrDefault(player, Collections.emptyMap()).get(command);
         if (commandRegister == null) {
             return false;
         }
@@ -210,11 +188,7 @@ public class ScriptRunner {
 
     public static void callHotkey(int mods, int key, Player player, boolean pressed) {
         Hotkey hotkey = Hotkey.fromChar(key, mods);
-        List<LuaFunction> hotkeys = SWPlayer.of(player).getComponent(ScriptData.class)
-                .map(scriptData -> scriptData.hotkeys)
-                .orElse(Collections.emptyMap())
-                .getOrDefault(hotkey, Collections.emptyList());
-        catchScript("SCRIPT_ERROR_GLOBAL", player, () -> hotkeys.forEach(luaFunction -> luaFunction.call(LuaValue.valueOf(pressed))));
+        catchScript("SCRIPT_ERROR_GLOBAL", player, () -> HOTKEY_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(hotkey, Collections.emptyList()).forEach(luaFunction -> luaFunction.call(LuaValue.valueOf(pressed))));
     }
 
     public static void catchScript(String errorMsg, Player player, Runnable run) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java

@@ -21,24 +21,44 @@ package de.steamwar.bausystem.features.script.event;
 
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 @Linked
 public class CommandListener implements Listener {
 
+    private Map<Player, Set<String>> calledCommands = new HashMap<>();
+
     @EventHandler
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
         if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         String[] split = event.getMessage().split(" ");
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
-        if (scriptData.getCalledCommands().contains(split[0])) return;
+        if (calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).contains(split[0])) {
+            return;
+        }
 
-        scriptData.getCalledCommands().add(split[0]);
+        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).add(split[0]);
         event.setCancelled(ScriptRunner.callCommand(event.getPlayer(), split[0].substring(1), split));
-        scriptData.getCalledCommands().remove(split[0]);
+        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).remove(split[0]);
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        calledCommands.put(event.getPlayer(), new HashSet<>());
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        calledCommands.remove(event.getPlayer());
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java

@@ -25,7 +25,6 @@ import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
@@ -44,27 +43,32 @@ import org.bukkit.event.player.*;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 @Linked
 public class EventListener implements Listener {
 
+    private static final Map<Player, Long> LAST_FS = new HashMap<>();
+
     static {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             long millis = System.currentTimeMillis();
-            SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
-                    .filter(pair -> millis - pair.getValue().getLastF() > 200)
-                    .forEach(pair -> pair.getValue().setLastF(Long.MAX_VALUE));
+            LAST_FS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
         }, 1, 1);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfJoin, LuaValue.NIL, event);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerQuit(PlayerQuitEvent event) {
-        if (Permission.BUILD.hasPermission(event.getPlayer())) {
+        if(Permission.BUILD.hasPermission(event.getPlayer())) {
             ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfLeave, LuaValue.NIL, event);
         }
         StorageLib.removePlayer(event.getPlayer());
@@ -72,20 +76,19 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
-        if (scriptData.getLastF() != Long.MAX_VALUE) {
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (LAST_FS.containsKey(event.getPlayer())) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DoubleSwap, LuaValue.NIL, event);
             }, 1);
         } else {
-            scriptData.setLastF(System.currentTimeMillis());
+            LAST_FS.put(event.getPlayer(), System.currentTimeMillis());
         }
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         LuaTable table = new LuaTable();
         table.set("x", event.getBlock().getX());
         table.set("y", event.getBlock().getY());
@@ -96,7 +99,7 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockBreak(BlockBreakEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         LuaTable table = new LuaTable();
         table.set("x", event.getBlock().getX());
         table.set("y", event.getBlock().getY());
@@ -105,12 +108,12 @@ public class EventListener implements Listener {
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.BreakBlock, table, event);
     }
 
+    private final Set<Player> ignore = new HashSet<>();
+
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
-        if (scriptData.isIgnore()) {
-            scriptData.setIgnore(false);
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (ignore.remove(event.getPlayer())) {
             return;
         }
         LuaTable table = new LuaTable();
@@ -121,7 +124,7 @@ public class EventListener implements Listener {
             table.set("hand", event.getHand().name());
         }
         table.set("block", event.getItem() == null ? Material.AIR.name() : event.getItem().getType().name());
-        if (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK) {
+        if(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK) {
             table.set("hasBlock", LuaValue.valueOf(true));
             table.set("blockX", event.getClickedBlock().getX());
             table.set("blockY", event.getClickedBlock().getY());
@@ -147,7 +150,7 @@ public class EventListener implements Listener {
         Region tntRegion = Region.getRegion(event.getLocation());
 
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if (!Permission.BUILD.hasPermission(player)) continue;
+            if(!Permission.BUILD.hasPermission(player)) continue;
             if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTSpawn, LuaValue.NIL, event);
             }
@@ -169,7 +172,7 @@ public class EventListener implements Listener {
         boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.getBuildArea().inRegion(block.getLocation(), true));
 
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if (!Permission.BUILD.hasPermission(player)) continue;
+            if(!Permission.BUILD.hasPermission(player)) continue;
             if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplode, table, event);
                 if (inBuild) {
@@ -181,9 +184,8 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
-        scriptData.setIgnore(true);
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ignore.add(event.getPlayer());
         LuaTable table = new LuaTable();
         table.set("type", event.getItemDrop().getItemStack().getType().name());
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DropItem, table, event);
@@ -192,7 +194,7 @@ public class EventListener implements Listener {
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDeath(EntityDeathEvent event) {
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if (!Permission.BUILD.hasPermission(player)) continue;
+            if(!Permission.BUILD.hasPermission(player)) continue;
             LuaTable table = new LuaTable();
             table.set("type", event.getEntityType().name());
             ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.EntityDeath, table, event);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java

@@ -48,7 +48,6 @@ import java.util.logging.Level;
 public class SteamWarLuaPlugin extends TwoArgFunction {
 
     private static final boolean hasFAWE = Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null;
-    private static final Set<String> ignoreCommandFromWorldEdit = Set.of("select", "schem", "/schem", "schematic", "/schematic");
 
     protected static final Map<Class<?>, List<LuaLib>> LUA_LIBS = new HashMap<>();
 
@@ -117,7 +116,7 @@ public class SteamWarLuaPlugin extends TwoArgFunction {
                 command = preprocessEvent.getMessage().substring(1);
                 Bukkit.getLogger().log(Level.INFO, player.getName() + " dispatched command: " + command);
                 String[] commandSplit = command.split(" ");
-                if (!ignoreCommandFromWorldEdit.contains(commandSplit[0]) && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
+                if (!commandSplit[0].equals("select") && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
                     EditSession editSession = WorldEditUtils.getEditSession(player);
                     Actor actor = BukkitAdapter.adapt(player);
                     WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().handleCommandOnCurrentThread(new CommandEvent(actor, command, editSession));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java

@@ -89,7 +89,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
                 jsonObject.keySet().forEach(key -> {
                     map.put(key, fromJson(jsonObject.get(key)));
                 });
-                SteamwarUser steamwarUser = SteamwarUser.byId(Integer.parseInt(playerStorage.getName().substring(0, playerStorage.getName().length() - ".json".length())));
+                SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(playerStorage.getName().substring(0, playerStorage.getName().length() - ".json".length())));
                 PLAYER_STORAGE.put(steamwarUser.getUUID(), map);
             } catch (Exception e) {}
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java

@@ -1,20 +1,18 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator;
@@ -22,7 +20,9 @@ package de.steamwar.bausystem.features.simulator;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.display.SimulatorCursor;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
+import de.steamwar.bausystem.features.simulator.SimulatorCursorManager;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -40,7 +40,7 @@ import java.util.Collection;
 public class SimulatorCommand extends SWCommand {
 
     @LinkedInstance
-    public SimulatorCursor simulatorCursor;
+    public SimulatorCursorManager cursorManager;
 
     public SimulatorCommand() {
         super("sim", "simulator");
@@ -49,12 +49,12 @@ public class SimulatorCommand extends SWCommand {
     @Register(description = "SIMULATOR_HELP")
     public void genericCommand(@Validator Player p) {
         SWUtils.giveItemToPlayer(p, SimulatorStorage.getWand(p));
-        simulatorCursor.calcCursor(p);
+        cursorManager.showCursor(p, null);
     }
 
     @Register(value = "change", description = "SIMULATOR_CHANGE_HELP")
     public void change(@Validator Player p) {
-        if (!SimulatorCursor.isSimulatorItem(p.getInventory().getItemInMainHand()) && !SimulatorCursor.isSimulatorItem(p.getInventory().getItemInOffHand())) {
+        if (!SimulatorUtils.isSimulatorItem(p.getInventory().getItemInMainHand()) && !SimulatorUtils.isSimulatorItem(p.getInventory().getItemInOffHand())) {
             BauSystem.MESSAGE.send("SIMULATOR_NO_SIM_IN_HAND", p);
             return;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java

@@ -1,472 +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.simulator;
-
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.Reflection;
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
-import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
-import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
-import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
-import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
-import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
-import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
-import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui;
-import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
-import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
-import de.steamwar.bausystem.utils.ItemUtils;
-import de.steamwar.bausystem.utils.RayTraceUtils;
-import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RFallingBlockEntity;
-import de.steamwar.inventory.SWAnvilInv;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.*;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.Vector;
-
-import java.util.*;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-@Linked
-@MinVersion(19)
-public class SimulatorCursor implements Listener {
-
-    private static final World WORLD = Bukkit.getWorlds().get(0);
-    private Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
-    private Class<?> look = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot");
-    private Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
-
-    private static Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
-    private static Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
-    private static final Set<Player> calculating = new HashSet<>();
-
-    public static boolean isSimulatorItem(ItemStack itemStack) {
-        return ItemUtils.isItem(itemStack, "simulator");
-    }
-
-    public SimulatorCursor() {
-        BiFunction<Player, Object, Object> function = (player, object) -> {
-            calcCursor(player);
-            return object;
-        };
-        TinyProtocol.instance.addFilter(position, function);
-        TinyProtocol.instance.addFilter(look, function);
-        TinyProtocol.instance.addFilter(positionLook, function);
-    }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-            calcCursor(event.getPlayer());
-        }, 0);
-    }
-
-    @EventHandler
-    public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        calcCursor(event.getPlayer());
-    }
-
-    @EventHandler
-    public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-            calcCursor(event.getPlayer());
-        }, 1);
-    }
-
-    @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getChanged().forEach(SimulatorCursor::calcCursor);
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        cursorType.remove(event.getPlayer());
-        cursors.remove(event.getPlayer());
-        synchronized (calculating) {
-            calculating.remove(event.getPlayer());
-        }
-    }
-
-    private static final Map<Player, Long> LAST_SNEAKS = new HashMap<>();
-
-    static {
-        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-            long millis = System.currentTimeMillis();
-            LAST_SNEAKS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
-        }, 1, 1);
-    }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
-        if (!event.isSneaking()) return;
-        Player player = event.getPlayer();
-        if (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand())) {
-            return;
-        }
-        if (LAST_SNEAKS.containsKey(player)) {
-            CursorType currentType = cursorType.getOrDefault(player, CursorType.TNT);
-            if (currentType == CursorType.TNT) {
-                cursorType.put(player, CursorType.REDSTONE_BLOCK);
-            } else {
-                cursorType.put(player, CursorType.TNT);
-            }
-            calcCursor(player);
-        } else {
-            LAST_SNEAKS.put(player, System.currentTimeMillis());
-        }
-    }
-
-    public static CursorType getCursorType(Player player) {
-        return cursorType.getOrDefault(player, CursorType.TNT);
-    }
-
-    public static void setCursorType(Player player, CursorType cursorType) {
-        SimulatorCursor.cursorType.put(player, cursorType);
-        calcCursor(player);
-    }
-
-    public static void calcCursor(Player player) {
-        synchronized (calculating) {
-            if (calculating.contains(player)) return;
-            calculating.add(player);
-        }
-        if (!Permission.BUILD.hasPermission(player) || (!isSimulatorItem(player.getInventory().getItemInMainHand()) && !isSimulatorItem(player.getInventory().getItemInOffHand()))) {
-            if (removeCursor(player) || SimulatorWatcher.show(null, player)) {
-                SWUtils.sendToActionbar(player, "");
-            }
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
-            return;
-        }
-
-        Simulator simulator = SimulatorStorage.getSimulator(player);
-        if (simulator != null && simulator.getStabGenerator() != null) {
-            removeCursor(player);
-            SimulatorWatcher.show(null, player);
-            SWUtils.sendToActionbar(player, "§cGenerating Stab");
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
-            return;
-        }
-
-        SimulatorWatcher.show(simulator, player);
-        List<REntity> entities = SimulatorWatcher.getEntitiesOfSimulator(simulator);
-        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), entities);
-        if (rayTraceResult == null) {
-            removeCursor(player);
-            if (simulator == null) {
-                SWUtils.sendToActionbar(player, "§eSelect Simulator");
-            } else {
-                SWUtils.sendToActionbar(player, "§eOpen Simulator");
-            }
-            synchronized (calculating) {
-                calculating.remove(player);
-            }
-            return;
-        }
-
-        showCursor(player, rayTraceResult, simulator != null);
-        synchronized (calculating) {
-            calculating.remove(player);
-        }
-    }
-
-    private static synchronized boolean removeCursor(Player player) {
-        REntityServer entityServer = cursors.get(player);
-        boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
-        if (entityServer != null) {
-            entityServer.getEntities().forEach(REntity::die);
-        }
-        return hadCursor;
-    }
-
-    private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
-        REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
-            REntityServer rEntityServer = new REntityServer();
-            rEntityServer.addPlayer(player);
-            return rEntityServer;
-        });
-
-        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
-        REntity hitEntity = rayTraceResult.getHitEntity();
-        Location location = hitEntity != null ? new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()).toLocation(WORLD) :
-                type.position.apply(player, rayTraceResult).toLocation(WORLD);
-
-        Material material = hitEntity != null ? Material.GLASS : type.getMaterial();
-        List<RFallingBlockEntity> entities = entityServer.getEntitiesByType(RFallingBlockEntity.class);
-        entities.removeIf(rFallingBlockEntity -> {
-            if (rFallingBlockEntity.getMaterial() != material) {
-                rFallingBlockEntity.die();
-                return true;
-            }
-            rFallingBlockEntity.move(location);
-            return false;
-        });
-        if (entities.isEmpty()) {
-            RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(entityServer, location, material);
-            rFallingBlockEntity.setNoGravity(true);
-            if (material == Material.GLASS) {
-                rFallingBlockEntity.setGlowing(true);
-            }
-        }
-
-        if (hasSimulatorSelected) {
-            if (hitEntity != null) {
-                SWUtils.sendToActionbar(player, "§eEdit Position");
-            } else {
-                SWUtils.sendToActionbar(player, "§eAdd new " + type.name);
-            }
-        } else {
-            SWUtils.sendToActionbar(player, "§eCreate new Simulator");
-        }
-    }
-
-    public static Vector getPosFree(Player player, RayTraceUtils.RRayTraceResult result) {
-        Vector pos = result.getHitPosition();
-
-        BlockFace face = result.getHitBlockFace();
-        if (face != null) {
-            switch (face) {
-                case DOWN:
-                    pos.setY(pos.getY() - 0.98);
-                    break;
-                case EAST:
-                    pos.setX(pos.getX() + 0.49);
-                    break;
-                case WEST:
-                    pos.setX(pos.getX() - 0.49);
-                    break;
-                case NORTH:
-                    pos.setZ(pos.getZ() - 0.49);
-                    break;
-                case SOUTH:
-                    pos.setZ(pos.getZ() + 0.49);
-                    break;
-                default:
-                    break;
-            }
-
-            if (face.getModY() == 0 && player.isSneaking()) {
-                pos.setY(pos.getY() - 0.49);
-            }
-        }
-
-        if (!player.isSneaking()) {
-            pos.setX(pos.getBlockX() + 0.5);
-            if (face == null || face.getModY() == 0)
-                pos.setY(pos.getBlockY() + 0.0);
-            pos.setZ(pos.getBlockZ() + 0.5);
-        }
-
-        return pos;
-    }
-
-    private static Vector getPosBlockAligned(Player player, RayTraceUtils.RRayTraceResult result) {
-        Vector pos = result.getHitPosition();
-
-        BlockFace face = result.getHitBlockFace();
-        if (face != null) {
-            switch (face) {
-                case DOWN:
-                    pos.setY(pos.getY() - 0.98);
-                    break;
-                case EAST:
-                    pos.setX(pos.getX() + 0.49);
-                    break;
-                case WEST:
-                    pos.setX(pos.getX() - 0.49);
-                    break;
-                case NORTH:
-                    pos.setZ(pos.getZ() - 0.49);
-                    break;
-                case SOUTH:
-                    pos.setZ(pos.getZ() + 0.49);
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        pos.setX(pos.getBlockX() + 0.5);
-        if (pos.getY() - pos.getBlockY() != 0 && face == BlockFace.UP) {
-            pos.setY(pos.getBlockY() + 1.0);
-        } else {
-            pos.setY(pos.getBlockY());
-        }
-        pos.setZ(pos.getBlockZ() + 0.5);
-        return pos;
-    }
-
-    @Getter
-    @AllArgsConstructor
-    public enum CursorType {
-        TNT(Material.TNT, Material.GUNPOWDER, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
-        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
-        OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
-        ;
-
-        public final Material material;
-        public final Material nonSelectedMaterial;
-        public final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
-        public final String name;
-        public final Function<Vector, SimulatorElement<?>> elementFunction;
-    }
-
-    @EventHandler
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!ItemUtils.isItem(event.getItem(), "simulator")) {
-            return;
-        }
-
-        event.setCancelled(true);
-        Player player = event.getPlayer();
-        Simulator simulator = SimulatorStorage.getSimulator(player);
-
-        if (event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_AIR) {
-            if (simulator == null) {
-                return;
-            }
-            SimulatorExecutor.run(event.getPlayer(), simulator, null);
-            return;
-        }
-
-        if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {
-            return;
-        }
-
-
-        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), SimulatorWatcher.getEntitiesOfSimulator(simulator));
-        if (simulator == null) {
-            if (rayTraceResult == null) {
-                SimulatorStorage.openSimulatorSelector(player);
-            } else {
-                SWAnvilInv anvilInv = new SWAnvilInv(player, "Name");
-                anvilInv.setCallback(s -> {
-                    Simulator sim = SimulatorStorage.getSimulator(s);
-                    if (sim != null) {
-                        BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", player);
-                        return;
-                    }
-                    if (!s.matches("[a-zA-Z_0-9-]+")) {
-                        BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", player);
-                        return;
-                    }
-                    sim = new Simulator(s);
-                    SimulatorStorage.addSimulator(s, sim);
-                    createElement(player, rayTraceResult, sim);
-                    SimulatorStorage.setSimulator(player, sim);
-                });
-                anvilInv.open();
-            }
-            return;
-        }
-
-        if (rayTraceResult == null) {
-            new SimulatorGui(player, simulator).open();
-            return;
-        }
-
-        if (rayTraceResult.getHitEntity() != null) {
-            REntity hitEntity = rayTraceResult.getHitEntity();
-            Vector vector = new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ());
-            List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream).filter(element -> {
-                return element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0);
-            }).collect(Collectors.toList());
-
-            switch (elements.size()) {
-                case 0:
-                    return;
-                case 1:
-                    // Open single element present in Simulator
-                    SimulatorElement<?> element = elements.get(0);
-                    SimulatorGroup group1 = element.getGroup(simulator);
-                    SimulatorBaseGui back = new SimulatorGui(player, simulator);
-                    if (group1.getElements().size() > 1) {
-                        back = new SimulatorGroupGui(player, simulator, group1, back);
-                    }
-                    element.open(player, simulator, group1, back);
-                    break;
-                default:
-                    List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().collect(Collectors.toList());
-                    if (parents.size() == 1) {
-                        // Open multi element present in Simulator in existing group
-                        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-                        new SimulatorGroupGui(player, simulator, parents.get(0), simulatorGui).open();
-                    } else {
-                        // Open multi element present in Simulator in implicit group
-                        SimulatorGroup group2 = new SimulatorGroup();
-                        group2.setMaterial(null);
-                        group2.getElements().addAll(elements);
-                        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-                        new SimulatorGroupGui(player, simulator, group2, simulatorGui).open();
-                    }
-                    break;
-            }
-            return;
-        }
-
-        // Add new Element to current simulator
-        createElement(player, rayTraceResult, simulator);
-    }
-
-    private void createElement(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, Simulator simulator) {
-        CursorType type = cursorType.getOrDefault(player, CursorType.TNT);
-        Vector vector = type.position.apply(player, rayTraceResult);
-        if (type == CursorType.REDSTONE_BLOCK) {
-            vector.subtract(new Vector(0.5, 0, 0.5));
-        }
-        SimulatorElement<?> element = type.elementFunction.apply(vector);
-        SimulatorGroup group = new SimulatorGroup().add(element);
-        simulator.getGroups().add(group);
-        SimulatorGui simulatorGui = new SimulatorGui(player, simulator);
-        element.open(player, simulator, group, simulatorGui);
-        SimulatorWatcher.update(simulator);
-        calcCursor(player);
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursorManager.java

@@ -0,0 +1,103 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2023 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.simulator;
+
+
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.display.ASimulatorCursor;
+import de.steamwar.bausystem.features.simulator.display.EmptySimulatorCursor;
+import de.steamwar.bausystem.features.simulator.display.SimulatorCursor;
+import de.steamwar.bausystem.features.simulator.display.SimulatorCursorMode;
+
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import org.bukkit.event.Listener;
+
+import org.bukkit.event.player.*;
+import org.bukkit.inventory.ItemStack;
+import java.util.*;
+
+// TODO fix memory leak when players leave the server
+// TODO fix cursor not being hidden when player deequips simulator item
+
+@Linked
+@MinVersion(19)
+public class SimulatorCursorManager implements Listener {
+    public static final SimulatorCursorManager INSTANCE = new SimulatorCursorManager();
+
+    private final Map<Player, Map<Simulator, ASimulatorCursor>> openCursorsByPlayerBySimulator = new HashMap<>();
+    private final Map<Player, ASimulatorCursor> activeCursorByPlayer = new HashMap<>();
+
+    @EventHandler
+    public void onPlayerItemEquip(PlayerItemHeldEvent event) {
+        ItemStack newItem = event.getPlayer().getInventory().getItem(event.getNewSlot());
+        if (SimulatorUtils.isSimulatorItem(newItem)) {
+            Simulator simulator = SimulatorStorage.getSimulator(newItem);
+            showCursor(event.getPlayer(), simulator);
+        }
+    }
+
+    /**
+     * Shows the cursor for the given simulator to the given player. Shows an empty cursor if the
+     * simulator is null.
+     */
+    public void showCursor(Player player, Simulator simulator) {
+        var currentActiveCursor = activeCursorByPlayer.get(player);
+        if (currentActiveCursor != null) {
+            currentActiveCursor.hide();
+        }
+
+        var cursorMode = currentActiveCursor != null ? currentActiveCursor.getCursorMode() : SimulatorCursorMode.TNT;
+
+        var cursorsBySimulator = openCursorsByPlayerBySimulator.computeIfAbsent(player, __ -> new HashMap<>());
+        var cursor = cursorsBySimulator.get(simulator);
+        if (cursor == null) {
+            if (simulator == null) {
+                ASimulatorCursor emptyCursor = new EmptySimulatorCursor(player, cursorMode);
+                cursorsBySimulator.put(simulator, emptyCursor);
+                cursor = emptyCursor;
+            } else {
+                ASimulatorCursor newCursor = new SimulatorCursor(simulator, player, cursorMode);
+                cursorsBySimulator.put(simulator, newCursor);
+                cursor = newCursor;
+            }
+        }
+
+        cursor.show();
+    }
+
+    public Optional<SimulatorCursorMode> getActiveCursorMode(Player player) {
+        var currentActiveCursor = activeCursorByPlayer.get(player);
+        if (currentActiveCursor != null) {
+            return Optional.of(currentActiveCursor.getCursorMode());
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    public void setActiveCursorMode(Player player, SimulatorCursorMode mode) {
+        var currentActiveCursor = activeCursorByPlayer.get(player);
+        if (currentActiveCursor != null) {
+            currentActiveCursor.setCursorMode(mode);
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java

@@ -1,20 +1,18 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator;
@@ -56,12 +54,13 @@ public class SimulatorStorage implements Enable {
 
     public static Simulator getSimulator(Player player) {
         Simulator simulator = getSimulator(player.getInventory().getItemInMainHand());
-        if (simulator != null) return simulator;
+        if (simulator != null)
+            return simulator;
         return getSimulator(player.getInventory().getItemInOffHand());
     }
 
     public static Simulator getSimulator(ItemStack itemStack) {
-        if (!SimulatorCursor.isSimulatorItem(itemStack)) {
+        if (!SimulatorUtils.isSimulatorItem(itemStack)) {
             return null;
         }
         String selection = ItemUtils.getTag(itemStack, simulatorSelection);
@@ -86,11 +85,11 @@ public class SimulatorStorage implements Enable {
         YAPIONFormatSimulatorLoader yapionFormatSimulatorLoader = new YAPIONFormatSimulatorLoader();
 
         File[] files = simulatorsDir.listFiles();
-        if (files == null) return;
+        if (files == null)
+            return;
         for (File file : files) {
             try {
-                List<Simulator> simulators = simFormatSimulatorLoader.load(file)
-                        .orElse(null);
+                List<Simulator> simulators = simFormatSimulatorLoader.load(file).orElse(null);
                 if (simulators != null) {
                     simulators.forEach(simulator -> {
                         simulatorMap.put(simulator.getName(), simulator);
@@ -102,8 +101,7 @@ public class SimulatorStorage implements Enable {
             }
 
             try {
-                List<Simulator> simulators = simulatorFormatSimulatorLoader.load(file)
-                        .orElse(null);
+                List<Simulator> simulators = simulatorFormatSimulatorLoader.load(file).orElse(null);
                 if (simulators != null) {
                     simulators.forEach(simulator -> {
                         simulatorMap.put(simulator.getName(), simulator);
@@ -116,8 +114,7 @@ public class SimulatorStorage implements Enable {
             }
 
             try {
-                List<Simulator> simulators = yapionFormatSimulatorLoader.load(file)
-                        .orElse(null);
+                List<Simulator> simulators = yapionFormatSimulatorLoader.load(file).orElse(null);
                 if (simulators != null) {
                     simulators.forEach(simulator -> {
                         simulatorMap.put(simulator.getName(), simulator);
@@ -131,7 +128,8 @@ public class SimulatorStorage implements Enable {
     }
 
     public static void openSimulatorSelector(Player player) {
-        SimulatorPageGui<Simulator> simulatorPageGui = new SimulatorPageGui<Simulator>(player, null, 6 * 9, simulatorMap.values().stream().sorted(Comparator.comparing(Simulator::getName)).collect(Collectors.toList())) {
+        SimulatorPageGui<Simulator> simulatorPageGui = new SimulatorPageGui<Simulator>(player, null, 6 * 9,
+                simulatorMap.values().stream().sorted(Comparator.comparing(Simulator::getName)).collect(Collectors.toList())) {
             @Override
             public String baseTitle() {
                 return "Simulators";
@@ -171,7 +169,11 @@ public class SimulatorStorage implements Enable {
     }
 
     public static ItemStack getWand(Player p) {
-        ItemStack itemStack = new SWItem(Material.BLAZE_ROD, BauSystem.MESSAGE.parse("SIMULATOR_WAND_NAME", p), Arrays.asList(BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_1", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_2", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_3", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_4", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_5", p)), false, null).getItemStack();
+        ItemStack itemStack = new SWItem(Material.BLAZE_ROD, BauSystem.MESSAGE.parse("SIMULATOR_WAND_NAME", p),
+                Arrays.asList(BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_1", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_2", p),
+                        BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_3", p), BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_4", p),
+                        BauSystem.MESSAGE.parse("SIMULATOR_WAND_LORE_5", p)),
+                false, null).getItemStack();
         ItemMeta itemMeta = itemStack.getItemMeta();
         itemMeta.setCustomModelData(1);
         itemStack.setItemMeta(itemMeta);
@@ -183,9 +185,9 @@ public class SimulatorStorage implements Enable {
         ItemStack mainHand = player.getInventory().getItemInMainHand();
         ItemStack offHand = player.getInventory().getItemInOffHand();
         ItemStack itemStack;
-        if (SimulatorCursor.isSimulatorItem(mainHand)) {
+        if (SimulatorUtils.isSimulatorItem(mainHand)) {
             itemStack = mainHand;
-        } else if (SimulatorCursor.isSimulatorItem(offHand)) {
+        } else if (SimulatorUtils.isSimulatorItem(offHand)) {
             itemStack = offHand;
         } else {
             itemStack = null;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorUtils.java

@@ -0,0 +1,12 @@
+package de.steamwar.bausystem.features.simulator;
+
+import org.bukkit.inventory.ItemStack;
+import de.steamwar.bausystem.utils.ItemUtils;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class SimulatorUtils {
+  public static boolean isSimulatorItem(ItemStack itemStack) {
+    return ItemUtils.isItem(itemStack, "simulator");
+  }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java

@@ -1,129 +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.simulator;
-
-import de.steamwar.bausystem.features.simulator.data.Simulator;
-import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
-import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
-import de.steamwar.bausystem.features.simulator.storage.SimulatorSaver;
-import de.steamwar.bausystem.shared.Pair;
-import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RFallingBlockEntity;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
-import lombok.experimental.UtilityClass;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.util.Vector;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-
-@UtilityClass
-public class SimulatorWatcher {
-
-    private final World WORLD = Bukkit.getWorlds().get(0);
-    private Map<Simulator, REntityServer> entityServers = new HashMap<>();
-    private Map<Player, Pair<Simulator, Runnable>> watchers = new HashMap<>();
-
-    public void watch(Player player, Simulator simulator, Runnable watcher) {
-        if (simulator == null || watcher == null) {
-            watchers.remove(player);
-        } else {
-            watchers.put(player, new Pair<>(simulator, watcher));
-        }
-    }
-
-    public synchronized void update(Simulator simulator) {
-        REntityServer rEntityServer = entityServers.get(simulator);
-        if (rEntityServer != null) {
-            rEntityServer.getEntities().forEach(REntity::die);
-            createSim(rEntityServer, simulator);
-        }
-
-        new ArrayList<>(watchers.values()).forEach(simulatorRunnablePair -> {
-            if (simulatorRunnablePair.getKey() == simulator) {
-                simulatorRunnablePair.getValue().run();
-            }
-        });
-        SimulatorSaver.saveSimulator(SimulatorStorage.simulatorsDir, simulator);
-    }
-
-    @Linked
-    @MinVersion(19)
-    public static class QuitListener implements Listener {
-
-        @EventHandler
-        public void onPlayerQuit(PlayerQuitEvent event) {
-            watchers.remove(event.getPlayer());
-            show(null, event.getPlayer());
-        }
-    }
-
-    private REntityServer createSim(REntityServer server, Simulator simulator) {
-        if (simulator == null) {
-            return null;
-        }
-        Map<Vector, Set<Class<?>>> positionCache = new HashMap<>();
-        simulator.getGroups().stream().map(group -> group.getElements().stream().map(element -> new Pair<>(group, element)).collect(Collectors.toList())).flatMap(List::stream).forEach(pair -> {
-            SimulatorGroup group = pair.getKey();
-            SimulatorElement<?> element = pair.getValue();
-
-            boolean wasNotPresent = positionCache.computeIfAbsent(element.getPosition(), __ -> new HashSet<>())
-                    .add(element.getClass());
-            if (!wasNotPresent) return;
-            Material material = group.isDisabled() || element.isDisabled() ? element.getWorldDisabledMaterial() : element.getWorldMaterial();
-            Location location = element.getWorldPos().toLocation(WORLD);
-            RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(server, location, material);
-            rFallingBlockEntity.setNoGravity(true);
-        });
-        return server;
-    }
-
-    public synchronized boolean show(Simulator sim, Player player) {
-        AtomicBoolean removed = new AtomicBoolean();
-        entityServers.forEach((simulator, rEntityServer) -> {
-            if (rEntityServer == null) return;
-            if (rEntityServer.getPlayers().contains(player) && sim != simulator) {
-                rEntityServer.removePlayer(player);
-                removed.set(true);
-            }
-        });
-        if (sim == null) return removed.get();
-        entityServers.computeIfAbsent(sim, __ -> createSim(new REntityServer(), sim)).addPlayer(player);
-        return removed.get();
-    }
-
-    synchronized List<REntity> getEntitiesOfSimulator(Simulator simulator) {
-        REntityServer entityServer = entityServers.get(simulator);
-        if (entityServer == null) {
-            return Collections.emptyList();
-        }
-        return entityServer.getEntities();
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/display/ASimulatorCursor.java

@@ -0,0 +1,54 @@
+package de.steamwar.bausystem.features.simulator.display;
+
+import java.util.List;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
+import de.steamwar.bausystem.utils.cursor.Cursor;
+import de.steamwar.entity.REntityServer;
+import lombok.Getter;
+
+public abstract class ASimulatorCursor extends Cursor implements Listener {
+  protected final Player owner;
+
+  @Getter
+  protected SimulatorCursorMode cursorMode;
+
+  protected ASimulatorCursor(Player owner, REntityServer targetServer, SimulatorCursorMode cursorMode) {
+    super(targetServer, owner, Material.GLASS, Material.TNT, List.of(Cursor.CursorMode.FREE, Cursor.CursorMode.BLOCK_ALIGNED));
+    this.cursorMode = cursorMode;
+    this.owner = owner;
+  }
+
+  public void swapCursorMode() {
+    cursorMode = cursorMode.switchType();
+    setCursorMaterial(cursorMode.getMaterial());
+    setAllowedCursorModes(cursorMode.getAllowedCursorModes());
+  }
+
+  public void setCursorMode(SimulatorCursorMode mode) {
+    this.cursorMode = mode;
+    setCursorMaterial(cursorMode.getMaterial());
+    setAllowedCursorModes(cursorMode.getAllowedCursorModes());
+  }
+
+  public void hide() {
+    super.hide();
+    super.getTargetServer().removePlayer(owner);
+  }
+
+  public void show() {
+    super.show();
+    super.getTargetServer().addPlayer(owner);
+  }
+
+  @EventHandler
+  public void onPlayerShift(PlayerToggleSneakEvent event) {
+    if (event.getPlayer() != owner) {
+      return;
+    }
+    swapCursorMode();
+  }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/display/EmptySimulatorCursor.java

@@ -0,0 +1,47 @@
+package de.steamwar.bausystem.features.simulator.display;
+
+import java.util.Optional;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.Action;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.simulator.SimulatorStorage;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
+import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.inventory.SWAnvilInv;
+
+public class EmptySimulatorCursor extends ASimulatorCursor {
+  public EmptySimulatorCursor(Player owner, SimulatorCursorMode cursorMode) {
+    super(owner, new REntityServer(), cursorMode);
+  }
+
+  @Override
+  public void onClick(Optional<Location> clickedLocation, boolean clickedOnEntity, Action clickAction) {
+    if (clickAction == Action.RIGHT_CLICK_AIR) {
+      SimulatorStorage.openSimulatorSelector(owner);
+    } else if (clickAction == Action.RIGHT_CLICK_BLOCK) {
+      SWAnvilInv anvilInv = new SWAnvilInv(owner, "Name");
+      anvilInv.setCallback(name -> {
+        Simulator sim = SimulatorStorage.getSimulator(name);
+        if (sim != null) {
+          BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", owner);
+          return;
+        }
+        if (!name.matches("[a-zA-Z_0-9-]+")) {
+          BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", owner);
+          return;
+        }
+        sim = new Simulator(name);
+        SimulatorStorage.addSimulator(name, sim);
+        SimulatorElement<?> element = cursorMode.getElementFunction().apply(clickedLocation.get().toVector());
+        SimulatorGroup group = new SimulatorGroup();
+        group.add(element);
+        sim.add(group);
+        SimulatorStorage.setSimulator(owner, sim);
+      });
+      anvilInv.open();
+    }
+  }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/display/SimulatorCursor.java

@@ -0,0 +1,69 @@
+package de.steamwar.bausystem.features.simulator.display;
+
+import java.util.List;
+import java.util.Optional;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.Action;
+import org.bukkit.util.Vector;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
+import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
+import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui;
+import de.steamwar.bausystem.features.simulator.gui.SimulatorGui;
+import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+
+public class SimulatorCursor extends ASimulatorCursor {
+  private final Simulator simulator;
+
+  public SimulatorCursor(Simulator simulator, Player owner, SimulatorCursorMode cursorMode) {
+    super(owner, SimulatorRenderer.renderSimulator(simulator), cursorMode);
+
+    this.simulator = simulator;
+  }
+
+
+  @Override
+  public void onClick(Optional<Location> clickedLocation, boolean clickedOnEntity, Action clickAction) {
+    if (clickAction == Action.LEFT_CLICK_AIR || clickAction == Action.LEFT_CLICK_BLOCK) {
+      SimulatorExecutor.run(owner, simulator, null);
+    } else if (!clickedOnEntity || clickedLocation.isEmpty()) {
+      new SimulatorGui(owner, simulator);
+    } else {
+      Vector vector = clickedLocation.get().toVector();
+      List<SimulatorElement<?>> elements = simulator.getGroups().stream().map(SimulatorGroup::getElements).flatMap(List::stream)
+          .filter(element -> element.getWorldPos().distanceSquared(vector) < (1 / 16.0) * (1 / 16.0)).toList();
+
+      switch (elements.size()) {
+        case 0:
+          return;
+        case 1:
+          // Open single element present in Simulator
+          SimulatorElement<?> element = elements.get(0);
+          SimulatorGroup group1 = element.getGroup(simulator);
+          SimulatorBaseGui back = new SimulatorGui(owner, simulator);
+          if (group1.getElements().size() > 1) {
+            back = new SimulatorGroupGui(owner, simulator, group1, back);
+          }
+          element.open(owner, simulator, group1, back);
+          break;
+        default:
+          List<SimulatorGroup> parents = elements.stream().map(e -> e.getGroup(simulator)).distinct().toList();
+          if (parents.size() == 1) {
+            // Open multi element present in Simulator in existing group
+            SimulatorGui simulatorGui = new SimulatorGui(owner, simulator);
+            new SimulatorGroupGui(owner, simulator, parents.get(0), simulatorGui).open();
+          } else {
+            // Open multi element present in Simulator in implicit group
+            SimulatorGroup group2 = new SimulatorGroup();
+            group2.setMaterial(null);
+            group2.getElements().addAll(elements);
+            SimulatorGui simulatorGui = new SimulatorGui(owner, simulator);
+            new SimulatorGroupGui(owner, simulator, group2, simulatorGui).open();
+          }
+          break;
+      }
+    }
+  }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/display/SimulatorCursorMode.java

@@ -0,0 +1,41 @@
+package de.steamwar.bausystem.features.simulator.display;
+
+import java.util.List;
+import java.util.function.Function;
+import org.bukkit.Material;
+import org.bukkit.util.Vector;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
+import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
+import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
+import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
+import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.utils.cursor.Cursor.CursorMode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum SimulatorCursorMode {
+  TNT(Material.TNT, Material.GUNPOWDER, "TNT", vector -> new TNTElement(vector).add(new TNTPhase()),
+      List.of(CursorMode.FREE, CursorMode.BLOCK_ALIGNED)), REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE_WIRE, "Redstone Block",
+          vector -> new RedstoneElement(vector).add(new RedstonePhase()), List.of(CursorMode.BLOCK_ALIGNED)), OBSERVER(Material.OBSERVER, Material.QUARTZ,
+              "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase()), List.of(CursorMode.BLOCK_ALIGNED)),;
+
+  public final Material material;
+  public final Material nonSelectedMaterial;
+  public final String name;
+  public final Function<Vector, SimulatorElement<?>> elementFunction;
+  public final List<CursorMode> allowedCursorModes;
+
+  public SimulatorCursorMode switchType() {
+    if (this == TNT) {
+      return REDSTONE_BLOCK;
+    }
+    if (this == REDSTONE_BLOCK) {
+      return OBSERVER;
+    }
+    return TNT;
+  }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/display/SimulatorRenderer.java

@@ -0,0 +1,78 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2023 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.simulator.display;
+
+import de.steamwar.bausystem.features.simulator.SimulatorStorage;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
+import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.storage.SimulatorSaver;
+import de.steamwar.bausystem.shared.Pair;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
+
+import lombok.experimental.UtilityClass;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.event.Listener;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@UtilityClass
+public class SimulatorRenderer implements Listener {
+    private final World WORLD = Bukkit.getWorlds().get(0);
+    private Map<Simulator, REntityServer> entityServers = new HashMap<>();
+
+    public synchronized void update(Simulator simulator) {
+        renderSimulator(simulator);
+
+        SimulatorSaver.saveSimulator(SimulatorStorage.simulatorsDir, simulator);
+    }
+
+    public REntityServer renderSimulator(Simulator simulator) {
+        if (simulator == null) {
+            return null;
+        }
+
+        REntityServer server = entityServers.computeIfAbsent(simulator, __ -> new REntityServer());
+
+        server.getEntities().forEach(REntity::die);
+
+        Map<Vector, Set<Class<?>>> positionCache = new HashMap<>();
+        simulator.getGroups().stream().map(group -> group.getElements().stream().map(element -> new Pair<>(group, element)).toList()).flatMap(List::stream)
+                .forEach(pair -> {
+                    SimulatorGroup group = pair.getKey();
+                    SimulatorElement<?> element = pair.getValue();
+
+                    boolean wasNotPresent = positionCache.computeIfAbsent(element.getPosition(), __ -> new HashSet<>()).add(element.getClass());
+                    if (!wasNotPresent)
+                        return;
+                    Material material = group.isDisabled() || element.isDisabled() ? element.getWorldDisabledMaterial() : element.getWorldMaterial();
+                    Location location = element.getWorldPos().toLocation(WORLD);
+                    RFallingBlockEntity rFallingBlockEntity = new RFallingBlockEntity(server, location, material);
+                    rFallingBlockEntity.setNoGravity(true);
+                });
+        return server;
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java

@@ -26,7 +26,6 @@ import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
@@ -52,7 +51,6 @@ public class StabGenerator extends StabStep implements Listener {
 
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
-        if (!(event.getEntity() instanceof TNTPrimed)) return;
         if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
             event.blockList().forEach(block -> {
                 if (!data.region.getTestblockArea().inRegion(block.getLocation(), true))

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java

@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.simulator.execute;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import org.bukkit.Bukkit;
@@ -72,7 +72,7 @@ public abstract class StabStep {
 
     protected final void stop() {
         data.simulator.setStabGenerator(null);
-        SimulatorWatcher.update(data.simulator);
+        SimulatorRenderer.update(data.simulator);
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             BauSystemBossbar bossbar = BossBarService.instance.get(player, data.region, "simulator_stab_generator");

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

@@ -1,35 +1,35 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorCursor;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.simulator.SimulatorCursorManager;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.display.SimulatorCursorMode;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-
 import java.util.Collections;
 
 public class SimulatorCursorSwitcherGui extends SimulatorBaseGui {
+    private final SimulatorCursorManager cursorManager = BauSystem.getInstance().getLinker().get(SimulatorCursorManager.class).orElseThrow();
 
     private SimulatorBaseGui back;
 
@@ -50,14 +50,12 @@ public class SimulatorCursorSwitcherGui extends SimulatorBaseGui {
         }).setCustomModelData(CMDs.BACK));
 
         int slot = 2;
-        SimulatorCursor.CursorType currentType = SimulatorCursor.getCursorType(player);
-        for (SimulatorCursor.CursorType type : SimulatorCursor.CursorType.values()) {
+        SimulatorCursorMode currentType = cursorManager.getActiveCursorMode(player).orElse(SimulatorCursorMode.TNT);
+        for (SimulatorCursorMode type : SimulatorCursorMode.values()) {
             boolean selected = type == currentType;
             SWItem swItem = new SWItem(selected ? type.material : type.nonSelectedMaterial, "§e" + type.name)
-                    .setCustomModelData(selected ? 0 : CMDs.Simulator.NEW_PHASE)
-                    .setLore(Collections.singletonList("§eClick to select"))
-                    .setCallback(click -> {
-                        SimulatorCursor.setCursorType(player, type);
+                    .setCustomModelData(selected ? 0 : CMDs.Simulator.NEW_PHASE).setLore(Collections.singletonList("§eClick to select")).setCallback(click -> {
+                        cursorManager.setActiveCursorMode(player, type);
                         player.closeInventory();
                     });
             inventory.setItem(slot, swItem);

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

@@ -1,28 +1,26 @@
 /*
- *   This file is a part of the SteamWar software.
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
 import de.steamwar.inventory.InvCallback;
@@ -38,8 +36,11 @@ public class SimulatorGroupChooserGui extends SimulatorPageGui<SimulatorGroup> {
     private final SimulatorGroup parent;
     private final SimulatorBaseGui back;
 
-    public SimulatorGroupChooserGui(Player player, Simulator simulator, SimulatorElement<?> subject, SimulatorGroup parent, SimulatorBaseGui back) {
-        super(player, simulator, 6 * 9, simulator.getGroups().stream().filter(e -> e != parent).filter(e -> subject.canBeInGroup(e)).collect(Collectors.toList()));
+    public SimulatorGroupChooserGui(Player player, Simulator simulator, SimulatorElement<?> subject,
+            SimulatorGroup parent, SimulatorBaseGui back) {
+        super(player, simulator, 6 * 9,
+                simulator.getGroups().stream().filter(e -> e != parent).filter(e -> subject.canBeInGroup(e))
+                        .collect(Collectors.toList()));
         this.subject = subject;
         this.parent = parent;
         this.back = back;
@@ -56,7 +57,7 @@ public class SimulatorGroupChooserGui extends SimulatorPageGui<SimulatorGroup> {
                 simulator.getGroups().add(newParent);
                 parent.getElements().remove(subject);
                 back.open();
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 if (parent.getElements().size() == 1) {
                     parent.setDisabled(false);
                     parent.setMaterial(Material.BARREL);
@@ -83,7 +84,7 @@ public class SimulatorGroupChooserGui extends SimulatorPageGui<SimulatorGroup> {
                 parent.setMaterial(Material.BARREL);
             }
             back.open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         };
         return simulatorGroup.toItem(player, invCallback, invCallback);
     }

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

@@ -1,28 +1,26 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
 import de.steamwar.data.CMDs;
@@ -60,7 +58,7 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
         }
 
         if (simulatorGroup.getElements().removeIf(element -> element.getPhases().isEmpty())) {
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }
         if (simulatorGroup.getElements().size() < 2) {
             back.open();
@@ -75,11 +73,12 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             simulatorGroup.getElements().clear();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DELETE));
 
         inventory.setItem(4, simulatorGroup.toItem(player, clickType -> {
-            if (simulatorGroup.getMaterial() == null) return;
+            if (simulatorGroup.getMaterial() == null)
+                return;
             new SimulatorMaterialGui(player, simulator, simulatorGroup::getMaterial, simulatorGroup::setMaterial, this).open();
         }, clickType -> {
         }));
@@ -87,17 +86,19 @@ public class SimulatorGroupGui extends SimulatorPageGui<SimulatorElement<?>> {
         inventory.setItem(48, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorGroupSettingsGui(player, simulator, simulatorGroup, this).open();
         }).setCustomModelData(CMDs.Simulator.SETTINGS));
-        boolean disabled = simulatorGroup.getMaterial() == null ? simulatorGroup.getElements().stream().allMatch(SimulatorElement::isDisabled) : simulatorGroup.isDisabled();
-        inventory.setItem(50, new SWItem(disabled ? Material.ENDER_PEARL : Material.ENDER_EYE, simulatorGroup.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
-            if (simulatorGroup.getMaterial() == null) {
-                simulatorGroup.getElements().forEach(simulatorElement -> {
-                    simulatorElement.setDisabled(!disabled);
-                });
-            } else {
-                simulatorGroup.setDisabled(!disabled);
-            }
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
+        boolean disabled = simulatorGroup.getMaterial() == null ? simulatorGroup.getElements().stream().allMatch(SimulatorElement::isDisabled)
+                : simulatorGroup.isDisabled();
+        inventory.setItem(50,
+                new SWItem(disabled ? Material.ENDER_PEARL : Material.ENDER_EYE, simulatorGroup.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
+                    if (simulatorGroup.getMaterial() == null) {
+                        simulatorGroup.getElements().forEach(simulatorElement -> {
+                            simulatorElement.setDisabled(!disabled);
+                        });
+                    } else {
+                        simulatorGroup.setDisabled(!disabled);
+                    }
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
     }
 
     @Override

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

@@ -1,28 +1,26 @@
 /*
- *   This file is a part of the SteamWar software.
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.data.CMDs;
@@ -37,7 +35,8 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
     private final SimulatorGroup simulatorGroup;
     private final SimulatorBaseGui back;
 
-    public SimulatorGroupSettingsGui(Player player, Simulator simulator, SimulatorGroup simulatorGroup, SimulatorBaseGui back) {
+    public SimulatorGroupSettingsGui(Player player, Simulator simulator, SimulatorGroup simulatorGroup,
+            SimulatorBaseGui back) {
         super(player, simulator, 5 * 9);
         this.simulatorGroup = simulatorGroup;
         this.back = back;
@@ -62,164 +61,169 @@ public class SimulatorGroupSettingsGui extends SimulatorBaseGui {
 
         // Material Chooser
         inventory.setItem(4, simulatorGroup.toItem(player, clickType -> {
-            if (simulatorGroup.getMaterial() == null) return;
-            new SimulatorMaterialGui(player, simulator, simulatorGroup::getMaterial, simulatorGroup::setMaterial, this).open();
+            if (simulatorGroup.getMaterial() == null)
+                return;
+            new SimulatorMaterialGui(player, simulator, simulatorGroup::getMaterial, simulatorGroup::setMaterial, this)
+                    .open();
         }, clickType -> {
         }));
 
         // Base Tick
         int baseTicks = simulatorGroup.getBaseTick();
-        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
+        inventory.setItem(9,
+                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+                    simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 simulatorGroup.changeBaseTicks(integer - baseTicks);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.REPEATER).open();
         });
         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 (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
-                simulatorGroup.changeBaseTicks(-baseTicks);
-            } else {
-                simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
-            }
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
+        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"),
+                false, clickType -> {
+                    if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
+                        simulatorGroup.changeBaseTicks(-baseTicks);
+                    } else {
+                        simulatorGroup.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
+                    }
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         boolean allTNT = simulatorGroup.getElements().stream().allMatch(TNTElement.class::isInstance);
 
         if (allTNT) {
             // Subpixel Alignment
             inventory.setItem(21, new SWItem(Material.SUNFLOWER, "§7Align§8: §eCenter", clickType -> {
-                simulatorGroup.getElements().stream()
-                        .map(TNTElement.class::cast)
-                        .forEach(tntElement -> {
-                            tntElement.alignX(0);
-                            tntElement.alignZ(0);
-                        });
-                SimulatorWatcher.update(simulator);
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tntElement -> {
+                    tntElement.alignX(0);
+                    tntElement.alignZ(0);
+                });
+                SimulatorRenderer.update(simulator);
             }));
 
             // Z
             SWItem negativZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> {
-                simulatorGroup.getElements().stream()
-                        .map(TNTElement.class::cast)
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getZ() != -1) tntElement.alignZ(-1);
-                        });
-                SimulatorWatcher.update(simulator);
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tntElement -> {
+                    if (tntElement.getAlignment().getZ() != -1)
+                        tntElement.alignZ(-1);
+                });
+                SimulatorRenderer.update(simulator);
             });
-            negativZItem.setEnchanted(simulatorGroup.getElements().stream()
-                    .map(TNTElement.class::cast)
-                    .allMatch(tntElement -> tntElement.getAlignment().getZ() == -1));
+            negativZItem.setEnchanted(
+                    simulatorGroup.getElements().stream().map(TNTElement.class::cast)
+                            .allMatch(tntElement -> tntElement.getAlignment().getZ() == -1));
             inventory.setItem(20, negativZItem);
 
             SWItem positivZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> {
-                simulatorGroup.getElements().stream()
-                        .map(TNTElement.class::cast)
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getZ() != 1) tntElement.alignZ(1);
-                        });
-                SimulatorWatcher.update(simulator);
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tntElement -> {
+                    if (tntElement.getAlignment().getZ() != 1)
+                        tntElement.alignZ(1);
+                });
+                SimulatorRenderer.update(simulator);
             });
-            positivZItem.setEnchanted(simulatorGroup.getElements().stream()
-                    .map(TNTElement.class::cast)
-                    .allMatch(tntElement -> tntElement.getAlignment().getZ() == 1));
+            positivZItem.setEnchanted(
+                    simulatorGroup.getElements().stream().map(TNTElement.class::cast)
+                            .allMatch(tntElement -> tntElement.getAlignment().getZ() == 1));
             inventory.setItem(22, positivZItem);
 
             // X
             SWItem negativXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> {
-                simulatorGroup.getElements().stream()
-                        .map(TNTElement.class::cast)
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getX() != -1) tntElement.alignX(-1);
-                        });
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tntElement -> {
+                    if (tntElement.getAlignment().getX() != -1)
+                        tntElement.alignX(-1);
+                });
 
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
             });
-            negativXItem.setEnchanted(simulatorGroup.getElements().stream()
-                    .map(TNTElement.class::cast)
-                    .allMatch(tntElement -> tntElement.getAlignment().getX() == -1));
+            negativXItem.setEnchanted(
+                    simulatorGroup.getElements().stream().map(TNTElement.class::cast)
+                            .allMatch(tntElement -> tntElement.getAlignment().getX() == -1));
             inventory.setItem(12, negativXItem);
 
-            SWItem positivXItem =  new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
-                simulatorGroup.getElements().stream()
-                        .map(TNTElement.class::cast)
-                        .forEach(tntElement -> {
-                            if (tntElement.getAlignment().getX() != 1) tntElement.alignX(1);
-                        });
-                SimulatorWatcher.update(simulator);
+            SWItem positivXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
+                simulatorGroup.getElements().stream().map(TNTElement.class::cast).forEach(tntElement -> {
+                    if (tntElement.getAlignment().getX() != 1)
+                        tntElement.alignX(1);
+                });
+                SimulatorRenderer.update(simulator);
             });
-            positivXItem.setEnchanted(simulatorGroup.getElements().stream()
-                    .map(TNTElement.class::cast)
-                    .allMatch(tntElement -> tntElement.getAlignment().getX() == -1));
+            positivXItem.setEnchanted(
+                    simulatorGroup.getElements().stream().map(TNTElement.class::cast)
+                            .allMatch(tntElement -> tntElement.getAlignment().getX() == -1));
             inventory.setItem(30, positivXItem);
         }
 
-        //Pos X
-        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
-            simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0, 0);
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
+        // Pos X
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1",
+                Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+                    simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0, 0);
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> {
             new SimulatorAnvilGui<>(player, "Relative X", "", Double::parseDouble, number -> {
-                if(!allTNT){
+                if (!allTNT) {
                     number = (double) Math.round(number);
                 }
                 simulatorGroup.move(number, 0, 0);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
-            simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0, 0);
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
+        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1",
+                Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+                    simulatorGroup.move(clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0, 0);
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos Y
-        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
-            simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0);
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
+        // Pos Y
+        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1",
+                Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+                    simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1, 0);
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> {
             new SimulatorAnvilGui<>(player, "Relative Y", "", Double::parseDouble, number -> {
-                if(!allTNT){
+                if (!allTNT) {
                     number = (double) Math.round(number);
                 }
                 simulatorGroup.move(0, number, 0);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
-            simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0);
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
+        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1",
+                Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+                    simulatorGroup.move(0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1, 0);
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
-        //Pos Z
-        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
-            simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1);
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
+        // Pos Z
+        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1",
+                Arrays.asList(allTNT ? "§7Shift§8: §e+0.0625" : "§7Shift§8: §e+5"), false, clickType -> {
+                    simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? 0.0625 : 5) : 1);
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> {
             new SimulatorAnvilGui<>(player, "Relative Z", "", Double::parseDouble, number -> {
-                if(!allTNT){
+                if (!allTNT) {
                     number = (double) Math.round(number);
                 }
                 simulatorGroup.move(0, 0, number);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.PAPER).open();
         }));
-        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
-            simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1);
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
+        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1",
+                Arrays.asList(allTNT ? "§7Shift§8: §e-0.0625" : "§7Shift§8: §e-5"), false, clickType -> {
+                    simulatorGroup.move(0, 0, clickType.isShiftClick() ? (allTNT ? -0.0625 : -5) : -1);
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

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

@@ -1,29 +1,30 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorCursor;
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.simulator.SimulatorCursorManager;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
+import de.steamwar.bausystem.features.simulator.display.SimulatorCursor;
+import de.steamwar.bausystem.features.simulator.display.SimulatorCursorMode;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
@@ -32,6 +33,8 @@ import org.bukkit.entity.Player;
 
 public class SimulatorGui extends SimulatorPageGui<SimulatorGroup> {
 
+    private final SimulatorCursorManager cursorManager = BauSystem.getInstance().getLinker().get(SimulatorCursorManager.class).orElseThrow();
+
     public SimulatorGui(Player player, Simulator simulator) {
         super(player, simulator, 6 * 9, simulator.getGroups());
     }
@@ -43,14 +46,15 @@ public class SimulatorGui extends SimulatorPageGui<SimulatorGroup> {
 
     @Override
     public void headerAndFooter() {
-        if (simulator.getGroups().removeIf(element -> element.getElements().isEmpty() || element.getElements().stream().allMatch(simulatorElement -> simulatorElement.getPhases().isEmpty()))) {
-            SimulatorWatcher.update(simulator);
+        if (simulator.getGroups().removeIf(element -> element.getElements().isEmpty()
+                || element.getElements().stream().allMatch(simulatorElement -> simulatorElement.getPhases().isEmpty()))) {
+            SimulatorRenderer.update(simulator);
         }
 
         inventory.setItem(4, simulator.toItem(player, clickType -> {
             new SimulatorMaterialGui(player, simulator, simulator::getMaterial, simulator::setMaterial, this).open();
         }));
-        SimulatorCursor.CursorType cursorType = SimulatorCursor.getCursorType(player);
+        SimulatorCursorMode cursorType = cursorManager.getActiveCursorMode(player).orElse(SimulatorCursorMode.TNT);
         inventory.setItem(48, new SWItem(cursorType.material, "§7Placing §8-§e " + cursorType.name, clickType -> {
             new SimulatorCursorSwitcherGui(player, simulator, this).open();
         }));

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

@@ -1,26 +1,24 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui;
 import de.steamwar.data.CMDs;
@@ -36,11 +34,8 @@ import java.util.stream.Collectors;
 
 public class SimulatorMaterialGui extends SimulatorPageGui<Material> {
 
-    private static final List<Material> MATERIALS = Arrays.stream(Material.values())
-            .filter(material -> !material.isAir())
-            .filter(material -> !material.isLegacy())
-            .filter(Material::isItem)
-            .collect(Collectors.toList());
+    private static final List<Material> MATERIALS = Arrays.stream(Material.values()).filter(material -> !material.isAir())
+            .filter(material -> !material.isLegacy()).filter(Material::isItem).collect(Collectors.toList());
 
     private final Supplier<Material> currentMaterial;
     private Material material;
@@ -60,7 +55,7 @@ public class SimulatorMaterialGui extends SimulatorPageGui<Material> {
             return true;
         }
         change.accept(player.getItemOnCursor().getType());
-        SimulatorWatcher.update(simulator);
+        SimulatorRenderer.update(simulator);
         return false;
     }
 
@@ -81,9 +76,10 @@ public class SimulatorMaterialGui extends SimulatorPageGui<Material> {
 
     @Override
     public SWItem convert(Material material) {
-        return new SWItem(material, "§eNew Material", Arrays.asList(material == this.material ? "§eSelected" : "§eClick to select"), material == this.material, clickType -> {
-            change.accept(material);
-            SimulatorWatcher.update(simulator);
-        });
+        return new SWItem(material, "§eNew Material", Arrays.asList(material == this.material ? "§eSelected" : "§eClick to select"), material == this.material,
+                clickType -> {
+                    change.accept(material);
+                    SimulatorRenderer.update(simulator);
+                });
     }
 }

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

@@ -1,29 +1,27 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
 import de.steamwar.data.CMDs;
@@ -60,7 +58,7 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
     public void headerAndFooter() {
         if (observer.getPhases().isEmpty()) {
             back.open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
             return;
         }
 
@@ -87,7 +85,7 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             observer.getPhases().clear();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
@@ -101,10 +99,11 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         }).setCustomModelData(CMDs.Simulator.SETTINGS));
 
         // Enable/Disable
-        inventory.setItem(48, new SWItem(observer.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, observer.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
-            observer.setDisabled(!observer.isDisabled());
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
+        inventory.setItem(48,
+                new SWItem(observer.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, observer.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
+                    observer.setDisabled(!observer.isDisabled());
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
         // Group chooser
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
@@ -139,7 +138,7 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         SWItem observer = new SWItem(Material.OBSERVER, "§eObserver", lore, false, clickType -> {
             if (clickType == ClickType.MIDDLE) {
                 this.observer.getPhases().remove(observerPhase);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
             } else {
                 new SimulatorObserverPhaseSettingsGui(player, simulator, this.observer, observerPhase, this).open();
             }
@@ -148,42 +147,35 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
 
         Supplier<Integer> getter = observerPhase::getTickOffset;
         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 -> {
-                    setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
-                    SimulatorWatcher.update(simulator);
-                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
-                observer,
+        return new SWItem[] {new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+            setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
+            SimulatorRenderer.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 -> {
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
-                    SimulatorWatcher.update(simulator);
-                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
-                new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED), new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
                     new SimulatorObserverPhaseSettingsGui(player, simulator, this.observer, observerPhase, this).open();
-                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
-        };
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),};
     }
 
     @Override
     public SWItem[] lastColumn() {
-        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    addNewPhase(clickType.isShiftClick());
-                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
-                new SWItem(Material.QUARTZ, "§eObserver§8:§a New Phase", clickType -> {
-                    addNewPhase(false);
-                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
-                new SWItem(SWItem.getDye(8), "§7", clickType -> {
-                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
-        };
+        return new SWItem[] {new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+            addNewPhase(clickType.isShiftClick());
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED), new SWItem(Material.QUARTZ, "§eObserver§8:§a New Phase", clickType -> {
+            addNewPhase(false);
+        }).setCustomModelData(CMDs.Simulator.NEW_PHASE), new SWItem(SWItem.getDye(8), "§7", clickType -> {
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),};
     }
 
     private void addNewPhase(boolean shift) {
         ObserverPhase lastElement = observer.getPhases().get(observer.getPhases().size() - 1);
         ObserverPhase newPhase = new ObserverPhase(lastElement.getTickOffset() + 4);
-        if (shift) newPhase.setTickOffset(newPhase.getTickOffset() + 5);
+        if (shift)
+            newPhase.setTickOffset(newPhase.getTickOffset() + 5);
         scroll += 2;
         observer.add(newPhase);
-        SimulatorWatcher.update(simulator);
+        SimulatorRenderer.update(simulator);
     }
 }

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

@@ -1,29 +1,27 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.core.Core;
@@ -41,7 +39,8 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
     private final ObserverPhase observer;
     private final SimulatorBaseGui back;
 
-    public SimulatorObserverPhaseSettingsGui(Player player, Simulator simulator, ObserverElement observerElement, ObserverPhase observer, SimulatorBaseGui back) {
+    public SimulatorObserverPhaseSettingsGui(Player player, Simulator simulator, ObserverElement observerElement, ObserverPhase observer,
+            SimulatorBaseGui back) {
         super(player, simulator, 5 * 9);
         this.observerElement = observerElement;
         this.observer = observer;
@@ -74,7 +73,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             observerElement.getPhases().remove(observer);
             back.open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DELETE));
 
         int index = observerElement.getPhases().indexOf(observer);
@@ -94,18 +93,19 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
             max = Integer.MAX_VALUE - 4;
         }
 
-        //Tick Offset
+        // 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 -> {
             observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 observer.setTickOffset(Math.min(Math.max(integer, min), max));
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.REPEATER).open();
         });
@@ -114,60 +114,66 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Order
+        // 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 -> {
-            observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
+        inventory.setItem(13,
+                new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+                    observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
         SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eActivation Order§8:§7 " + order, clickType -> {
             new SimulatorAnvilGui<>(player, "Activation Order", order + "", Integer::parseInt, integer -> {
-                if (integer < -SimulatorPhase.ORDER_LIMIT) return false;
-                if (integer > SimulatorPhase.ORDER_LIMIT) return false;
+                if (integer < -SimulatorPhase.ORDER_LIMIT)
+                    return false;
+                if (integer > SimulatorPhase.ORDER_LIMIT)
+                    return false;
                 observer.setOrder(integer);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(order >= 0 ? Material.COMPASS : negativeNumbers).open();
         });
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         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 -> {
-            observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
+        inventory.setItem(31,
+                new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+                    observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Update orientation
         inventory.setItem(25, new SWItem(Material.SUNFLOWER, "§7", clickType -> {
         }));
         inventory.setItem(15, new SWItem(observer.getOrientation() == BlockFace.UP ? Material.LIME_CONCRETE : Material.GRAY_CONCRETE, "§eUp", clickType -> {
             observer.setOrientation(BlockFace.UP);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }));
         inventory.setItem(33, new SWItem(observer.getOrientation() == BlockFace.DOWN ? Material.RED_CONCRETE : Material.GRAY_CONCRETE, "§eDown", clickType -> {
             observer.setOrientation(BlockFace.DOWN);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }));
         inventory.setItem(16, new SWItem(observer.getOrientation() == BlockFace.NORTH ? Material.LIME_WOOL : Material.GRAY_WOOL, "§eNorth", clickType -> {
             observer.setOrientation(BlockFace.NORTH);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }));
         inventory.setItem(34, new SWItem(observer.getOrientation() == BlockFace.SOUTH ? Material.RED_WOOL : Material.GRAY_WOOL, "§eSouth", clickType -> {
             observer.setOrientation(BlockFace.SOUTH);
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(24, new SWItem(observer.getOrientation() == BlockFace.EAST ? Material.LIME_STAINED_GLASS : Material.GRAY_STAINED_GLASS, "§eEast", clickType -> {
-            observer.setOrientation(BlockFace.EAST);
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(26, new SWItem(observer.getOrientation() == BlockFace.WEST ? Material.RED_STAINED_GLASS : Material.GRAY_STAINED_GLASS, "§eWest", clickType -> {
-            observer.setOrientation(BlockFace.WEST);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }));
+        inventory.setItem(24,
+                new SWItem(observer.getOrientation() == BlockFace.EAST ? Material.LIME_STAINED_GLASS : Material.GRAY_STAINED_GLASS, "§eEast", clickType -> {
+                    observer.setOrientation(BlockFace.EAST);
+                    SimulatorRenderer.update(simulator);
+                }));
+        inventory.setItem(26,
+                new SWItem(observer.getOrientation() == BlockFace.WEST ? Material.RED_STAINED_GLASS : Material.GRAY_STAINED_GLASS, "§eWest", clickType -> {
+                    observer.setOrientation(BlockFace.WEST);
+                    SimulatorRenderer.update(simulator);
+                }));
     }
 }

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

@@ -1,27 +1,25 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.data.CMDs;
@@ -68,13 +66,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         int baseTicks = observer.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 observer.changeBaseTicks(integer - baseTicks);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.REPEATER).open();
         });
@@ -86,58 +85,58 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             } else {
                 observer.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos X
-        inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+        // Pos X
+        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + observer.getPosition().getBlockX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", observer.getPosition().getBlockX() + "", Integer::parseInt, i -> {
                 observer.getPosition().setX(i);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos Y
+        // Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + observer.getPosition().getBlockY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", observer.getPosition().getBlockY() + "", Integer::parseInt, i -> {
                 observer.getPosition().setY(i);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos Z
+        // Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + observer.getPosition().getBlockZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", observer.getPosition().getBlockZ() + "", Integer::parseInt, i -> {
                 observer.getPosition().setZ(i);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

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

@@ -1,29 +1,27 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
 import de.steamwar.data.CMDs;
@@ -61,7 +59,7 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
     public void headerAndFooter() {
         if (redstone.getPhases().isEmpty()) {
             back.open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
             return;
         }
 
@@ -93,7 +91,7 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             redstone.getPhases().clear();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
@@ -107,10 +105,11 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         }).setCustomModelData(CMDs.Simulator.SETTINGS));
 
         // Enable/Disable
-        inventory.setItem(48, new SWItem(redstone.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, redstone.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
-            redstone.setDisabled(!redstone.isDisabled());
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
+        inventory.setItem(48,
+                new SWItem(redstone.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, redstone.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
+                    redstone.setDisabled(!redstone.isDisabled());
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
 
         // Group chooser
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
@@ -151,55 +150,49 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         lore.add("");
         lore.add("§7Click§8:§e Edit");
         lore.add("§7Middle-Click§8:§e Remove");
-        SWItem redstone = new SWItem(redstoneSubPhase.place ? Material.REDSTONE_BLOCK : Material.STONE, redstoneSubPhase.place ? "§eActivate" : "§eDeactivate", lore, false, clickType -> {
-            if (clickType == ClickType.MIDDLE) {
-                this.redstone.getPhases().remove(redstoneSubPhase.phase);
-                SimulatorWatcher.update(simulator);
-            } else {
-                new SimulatorRedstonePhaseSettingsGui(player, simulator, this.redstone, redstoneSubPhase.phase, this).open();
-            }
-        });
+        SWItem redstone = new SWItem(redstoneSubPhase.place ? Material.REDSTONE_BLOCK : Material.STONE, redstoneSubPhase.place ? "§eActivate" : "§eDeactivate",
+                lore, false, clickType -> {
+                    if (clickType == ClickType.MIDDLE) {
+                        this.redstone.getPhases().remove(redstoneSubPhase.phase);
+                        SimulatorRenderer.update(simulator);
+                    } else {
+                        new SimulatorRedstonePhaseSettingsGui(player, simulator, this.redstone, redstoneSubPhase.phase, this).open();
+                    }
+                });
         redstone.getItemStack().setAmount(Math.max(1, Math.min(time, 64)));
 
         Supplier<Integer> getter = redstoneSubPhase.place ? redstoneSubPhase.phase::getTickOffset : redstoneSubPhase.phase::getLifetime;
         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 -> {
-                    setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
-                    SimulatorWatcher.update(simulator);
-                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
-                redstone,
+        return new SWItem[] {new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+            setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
+            SimulatorRenderer.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 -> {
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
-                    SimulatorWatcher.update(simulator);
-                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
-                new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED), new SWItem(Material.ANVIL, "§eEdit Activation", clickType -> {
                     new SimulatorRedstonePhaseSettingsGui(player, simulator, this.redstone, redstoneSubPhase.phase, this).open();
-                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
-        };
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),};
     }
 
     @Override
     public SWItem[] lastColumn() {
-        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    addNewPhase(clickType.isShiftClick());
-                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
-                new SWItem(Material.REDSTONE, "§eRedstone§8:§a New Phase", clickType -> {
-                    addNewPhase(false);
-                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
-                new SWItem(SWItem.getDye(8), "§7", clickType -> {
-                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
-        };
+        return new SWItem[] {new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+            addNewPhase(clickType.isShiftClick());
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED), new SWItem(Material.REDSTONE, "§eRedstone§8:§a New Phase", clickType -> {
+            addNewPhase(false);
+        }).setCustomModelData(CMDs.Simulator.NEW_PHASE), new SWItem(SWItem.getDye(8), "§7", clickType -> {
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),};
     }
 
     private void addNewPhase(boolean shift) {
         RedstonePhase lastElement = redstone.getPhases().get(redstone.getPhases().size() - 1);
         RedstonePhase newPhase = new RedstonePhase(lastElement.getTickOffset() + lastElement.getLifetime() + 1);
-        if (shift) newPhase.setTickOffset(newPhase.getTickOffset() + 5);
+        if (shift)
+            newPhase.setTickOffset(newPhase.getTickOffset() + 5);
         scroll += 2;
         redstone.add(newPhase);
-        SimulatorWatcher.update(simulator);
+        SimulatorRenderer.update(simulator);
     }
 
     @AllArgsConstructor

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

@@ -1,29 +1,27 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.core.Core;
@@ -39,7 +37,8 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
     private final RedstonePhase redstone;
     private final SimulatorBaseGui back;
 
-    public SimulatorRedstonePhaseSettingsGui(Player player, Simulator simulator, RedstoneElement redstoneElement, RedstonePhase redstone, SimulatorBaseGui back) {
+    public SimulatorRedstonePhaseSettingsGui(Player player, Simulator simulator, RedstoneElement redstoneElement, RedstonePhase redstone,
+            SimulatorBaseGui back) {
         super(player, simulator, 5 * 9);
         this.redstoneElement = redstoneElement;
         this.redstone = redstone;
@@ -72,7 +71,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             redstoneElement.getPhases().remove(redstone);
             back.open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DELETE));
 
         int index = redstoneElement.getPhases().indexOf(redstone);
@@ -95,18 +94,19 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
             maxOffset = Integer.MAX_VALUE - 5;
         }
 
-        //Tick Offset
+        // 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 -> {
             redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 redstone.setTickOffset(Math.min(Math.max(integer, min), maxOffset));
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.REPEATER).open();
         });
@@ -115,21 +115,22 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Lifetime
+        // 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 -> {
             redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem lifetimeItem = new SWItem(Material.CLOCK, "§eActivation Time§8:§7 " + lifetime, clickType -> {
             new SimulatorAnvilGui<>(player, "Activation Time", lifetime + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 redstone.setLifetime(Math.min(integer, maxLifetime));
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.CLOCK).open();
         });
@@ -138,32 +139,36 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Order
+        // 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 -> {
-            redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
+        inventory.setItem(13,
+                new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+                    redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
         SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eActivation Order§8:§7 " + order, clickType -> {
             new SimulatorAnvilGui<>(player, "Activation Order", order + "", Integer::parseInt, integer -> {
-                if (integer < -SimulatorPhase.ORDER_LIMIT) return false;
-                if (integer > SimulatorPhase.ORDER_LIMIT) return false;
+                if (integer < -SimulatorPhase.ORDER_LIMIT)
+                    return false;
+                if (integer > SimulatorPhase.ORDER_LIMIT)
+                    return false;
                 redstone.setOrder(integer);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(order >= 0 ? Material.COMPASS : negativeNumbers).open();
         });
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         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 -> {
-            redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
+        inventory.setItem(31,
+                new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+                    redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

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

@@ -1,27 +1,25 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.data.CMDs;
@@ -67,13 +65,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         int baseTicks = redstone.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 redstone.changeBaseTicks(integer - baseTicks);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.REPEATER).open();
         });
@@ -85,58 +84,58 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             } else {
                 redstone.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos X
+        // Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + redstone.getPosition().getBlockX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", redstone.getPosition().getBlockX() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setX(i);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos Y
+        // Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + redstone.getPosition().getBlockY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", redstone.getPosition().getBlockY() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setY(i);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos Z
+        // Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + redstone.getPosition().getBlockZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", redstone.getPosition().getBlockZ() + "", Integer::parseInt, i -> {
                 redstone.getPosition().setZ(i);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

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

@@ -1,26 +1,24 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
@@ -55,50 +53,52 @@ public class SimulatorSettingsGui extends SimulatorBaseGui {
             new SimulatorMaterialGui(player, simulator, simulator::getMaterial, simulator::setMaterial, this).open();
         }));
 
-        //AutoTrace
-        inventory.setItem(19, new SWItem(simulator.isAutoTrace() ? Material.CHAIN_COMMAND_BLOCK : Material.COMMAND_BLOCK, "§eAutoTrace§8: " + (simulator.isAutoTrace() ? "§aOn" : "§cOff"), clickType -> {
-            simulator.setAutoTrace(!simulator.isAutoTrace());
-            SimulatorWatcher.update(simulator);
-        }));
-        inventory.setItem(20, new SWItem(simulator.isAutoTestblock() ? Material.END_STONE : Material.BARRIER, "§eTestblock§8: " + (simulator.isAutoTestblock() ? "§aOn" : "§cOff"), clickType -> {
-            simulator.setAutoTestblock(!simulator.isAutoTestblock());
-            SimulatorWatcher.update(simulator);
-        }));
+        // AutoTrace
+        inventory.setItem(19, new SWItem(simulator.isAutoTrace() ? Material.CHAIN_COMMAND_BLOCK : Material.COMMAND_BLOCK,
+                "§eAutoTrace§8: " + (simulator.isAutoTrace() ? "§aOn" : "§cOff"), clickType -> {
+                    simulator.setAutoTrace(!simulator.isAutoTrace());
+                    SimulatorRenderer.update(simulator);
+                }));
+        inventory.setItem(20, new SWItem(simulator.isAutoTestblock() ? Material.END_STONE : Material.BARRIER,
+                "§eTestblock§8: " + (simulator.isAutoTestblock() ? "§aOn" : "§cOff"), clickType -> {
+                    simulator.setAutoTestblock(!simulator.isAutoTestblock());
+                    SimulatorRenderer.update(simulator);
+                }));
 
-        //Pos X
+        // Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             simulator.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX", clickType -> {
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             simulator.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos Y
+        // Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             simulator.move(0, clickType.isShiftClick() ? 5 : 1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY", clickType -> {
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             simulator.move(0, clickType.isShiftClick() ? -5 : -1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Pos Z
+        // Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             simulator.move(0, 0, clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ", clickType -> {
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             simulator.move(0, 0, clickType.isShiftClick() ? -5 : -1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

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

@@ -1,29 +1,27 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorStabGenerator;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
@@ -60,7 +58,7 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
     public void headerAndFooter() {
         if (tnt.getPhases().isEmpty()) {
             back.open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
             return;
         }
 
@@ -87,7 +85,7 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
 
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             tnt.getPhases().clear();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DELETE));
 
         // Material Chooser
@@ -98,16 +96,18 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
         inventory.setItem(47, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorTNTSettingsGui(player, simulator, tnt, this).open();
         }).setCustomModelData(CMDs.Simulator.SETTINGS));
-        inventory.setItem(48, new SWItem(tnt.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, tnt.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
-            tnt.setDisabled(!tnt.isDisabled());
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
+        inventory.setItem(48,
+                new SWItem(tnt.isDisabled() ? Material.ENDER_PEARL : Material.ENDER_EYE, tnt.isDisabled() ? "§cDisabled" : "§aEnabled", clickType -> {
+                    tnt.setDisabled(!tnt.isDisabled());
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
         if (Core.getVersion() > 19) {
             inventory.setItem(49, new SWItem(Material.CALIBRATED_SCULK_SENSOR, "§eCreate Stab", click -> {
                 new SimulatorAnvilGui<>(player, "Depth Limit", "", Integer::parseInt, depthLimit -> {
-                    if (depthLimit <= 0) return false;
+                    if (depthLimit <= 0)
+                        return false;
                     simulator.setStabGenerator(new SimulatorStabGenerator(Region.getRegion(player.getLocation()), simulator, tnt, depthLimit));
-                    SimulatorWatcher.update(simulator);
+                    SimulatorRenderer.update(simulator);
                     return true;
                 }, null).open();
             }).setCustomModelData(CMDs.Simulator.CREATE_STAB));
@@ -117,7 +117,7 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
             tntElement.add(new TNTPhase());
             parent.add(tntElement);
             new SimulatorGroupGui(player, simulator, parent, new SimulatorGui(player, simulator)).open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.MAKE_GROUP));
         inventory.setItem(51, new SWItem(Material.LEAD, "§eJoin Group", clickType -> {
             new SimulatorGroupChooserGui(player, simulator, tnt, tnt.getGroup(simulator), this).open();
@@ -126,52 +126,50 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
 
     @Override
     public SWItem[] column(TNTPhase tntSetting, int index) {
-        SWItem tnt = new SWItem(Material.TNT, "§eTNT§8:§7 " + tntSetting.getCount(), Arrays.asList("§7Tick§8: §e" + tntSetting.getTickOffset(), "§7Fuse§8:§e " + tntSetting.getLifetime(), "", "§7Order§8:§e " + tntSetting.getOrder(), "", "§7X-Jump§8: " + (tntSetting.isXJump() ? "§aOn" : "§cOff"), "§7Y-Jump§8: " + (tntSetting.isYJump() ? "§aOn" : "§cOff"), "§7Z-Jump§8: " + (tntSetting.isZJump() ? "§aOn" : "§cOff"), "", "§7Click§8:§e Edit", "§7Middle-Click§8:§e Remove"), false, clickType -> {
-            if (clickType == ClickType.MIDDLE) {
-                this.tnt.getPhases().remove(tntSetting);
-                SimulatorWatcher.update(simulator);
-            } else {
-                new SimulatorTNTPhaseSettingsGui(player, simulator, this.tnt, tntSetting, this).open();
-            }
-        });
+        SWItem tnt = new SWItem(Material.TNT, "§eTNT§8:§7 " + tntSetting.getCount(),
+                Arrays.asList("§7Tick§8: §e" + tntSetting.getTickOffset(), "§7Fuse§8:§e " + tntSetting.getLifetime(), "",
+                        "§7Order§8:§e " + tntSetting.getOrder(), "", "§7X-Jump§8: " + (tntSetting.isXJump() ? "§aOn" : "§cOff"),
+                        "§7Y-Jump§8: " + (tntSetting.isYJump() ? "§aOn" : "§cOff"), "§7Z-Jump§8: " + (tntSetting.isZJump() ? "§aOn" : "§cOff"), "",
+                        "§7Click§8:§e Edit", "§7Middle-Click§8:§e Remove"),
+                false, clickType -> {
+                    if (clickType == ClickType.MIDDLE) {
+                        this.tnt.getPhases().remove(tntSetting);
+                        SimulatorRenderer.update(simulator);
+                    } else {
+                        new SimulatorTNTPhaseSettingsGui(player, simulator, this.tnt, tntSetting, this).open();
+                    }
+                });
         tnt.getItemStack().setAmount(Math.min(tntSetting.getCount(), 64));
 
-        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
-                    SimulatorWatcher.update(simulator);
-                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
-                tnt,
+        return new SWItem[] {new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+            tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
+            SimulatorRenderer.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 -> {
                     tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
-                    SimulatorWatcher.update(simulator);
-                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
-                new SWItem(Material.ANVIL, "§eEdit Phase", clickType -> {
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED), new SWItem(Material.ANVIL, "§eEdit Phase", clickType -> {
                     new SimulatorTNTPhaseSettingsGui(player, simulator, this.tnt, tntSetting, this).open();
-                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),
-        };
+                }).setCustomModelData(CMDs.Simulator.EDIT_ACTIVATION),};
     }
 
     @Override
     public SWItem[] lastColumn() {
-        return new SWItem[]{
-                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    addNewPhase(clickType.isShiftClick());
-                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
-                new SWItem(Material.GUNPOWDER, "§eTNT§8:§a New Phase", clickType -> {
-                    addNewPhase(false);
-                }).setCustomModelData(CMDs.Simulator.NEW_PHASE),
-                new SWItem(SWItem.getDye(8), "§7", clickType -> {
-                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
-        };
+        return new SWItem[] {new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+            addNewPhase(clickType.isShiftClick());
+        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED), new SWItem(Material.GUNPOWDER, "§eTNT§8:§a New Phase", clickType -> {
+            addNewPhase(false);
+        }).setCustomModelData(CMDs.Simulator.NEW_PHASE), new SWItem(SWItem.getDye(8), "§7", clickType -> {
+        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),};
     }
 
     private void addNewPhase(boolean shift) {
         TNTPhase lastElement = tnt.getPhases().get(tnt.getPhases().size() - 1);
         TNTPhase newPhase = new TNTPhase(lastElement.getTickOffset() + 1);
-        if (shift) newPhase.setCount(newPhase.getCount() + 5);
+        if (shift)
+            newPhase.setCount(newPhase.getCount() + 5);
         scroll++;
         tnt.add(newPhase);
-        SimulatorWatcher.update(simulator);
+        SimulatorRenderer.update(simulator);
     }
 }

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

@@ -1,29 +1,27 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.core.Core;
@@ -68,25 +66,26 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
             new SimulatorMaterialGui(player, simulator, tntElement::getMaterial, tntElement::setMaterial, this).open();
         }));
 
-        //Delete
+        // Delete
         inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
             tntElement.getPhases().remove(tnt);
             back.open();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DELETE));
 
-        //Count
+        // Count
         int count = tnt.getCount();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem countItem = new SWItem(Material.TNT, "§eCount§8:§7 " + count, clickType -> {
             new SimulatorAnvilGui<>(player, "Count", count + "", Integer::parseInt, integer -> {
-                if (integer < 1) return false;
+                if (integer < 1)
+                    return false;
                 tnt.setCount(integer);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.TNT).open();
         });
@@ -95,21 +94,22 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Tick Offset
+        // Tick Offset
         int offset = tnt.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem offsetItem = new SWItem(Material.REPEATER, "§eStart at§8:§7 " + offset, clickType -> {
             new SimulatorAnvilGui<>(player, "Start at", offset + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 tnt.setTickOffset(integer);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.REPEATER).open();
         });
@@ -118,21 +118,22 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Lifetime
+        // Lifetime
         int lifetime = tnt.getLifetime();
         inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         SWItem lifetimeItem = new SWItem(Material.CLOCK, "§eLifetime§8:§7 " + lifetime, clickType -> {
             new SimulatorAnvilGui<>(player, "Lifetime", lifetime + "", Integer::parseInt, integer -> {
-                if (integer < 1) return false;
+                if (integer < 1)
+                    return false;
                 tnt.setLifetime(integer);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.CLOCK).open();
         });
@@ -141,56 +142,63 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
             tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
-        //Order
+        // 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 -> {
-            tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
+        inventory.setItem(13,
+                new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+                    tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
+                    SimulatorRenderer.update(simulator);
+                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
 
         Material negativeNumbers = Material.getMaterial(Core.getVersion() >= 19 ? "RECOVERY_COMPASS" : "FIREWORK_STAR");
         SWItem orderItem = new SWItem(order >= 0 ? Material.COMPASS : negativeNumbers, "§eCalculation Order§8:§7 " + order, clickType -> {
             new SimulatorAnvilGui<>(player, "Calculation Order", order + "", Integer::parseInt, integer -> {
-                if (integer < -SimulatorPhase.ORDER_LIMIT) return false;
-                if (integer > SimulatorPhase.ORDER_LIMIT) return false;
+                if (integer < -SimulatorPhase.ORDER_LIMIT)
+                    return false;
+                if (integer > SimulatorPhase.ORDER_LIMIT)
+                    return false;
                 tnt.setOrder(integer);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(order >= 0 ? Material.COMPASS : negativeNumbers).open();
         });
         orderItem.getItemStack().setAmount(Math.max(1, Math.min(Math.abs(order), 30)));
         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 -> {
-            tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
-            SimulatorWatcher.update(simulator);
-        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
+        inventory.setItem(31,
+                new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+                    tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
+                    SimulatorRenderer.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 -> {
-            tnt.setXJump(!tnt.isXJump());
-            SimulatorWatcher.update(simulator);
-        });
+        // Jump
+        SWItem jumpX =
+                new SWItem(tnt.isXJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump X§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+                    tnt.setXJump(!tnt.isXJump());
+                    SimulatorRenderer.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 -> {
-            tnt.setYJump(!tnt.isYJump());
-            SimulatorWatcher.update(simulator);
-        });
+        SWItem jumpY =
+                new SWItem(tnt.isYJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Y§8: " + (tnt.isYJump() ? "§aon" : "§coff"), clickType -> {
+                    tnt.setYJump(!tnt.isYJump());
+                    SimulatorRenderer.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 -> {
-            tnt.setZJump(!tnt.isZJump());
-            SimulatorWatcher.update(simulator);
-        });
+        SWItem jumpZ =
+                new SWItem(tnt.isZJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Z§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+                    tnt.setZJump(!tnt.isZJump());
+                    SimulatorRenderer.update(simulator);
+                });
         inventory.setItem(35, jumpZ);
 
         SWItem jumpAll = new SWItem(Material.TNT, "§7TNT §eJump §8: " + (tnt.hasJump() ? "§aon" : "§coff"), clickType -> {
             tnt.setJump(!tnt.hasJump());
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         });
         inventory.setItem(25, jumpAll);
     }

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

@@ -1,27 +1,25 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
 import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.data.CMDs;
@@ -76,13 +74,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         int baseTicks = tnt.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
             tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         SWItem baseTick = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + baseTicks, clickType -> {
             new SimulatorAnvilGui<>(player, "Ticks", baseTicks + "", Integer::parseInt, integer -> {
-                if (integer < 0) return false;
+                if (integer < 0)
+                    return false;
                 tnt.changeBaseTicks(integer - baseTicks);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).setItem(Material.REPEATER).open();
         });
@@ -94,42 +93,46 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             } else {
                 tnt.changeBaseTicks(clickType.isShiftClick() ? -5 : -1);
             }
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Subpixel Alignment
         inventory.setItem(21, new SWItem(Material.SUNFLOWER, "§7Align§8: §eCenter", clickType -> {
             tnt.alignX(0);
             tnt.alignZ(0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }));
 
         // Z
         SWItem negativZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §eNegativ Z", clickType -> {
-            if (tnt.getAlignment().getZ() != -1) tnt.alignZ(-1);
-            SimulatorWatcher.update(simulator);
+            if (tnt.getAlignment().getZ() != -1)
+                tnt.alignZ(-1);
+            SimulatorRenderer.update(simulator);
         });
         negativZItem.setEnchanted(tnt.getAlignment().getZ() == -1);
         inventory.setItem(20, negativZItem);
 
         SWItem positivZItem = new SWItem(Material.OAK_BUTTON, "§7Align§8: §ePositiv Z", clickType -> {
-            if (tnt.getAlignment().getZ() != 1) tnt.alignZ(1);
-            SimulatorWatcher.update(simulator);
+            if (tnt.getAlignment().getZ() != 1)
+                tnt.alignZ(1);
+            SimulatorRenderer.update(simulator);
         });
         positivZItem.setEnchanted(tnt.getAlignment().getZ() == 1);
         inventory.setItem(22, positivZItem);
 
         // X
         SWItem negativXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §eNegativ X", clickType -> {
-            if (tnt.getAlignment().getX() != -1) tnt.alignX(-1);
-            SimulatorWatcher.update(simulator);
+            if (tnt.getAlignment().getX() != -1)
+                tnt.alignX(-1);
+            SimulatorRenderer.update(simulator);
         });
         negativXItem.setEnchanted(tnt.getAlignment().getX() == -1);
         inventory.setItem(12, negativXItem);
 
-        SWItem positivXItem =  new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
-            if(tnt.getAlignment().getX() != 1) tnt.alignX(1);
-            SimulatorWatcher.update(simulator);
+        SWItem positivXItem = new SWItem(Material.STONE_BUTTON, "§7Align§8: §ePositiv X", clickType -> {
+            if (tnt.getAlignment().getX() != 1)
+                tnt.alignX(1);
+            SimulatorRenderer.update(simulator);
         });
         positivXItem.setEnchanted(tnt.getAlignment().getX() == 1);
         inventory.setItem(30, positivXItem);
@@ -137,52 +140,52 @@ 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 -> {
             tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(24, new SWItem(Material.PAPER, "§eX§8:§7 " + tnt.getPosition().getX(), clickType -> {
             new SimulatorAnvilGui<>(player, "X", tnt.getPosition().getX() + "", Double::parseDouble, d -> {
                 tnt.getPosition().setX(d);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.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 -> {
             tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(25, new SWItem(Material.PAPER, "§eY§8:§7 " + tnt.getPosition().getY(), clickType -> {
             new SimulatorAnvilGui<>(player, "Y", tnt.getPosition().getY() + "", Double::parseDouble, d -> {
                 tnt.getPosition().setY(d);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.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 -> {
             tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
         inventory.setItem(26, new SWItem(Material.PAPER, "§eZ§8:§7 " + tnt.getPosition().getZ(), clickType -> {
             new SimulatorAnvilGui<>(player, "Z", tnt.getPosition().getZ() + "", Double::parseDouble, d -> {
                 tnt.getPosition().setZ(d);
-                SimulatorWatcher.update(simulator);
+                SimulatorRenderer.update(simulator);
                 return true;
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
             tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
     }
 }

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

@@ -1,26 +1,24 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.simulator.gui.base;
 
-import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.display.SimulatorRenderer;
 import de.steamwar.core.Core;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
@@ -45,7 +43,8 @@ public abstract class SimulatorBaseGui {
     }
 
     public final void open() {
-        if (!shouldOpen()) return;
+        if (!shouldOpen())
+            return;
 
         String newTitle = title();
         String originalTitle = player.getOpenInventory().getTitle();
@@ -58,7 +57,6 @@ public abstract class SimulatorBaseGui {
             setup();
             if (player.getOpenInventory().getTopInventory() != inv) {
                 inventory.open();
-                SimulatorWatcher.watch(player, simulator, this::open);
             }
             if (Core.getVersion() > 19) {
                 player.getOpenInventory().setTitle(title());
@@ -70,7 +68,6 @@ public abstract class SimulatorBaseGui {
             }
             if (player.getOpenInventory().getTopInventory() == inv) {
                 inventory.open();
-                SimulatorWatcher.watch(player, simulator, this::open);
             }
             return;
         }
@@ -82,11 +79,7 @@ public abstract class SimulatorBaseGui {
             return inv;
         });
         setup();
-        inventory.addCloseCallback(clickType -> {
-            SimulatorWatcher.watch(player, null, null);
-        });
 
-        SimulatorWatcher.watch(player, simulator, this::open);
         if (simulator != null && simulator.getStabGenerator() != null) {
             populateStabGenerator();
         } else {
@@ -98,7 +91,7 @@ public abstract class SimulatorBaseGui {
     private void populateStabGenerator() {
         inventory.setItem(22, new SWItem(Material.BARRIER, "§cCancel Stab Generator", click -> {
             simulator.getStabGenerator().cancel();
-            SimulatorWatcher.update(simulator);
+            SimulatorRenderer.update(simulator);
         }));
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java

@@ -54,7 +54,7 @@ public class YAPIONFormatSimulatorLoader implements SimulatorLoader {
         }
 
         String name = file.getName().substring(0, file.getName().length() - 7);
-        SteamwarUser steamwarUser = SteamwarUser.byId(Integer.parseInt(name));
+        SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(name));
 
         List<Simulator> simulators = new ArrayList<>();
         for (String s : yapionObject.getKeys()) {

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

@@ -20,14 +20,17 @@
 package de.steamwar.bausystem.features.slaves.laufbau;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.UserConfig;
 import lombok.Cleanup;
 import lombok.SneakyThrows;
-import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.meta.ItemMeta;
 import yapion.hierarchy.output.StreamOutput;
 import yapion.hierarchy.types.YAPIONObject;
@@ -36,45 +39,44 @@ import yapion.parser.options.StreamOptions;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-@UtilityClass
-public class LaufbauUtils {
+@Linked
+public class LaufbauUtils implements Listener {
 
-    public static class LaufbauComponent implements SWPlayer.Component {
+    private static Map<Player, YAPIONObject> yapionObjectMap = new HashMap<>();
 
-        private YAPIONObject yapionObject = new YAPIONObject();
-
-        @Override
-        @SneakyThrows
-        public void onMount(SWPlayer player) {
-            String config = UserConfig.getConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
-            if (config == null) {
-                return;
-            }
-            byte[] bytes = Base64.getDecoder().decode(config);
-            @Cleanup GZIPInputStream gzipInputStream = new GZIPInputStream(new ByteArrayInputStream(bytes));
-            yapionObject = new YAPIONParser(gzipInputStream, new StreamOptions().stopOnStreamEnd(true)).parse().result();
+    @EventHandler
+    @SneakyThrows
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        String config = UserConfig.getConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
+        if (config == null) {
+            return;
         }
+        byte[] bytes = Base64.getDecoder().decode(config);
+        @Cleanup GZIPInputStream gzipInputStream = new GZIPInputStream(new ByteArrayInputStream(bytes));
+        YAPIONObject yapionObject = new YAPIONParser(gzipInputStream, new StreamOptions().stopOnStreamEnd(true)).parse().result();
+        yapionObjectMap.put(event.getPlayer(), yapionObject);
+    }
 
-        @Override
-        @SneakyThrows
-        public void onUnmount(SWPlayer player) {
-            if (yapionObject.isEmpty()) {
-                UserConfig.removePlayerConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
-                return;
-            }
-            @Cleanup ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            @Cleanup GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream);
-            yapionObject.toYAPION(new StreamOutput(gzipOutputStream)).close();
-            UserConfig.updatePlayerConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau", Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray()));
+    @EventHandler
+    @SneakyThrows
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        YAPIONObject yapionObject = yapionObjectMap.get(event.getPlayer());
+        if (yapionObject == null) {
+            return;
         }
+        if (yapionObject.isEmpty()) {
+            UserConfig.removePlayerConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
+            return;
+        }
+        @Cleanup ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        @Cleanup GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream);
+        yapionObject.toYAPION(new StreamOutput(gzipOutputStream)).close();
+        UserConfig.updatePlayerConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau", Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray()));
     }
 
     public static Cuboid pixelCuboid(double pixelX, double pixelY, double pixelZ, double pixelDX, double pixelDY, double pixelDZ) {
@@ -123,7 +125,11 @@ public class LaufbauUtils {
             return false;
         }
         String identifier = identifier(bb);
-        return SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject.containsKey(identifier);
+        YAPIONObject yapionObject = yapionObjectMap.get(p);
+        if (yapionObject == null) {
+            return false;
+        }
+        return yapionObject.containsKey(identifier);
     }
 
     @SneakyThrows
@@ -132,7 +138,11 @@ public class LaufbauUtils {
             return;
         }
         String identifier = identifier(bb);
-        YAPIONObject yapionObject = SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject;
+        YAPIONObject yapionObject = yapionObjectMap.get(p);
+        if (yapionObject == null) {
+            yapionObject = new YAPIONObject();
+            yapionObjectMap.put(p, yapionObject);
+        }
         if (yapionObject.containsKey(identifier)) {
             yapionObject.remove(identifier);
         } else {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java

@@ -107,7 +107,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             @Override
             public Player map(CommandSender commandSender, String[] previousArguments, String s) {
                 Player player = Bukkit.getPlayer(s);
-                if (player != null && Permission.SPECTATOR.hasPermission(player)) {
+                if (player != null && Permission.REAL_SPECTATOR.hasPermission(player)) {
                     return player;
                 }
                 return null;
@@ -116,7 +116,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             @Override
             public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                 return Bukkit.getOnlinePlayers().stream()
-                        .filter(Permission.SPECTATOR::hasPermission)
+                        .filter(Permission.REAL_SPECTATOR::hasPermission)
                         .map(Player::getName)
                         .collect(Collectors.toList());
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.testblock.blockcounter;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -35,7 +34,6 @@ public class BlockCounterListener implements Listener {
 
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
-        if (!(event.getEntity() instanceof TNTPrimed)) return;
         Region region = Region.getRegion(event.getLocation());
         if (region.getType().isGlobal()) {
             return;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tls;
+package de.steamwar.bausystem.features.tntlistener;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -43,13 +43,4 @@ public class TLSCommand extends SWCommand {
     public void stop(@Validator Player player) {
         listener.stopListening(player);
     }
-
-    @Register(description = "TLS_TOGGLE_HELP")
-    public void toggle(@Validator Player player) {
-        if (listener.isActiveFor(player)) {
-            listener.stopListening(player);
-        } else {
-            listener.startListening(player);
-        }
-    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tls;
+package de.steamwar.bausystem.features.tntlistener;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tls;
+package de.steamwar.bausystem.features.tntlistener;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java

@@ -20,7 +20,6 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.command.SWCommand;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -40,11 +39,10 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void genericCommand(final Player p) {
-        SWPlayer swPlayer = SWPlayer.of(p);
-        if (swPlayer.hasComponent(NoClipCommand.NoClipData.class)) {
-            swPlayer.removeComponent(NoClipCommand.NoClipData.class);
-            return;
-        }
+		if (NoClipCommand.getNOCLIPS().contains(p)) {
+			p.performCommand("noclip");
+			return;
+		}
 		if (p.getGameMode() == GameMode.CREATIVE) {
 			p.setGameMode(GameMode.SPECTATOR);
 		} else {
@@ -54,7 +52,9 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void gamemodeCommand(final Player p, final GameMode gameMode) {
-        SWPlayer.of(p).removeComponent(NoClipCommand.NoClipData.class);
+		if (NoClipCommand.getNOCLIPS().contains(p)) {
+			p.performCommand("noclip");
+		}
 		p.setGameMode(gameMode);
 	}
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java

@@ -26,7 +26,6 @@ import de.steamwar.bausystem.shared.EnumDisplay;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
@@ -57,9 +56,11 @@ public class MaterialCommand extends SWCommand implements Listener {
         WorldEditListener.addCommandExclusion("material");
     }
 
+    private Map<Player, Search> searchMap = new HashMap<>();
+
     @Getter
     @Setter
-    public class SearchParameter implements SWPlayer.Component {
+    static class Search {
         SearchType transparent = SearchType.IGNORE;
         SearchType solid = SearchType.IGNORE;
         SearchType gravity = SearchType.IGNORE;
@@ -103,10 +104,10 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void materialGUI(Player p) {
-        materialGUI(p, SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new));
+        materialGUI(p, searchMap.get(p));
     }
 
-    private static final Map<String, BiConsumer<SearchParameter, SearchType>> elements = new HashMap<>();
+    private static final Map<String, BiConsumer<Search, SearchType>> elements = new HashMap<>();
     static {
         elements.put("-transparent", (search, searchType) -> search.transparent = searchType);
         elements.put("-solid", (search, searchType) -> search.solid = searchType);
@@ -121,15 +122,15 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void search(Player p, @Mapper("search") String... searches) {
-        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
+        Search search = new Search();
         for (String s : searches) {
             boolean has = false;
-            for (Map.Entry<String, BiConsumer<SearchParameter, SearchType>> element: elements.entrySet()) {
+            for (Map.Entry<String, BiConsumer<Search, SearchType>> element: elements.entrySet()) {
                 if (s.startsWith(element.getKey() + ":")) {
-                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
+                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
                     has = true;
                 } else if (s.startsWith(element.getKey().substring(0, 2) + ":")) {
-                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
+                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
                     has = true;
                 }
                 if (has) break;
@@ -140,15 +141,15 @@ public class MaterialCommand extends SWCommand implements Listener {
                 case "-blastresistance:":
                     s = s.substring(s.indexOf(':') + 1).replace('_', ' ');
                     if (s.isEmpty() || s.matches("((([><]=?)|!|=)\\d+(\\.|,\\d+)?)( ((([><]=?)|!|=)\\d+(\\.|,\\d+)?))*")) {
-                        searchParameter.blastResistance = s;
+                        search.blastResistance = s;
                     }
                     break;
                 default:
-                    searchParameter.name = s;
+                    search.name = s;
                     break;
             }
         }
-        materialGUI(p, searchParameter);
+        materialGUI(p, search);
     }
 
     @Mapper(value = "search", local = true)
@@ -181,7 +182,7 @@ public class MaterialCommand extends SWCommand implements Listener {
         };
     }
 
-    public void materialGUI(Player p, SearchParameter search) {
+    public void materialGUI(Player p, Search search) {
         List<SWListInv.SWListEntry<Material>> swListEntries = new ArrayList<>();
         MaterialLazyInit.materialData.forEach(data -> {
             if (data.is(search)) {
@@ -201,59 +202,59 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     private void searchGUI(Player p) {
         SWInventory swInventory = new SWInventory(p, 54, BauSystem.MESSAGE.parse("MATERIAL_SEARCH", p));
-        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
+        Search search = searchMap.get(p);
         swInventory.setItem(0, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("MATERIAL_BACK", p), clickType -> {
             materialGUI(p);
         }).setCustomModelData(CMDs.BACK));
-        swInventory.setItem(10, new SWItem(Material.NAME_TAG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, searchParameter.name), clickType -> {
-            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), searchParameter.name);
+        swInventory.setItem(10, new SWItem(Material.NAME_TAG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, search.name), clickType -> {
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), search.name);
             swAnvilInv.setCallback(s -> {
-                searchParameter.name = s;
+                search.name = s;
                 searchGUI(p);
             });
             swAnvilInv.open();
         }));
-        swInventory.setItem(19, new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_TRANSPARENT", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.transparent.getChatValue(), p)), clickType -> {
-            searchParameter.transparent = searchParameter.transparent.next();
+        swInventory.setItem(19, new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_TRANSPARENT", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.transparent.getChatValue(), p)), clickType -> {
+            search.transparent = search.transparent.next();
             searchGUI(p);
         }));
-        swInventory.setItem(20, new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_SOLID", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.solid.getChatValue(), p)), clickType -> {
-            searchParameter.solid = searchParameter.solid.next();
+        swInventory.setItem(20, new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_SOLID", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.solid.getChatValue(), p)), clickType -> {
+            search.solid = search.solid.next();
             searchGUI(p);
         }));
-        swInventory.setItem(21, new SWItem(Material.BLACK_CONCRETE_POWDER, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_GRAVITY", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.gravity.getChatValue(), p)), clickType -> {
-            searchParameter.gravity = searchParameter.gravity.next();
+        swInventory.setItem(21, new SWItem(Material.BLACK_CONCRETE_POWDER, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_GRAVITY", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.gravity.getChatValue(), p)), clickType -> {
+            search.gravity = search.gravity.next();
             searchGUI(p);
         }));
-        swInventory.setItem(22, new SWItem(Material.BIRCH_LOG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_OCCLUDING", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.occluding.getChatValue(), p)), clickType -> {
-            searchParameter.occluding = searchParameter.occluding.next();
+        swInventory.setItem(22, new SWItem(Material.BIRCH_LOG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_OCCLUDING", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.occluding.getChatValue(), p)), clickType -> {
+            search.occluding = search.occluding.next();
             searchGUI(p);
         }));
-        swInventory.setItem(23, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_INTERACTEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.interacteable.getChatValue(), p)), clickType -> {
-            searchParameter.interacteable = searchParameter.interacteable.next();
+        swInventory.setItem(23, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_INTERACTEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.interacteable.getChatValue(), p)), clickType -> {
+            search.interacteable = search.interacteable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(24, new SWItem(Material.FLINT_AND_STEEL, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_FLAMMABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.flammable.getChatValue(), p)), clickType -> {
-            searchParameter.flammable = searchParameter.flammable.next();
+        swInventory.setItem(24, new SWItem(Material.FLINT_AND_STEEL, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_FLAMMABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.flammable.getChatValue(), p)), clickType -> {
+            search.flammable = search.flammable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(25, new SWItem(Material.LAVA_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BURNABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.burnable.getChatValue(), p)), clickType -> {
-            searchParameter.burnable = searchParameter.burnable.next();
+        swInventory.setItem(25, new SWItem(Material.LAVA_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BURNABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.burnable.getChatValue(), p)), clickType -> {
+            search.burnable = search.burnable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(28, new SWItem(Material.WATER_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_WATERLOGGABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.waterloggable.getChatValue(), p)), clickType -> {
-            searchParameter.waterloggable = searchParameter.waterloggable.next();
+        swInventory.setItem(28, new SWItem(Material.WATER_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_WATERLOGGABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.waterloggable.getChatValue(), p)), clickType -> {
+            search.waterloggable = search.waterloggable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(29, new SWItem(Material.PISTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_UNMOVEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.unmoveable.getChatValue(), p)), clickType -> {
-            searchParameter.unmoveable = searchParameter.unmoveable.next();
+        swInventory.setItem(29, new SWItem(Material.PISTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_UNMOVEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.unmoveable.getChatValue(), p)), clickType -> {
+            search.unmoveable = search.unmoveable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(34, new SWItem(Material.NETHER_BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, searchParameter.blastResistance), clickType -> {
-            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p), searchParameter.blastResistance);
+        swInventory.setItem(34, new SWItem(Material.NETHER_BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, search.blastResistance), clickType -> {
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p), search.blastResistance);
             swAnvilInv.setCallback(s -> {
                 if (s.isEmpty() || s.matches("((([><]=?)|!|=)\\d+(\\.|,\\d+)?)( ((([><]=?)|!|=)\\d+(\\.|,\\d+)?))*")) {
-                    searchParameter.blastResistance = s;
+                    search.blastResistance = s;
                 }
                 searchGUI(p);
             });
@@ -261,4 +262,14 @@ public class MaterialCommand extends SWCommand implements Listener {
         }));
         swInventory.open();
     }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        searchMap.put(event.getPlayer(), new Search());
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        searchMap.remove(event.getPlayer());
+    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java

@@ -87,7 +87,6 @@ public class MaterialLazyInit {
                 Block block = Bukkit.getWorlds().get(0).getBlockAt(0, 0, 0);
                 block.setType(material);
                 unmoveable = block.getPistonMoveReaction() == PistonMoveReaction.BLOCK || block.getPistonMoveReaction() == PistonMoveReaction.IGNORE || block.getState() instanceof TileState;
-                block.setType(Material.AIR);
             }
 
             if (material.isItem() && material != Material.AIR) {
@@ -133,7 +132,7 @@ public class MaterialLazyInit {
             }), originalMaterial);
         }
 
-        public boolean is(MaterialCommand.SearchParameter search) {
+        public boolean is(MaterialCommand.Search search) {
             boolean result = true;
             result &= search.transparent.test(transparent);
             result &= search.solid.test(solid);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java

@@ -19,17 +19,17 @@
 
 package de.steamwar.bausystem.features.util;
 
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import com.mojang.authlib.GameProfile;
-import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.ProtocolWrapper;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -40,6 +40,10 @@ import org.bukkit.event.player.PlayerGameModeChangeEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.BiFunction;
 
 @Linked
@@ -55,34 +59,29 @@ public class NoClipCommand extends SWCommand implements Listener {
     private static final Class<?> windowClick = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundContainerClickPacket");
     private static final Class<?> setSlotStack = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket");
 
-    public static class NoClipData implements SWPlayer.Component {
-        private long lastTick = -1;
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            player.setGameMode(GameMode.CREATIVE);
-        }
-    }
+    @Getter
+    private static final List<Player> NOCLIPS = new ArrayList<>();
+    private static final Map<Player, Long> LAST_TICKS = new HashMap<>();
 
     public NoClipCommand() {
         super("noclip", "nc");
 
         BiFunction<Player, Object, Object> first = (player, o) -> {
-            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
-            if (noClipData == null) return o;
-            if (noClipData.lastTick == TPSUtils.currentTick.get()) return o;
-            NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
-            noClipData.lastTick = TPSUtils.currentTick.get();
+            if (NOCLIPS.contains(player)) {
+                if (LAST_TICKS.getOrDefault(player, -1L).equals(TPSUtils.currentTick.get())) return o;
+                NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
+                LAST_TICKS.put(player, TPSUtils.currentTick.get());
+            }
             return o;
         };
         TinyProtocol.instance.addFilter(position, first);
         TinyProtocol.instance.addFilter(positionLook, first);
 
         BiFunction<Player, Object, Object> second = (player, o) -> {
-            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
-            if (noClipData == null) return o;
-            NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
-            noClipData.lastTick = TPSUtils.currentTick.get();
+            if (NOCLIPS.contains(player)) {
+                NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
+                LAST_TICKS.put(player, TPSUtils.currentTick.get());
+            }
             return o;
         };
         TinyProtocol.instance.addFilter(useItem, second);
@@ -90,7 +89,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         TinyProtocol.instance.addFilter(windowClick, second);
 
         BiFunction<Player, Object, Object> third = (player, o) -> {
-            if (SWPlayer.of(player).hasComponent(NoClipData.class)) {
+            if (NOCLIPS.contains(player)) {
                 NMSWrapper.impl.setSlotToItemStack(player, o);
             }
             return o;
@@ -100,9 +99,9 @@ public class NoClipCommand extends SWCommand implements Listener {
 
     @Register(help = true)
     public void genericCommand(@Validator Player player) {
-        SWPlayer swPlayer = SWPlayer.of(player);
-        if (swPlayer.hasComponent(NoClipData.class)) {
-            swPlayer.removeComponent(NoClipData.class);
+        if (NOCLIPS.contains(player)) {
+            NOCLIPS.remove(player);
+            player.setGameMode(GameMode.CREATIVE);
         } else {
             player.setGameMode(GameMode.SPECTATOR);
             NMSWrapper.impl.setPlayerBuildAbilities(player);
@@ -110,8 +109,8 @@ public class NoClipCommand extends SWCommand implements Listener {
             Object gameStateChangeObject = Reflection.newInstance(gameStateChange);
             NMSWrapper.impl.setGameStateChangeReason(gameStateChangeObject);
             floatFieldAccessor.set(gameStateChangeObject, 1F);
-
-            swPlayer.setComponent(new NoClipData());
+            
+            NOCLIPS.add(player);
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
             TinyProtocol.instance.sendPacket(player, gameStateChangeObject);
             pseudoGameMode(player, GameMode.SPECTATOR);
@@ -121,27 +120,30 @@ public class NoClipCommand extends SWCommand implements Listener {
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
         event.getNewSpectator().forEach(player -> {
-            SWPlayer.of(player).removeComponent(NoClipData.class);
+            if (NOCLIPS.contains(player)) {
+                NOCLIPS.remove(player);
+                player.setGameMode(GameMode.CREATIVE);
+            }
         });
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             event.setCancelled(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onBlock(BlockCanBuildEvent event) {
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             event.setBuildable(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerToggleFlight(PlayerToggleFlightEvent event) {
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             event.setCancelled(true);
             event.getPlayer().setFlying(true);
         }
@@ -152,7 +154,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         if (event.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) {
             return;
         }
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             event.setCancelled(true);
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 event.getPlayer().setSpectatorTarget(null);

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

@@ -24,7 +24,6 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
@@ -36,11 +35,15 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 @Linked
 public class SelectBauGuiItem extends BauGuiItem {
 
+    private static final Map<Player, LastSelect> LAST_SELECT_MAP = new HashMap<>();
+
     public SelectBauGuiItem() {
         super(13);
     }
@@ -55,13 +58,13 @@ public class SelectBauGuiItem extends BauGuiItem {
 
     private static void selectFinish(Player p, RegionType type, RegionExtensionType extensionType) {
         p.closeInventory();
-        SWPlayer.of(p).setComponent(new LastSelect(type, extensionType));
+        LAST_SELECT_MAP.put(p, new LastSelect(type, extensionType));
         p.performCommand("select " + type.name() + " " + extensionType.toString());
     }
 
     @Override
     public ItemStack getItem(Player player) {
-        LastSelect last = SWPlayer.of(player).getComponentOrDefault(LastSelect.class, () -> new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+        LastSelect last = LAST_SELECT_MAP.getOrDefault(player, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
         return new SWItem(Material.SCAFFOLDING, BauSystem.MESSAGE.parse("SELECT_ITEM_SELECT", player), Arrays.asList(BauSystem.MESSAGE.parse("SELECT_ITEM_AUSWAHL", player, BauSystem.MESSAGE.parse(last.type.getChatValue(), player), last.extensionType.name()), BauSystem.MESSAGE.parse("SELECT_ITEM_RIGHT_CLICK", player)), false, clickType -> {
         }).getItemStack();
     }
@@ -77,7 +80,7 @@ public class SelectBauGuiItem extends BauGuiItem {
             inv.open();
         } else {
             p.closeInventory();
-            LastSelect last = SWPlayer.of(p).getComponentOrDefault(LastSelect.class, () -> new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+            LastSelect last = LAST_SELECT_MAP.getOrDefault(p, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
             p.performCommand("select " + last.getType().name() + " " + last.getExtensionType().toString());
         }
         return false;
@@ -89,7 +92,7 @@ public class SelectBauGuiItem extends BauGuiItem {
     }
 
     @AllArgsConstructor
-    private static class LastSelect implements SWPlayer.Component {
+    private static class LastSelect {
         @Getter
         private final RegionType type;
         @Getter

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java

@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.warp;
 
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.core.Core;
-import de.steamwar.core.SWPlayer;
 import de.steamwar.entity.RArmorStand;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.linkage.Linked;
@@ -31,10 +30,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerToggleSneakEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
@@ -46,21 +42,8 @@ import java.util.Map;
 @Linked
 public class WarpListener implements Listener {
 
-    public static class WarpComponent implements SWPlayer.Component {
-        private REntityServer server;
-        private List<Location> selected = new ArrayList<>();
-
-        @Override
-        public void onMount(SWPlayer player) {
-            server = new REntityServer();
-            server.addPlayer(player.getPlayer());
-        }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            server.close();
-        }
-    }
+    private Map<Player, REntityServer> warpEntityServer = new HashMap<>();
+    private Map<Player, List<Location>> selected = new HashMap<>();
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent e) {
@@ -82,11 +65,20 @@ public class WarpListener implements Listener {
     }
 
     private void reshow(Player p, Material material, boolean sneaking) {
-        SWPlayer swPlayer = SWPlayer.of(p);
-        swPlayer.removeComponent(WarpComponent.class);
-        if (material != Material.COMPASS) return;
+        REntityServer entityServer = warpEntityServer.get(p);
+        if (entityServer != null) {
+            entityServer.close();
+        }
+        if (material != Material.COMPASS) {
+            warpEntityServer.remove(p);
+            return;
+        }
+
+        selected.remove(p);
+        entityServer = new REntityServer();
+        entityServer.addPlayer(p);
+        warpEntityServer.put(p, entityServer);
 
-        WarpComponent warpComponent = swPlayer.getComponentOrDefault(WarpComponent.class, WarpComponent::new);
         Vector current = p.getLocation().clone().add(p.getLocation().getDirection().multiply(5)).toVector();
 
         Map<String, Location> locations = new HashMap<>();
@@ -107,9 +99,12 @@ public class WarpListener implements Listener {
             }
         }
 
+        REntityServer finalEntityServer = entityServer;
         locations.forEach((name, location) -> {
             Vector vector = location.toVector().subtract(p.getLocation().toVector());
-            if (vector.getX() * vector.getX() + vector.getZ() * vector.getZ() < 25) return;
+            if (vector.getX() * vector.getX() + vector.getZ() * vector.getZ() < 25) {
+                return;
+            }
             vector.setY(0);
 
             Vector position = p.getLocation().toVector().clone().add(vector.normalize().multiply(5));
@@ -117,9 +112,9 @@ public class WarpListener implements Listener {
 
             if ((position.getX() - current.getX()) * (position.getX() - current.getX()) + (position.getZ() - current.getZ()) * (position.getZ() - current.getZ()) < 0.1) {
                 name = "§a§l" + name;
-                warpComponent.selected.add(location);
+                selected.computeIfAbsent(p, player -> new ArrayList<>()).add(location);
             }
-            RArmorStand armorStand = new RArmorStand(warpComponent.server, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
+            RArmorStand armorStand = new RArmorStand(finalEntityServer, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
             armorStand.setDisplayName(name);
             armorStand.setNoGravity(true);
             armorStand.setInvisible(true);
@@ -128,13 +123,28 @@ public class WarpListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if (event.getPlayer().getInventory().getItemInMainHand().getType() != Material.COMPASS) return;
-        if (event.getAction() != Action.RIGHT_CLICK_AIR) return;
-        WarpComponent warpComponent = SWPlayer.of(event.getPlayer()).getComponent(WarpComponent.class).orElse(null);
-        if (warpComponent == null || warpComponent.selected.size() != 1) return;
-        Location location = warpComponent.selected.get(0);
+        if (event.getPlayer().getInventory().getItemInMainHand().getType() != Material.COMPASS) {
+            return;
+        }
+        if (event.getAction() != Action.RIGHT_CLICK_AIR) {
+            return;
+        }
+        List<Location> locations = selected.getOrDefault(event.getPlayer(), new ArrayList<>());
+        if (locations.size() != 1) {
+            return;
+        }
+        Location location = locations.get(0);
         event.getPlayer().teleport(location);
         event.getPlayer().playSound(location, Sound.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1, 1);
         event.setCancelled(true);
     }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        warpEntityServer.computeIfPresent(event.getPlayer(), (player, rEntityServer) -> {
+            rEntityServer.close();
+            return null;
+        });
+        selected.remove(event.getPlayer());
+    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiBauAddMemberFix.java

@@ -41,7 +41,7 @@ public class AntiBauAddMemberFix implements Listener {
         }
         if (BauweltMember.getBauMember(BauServer.getInstance().getOwner(), event.getPlayer().getUniqueId()) == null) {
             event.getPlayer().kickPlayer("");
-            throw new SecurityException("The player " + event.getPlayer().getName() + " joined on the server of " + SteamwarUser.byId(BauServer.getInstance().getOwnerID()).getUserName() + " without being added!");
+            throw new SecurityException("The player " + event.getPlayer().getName() + " joined on the server of " + SteamwarUser.get(BauServer.getInstance().getOwnerID()).getUserName() + " without being added!");
         }
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java

@@ -59,14 +59,18 @@ public class BauMemberUpdate extends PacketHandler implements Listener {
         Set<Player> newSpectator = new HashSet<>();
         Set<Player> newBuilder = new HashSet<>();
         Bukkit.getOnlinePlayers().forEach(player -> {
-            if (Permission.SPECTATOR.hasPermission(player)) {
+            if (Permission.REAL_SPECTATOR.hasPermission(player)) {
                 if (!SPECTATORS.contains(player)) {
                     SPECTATORS.add(player);
+                    Permission.removeForceOnlySpectator(player);
                     newSpectator.add(player);
                     player.addPotionEffect(new PotionEffect(PotionEffectType.GLOWING, -1, 1, false,false, false));
                     showSpectatorNotice(player);
                 }
             } else {
+                if (Permission.SUPERVISOR.hasPermission(player)) {
+                    Permission.removeForceOnlySpectator(player);
+                }
                 if (SPECTATORS.contains(player)) {
                     SPECTATORS.remove(player);
                     newBuilder.add(player);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/OtherTNTListener.java

@@ -0,0 +1,43 @@
+/*
+ *   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.world;
+
+import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+@Linked
+public class OtherTNTListener implements Listener {
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onExplosion(EntityExplodeEvent e) {
+        e.blockList().removeIf(block -> {
+            if(block.getType() == Material.TNT) {
+                return false;
+            } else {
+                block.setType(Material.AIR);
+                return true;
+            }
+        });
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java

@@ -49,7 +49,6 @@ import java.util.Set;
 @Linked
 public class SpectatorListener implements Listener {
 
-    private static final TechHider techHider;
     private static final Set<Player> NO_TECHHIDER = new HashSet<>();
 
     static {
@@ -101,20 +100,10 @@ public class SpectatorListener implements Listener {
         materials.add(Material.WATER);
         materials.remove(Material.BARRIER);
         materials.remove(Material.STONE);
-        techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
-            return Permission.BUILD.hasPermission(player) || NO_TECHHIDER.contains(player);
+        TechHider techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
+            return Permission.BUILD.hasPermission(player) || Permission.isTempOnlySpectator(player) || NO_TECHHIDER.contains(player);
         }, Material.END_STONE, materials, new HashSet<>());
-    }
-
-    private static void enableOrDisableTechhider() {
-        boolean enable = Bukkit.getOnlinePlayers()
-                .stream()
-                .anyMatch(player -> !(Permission.BUILD.hasPermission(player) || NO_TECHHIDER.contains(player)));
-        if (enable) {
-            techHider.enable();
-        } else {
-            techHider.disable();
-        }
+        techHider.enable();
     }
 
     public static void toggleNoTechHider(Player player) {
@@ -124,7 +113,6 @@ public class SpectatorListener implements Listener {
             NO_TECHHIDER.add(player);
         }
         resendChunks(player);
-        enableOrDisableTechhider();
     }
 
     private static void resendChunks(Player player) {
@@ -143,7 +131,6 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        enableOrDisableTechhider();
         if (BauSystem.DEV_SERVER) return;
         if (event.getPlayer().getUniqueId().equals(BauServer.getInstance().getOwner())) {
             return;
@@ -165,7 +152,6 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        enableOrDisableTechhider();
         if (!anySupervisorOnline(null) && !BauSystem.DEV_SERVER) {
             Bukkit.getOnlinePlayers().forEach(player -> {
                 player.kickPlayer("");
@@ -175,6 +161,7 @@ public class SpectatorListener implements Listener {
 
         event.getChanged().forEach(player -> {
             NO_TECHHIDER.remove(player);
+            if (Permission.isTempOnlySpectator(player)) return;
             resendChunks(player);
         });
     }
@@ -182,7 +169,6 @@ public class SpectatorListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         NO_TECHHIDER.remove(event.getPlayer());
-        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), SpectatorListener::enableOrDisableTechhider, 1);
         if (BauSystem.DEV_SERVER) return;
         if (!anySupervisorOnline(event.getPlayer())) {
             Bukkit.getOnlinePlayers().forEach(player -> {

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

@@ -23,7 +23,6 @@ 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;
@@ -36,10 +35,13 @@ 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.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 
@@ -69,23 +71,32 @@ public class SelectAdjacent implements Listener {
             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;
+        Selector selector = selectors.get(event.getPlayer());
+        if (selector != null) selector.cancel();
         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);
+        selectors.put(event.getPlayer(), selector);
     }
 
-    private class Selector implements SWPlayer.Component {
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Selector selector = selectors.remove(event.getPlayer());
+        if (selector != null) selector.cancel();
+    }
+
+    private class Selector {
 
         private static final int MAX_BLOCKS = 500_000;
 
@@ -143,7 +154,6 @@ public class SelectAdjacent implements Listener {
                 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);
         }
@@ -180,10 +190,5 @@ public class SelectAdjacent implements Listener {
                 }
             }
         }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            cancel();
-        }
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java

@@ -104,7 +104,7 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
             if (hidden.containsKey(region) && hidden.get(region).contains(player)) {
                 Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                     PlayerMovementWrapper.impl.setPosition(player, o);
-                }, 0);
+                }, 1L);
                 return null;
             }
             return o;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/cursor/Cursor.java

@@ -0,0 +1,203 @@
+package de.steamwar.bausystem.utils.cursor;
+
+import de.steamwar.bausystem.utils.RayTraceUtils;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RFallingBlockEntity;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.block.Action;
+import org.bukkit.util.Vector;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+
+@Getter
+public abstract class Cursor {
+    private final World WORLD = Bukkit.getWorlds().get(0);
+
+    private final REntityServer targetServer;
+    private final REntityServer cursorServer;
+
+    private final Player owner;
+    private final Material highlightMaterial;
+
+    private RFallingBlockEntity cursorEntity;
+
+    private Location cursorLocation;
+    private boolean isHittingEntity = false;
+
+    @Setter
+    private Material cursorMaterial;
+    @Setter
+    private List<CursorMode> allowedCursorModes;
+    private boolean visible = true;
+
+
+
+    protected Cursor(REntityServer targetServer, Player owner, Material highlightMaterial, Material cursorMaterial, List<CursorMode> allowedModes) {
+        this.targetServer = targetServer;
+        this.owner = owner;
+        this.highlightMaterial = highlightMaterial;
+        this.cursorMaterial = cursorMaterial;
+        this.allowedCursorModes = allowedModes;
+
+        cursorServer = new REntityServer();
+        cursorServer.addPlayer(owner);
+
+        CursorManager.getInstance().registerCursor(this);
+    }
+
+    public void render() {
+        if (!visible)
+            return;
+
+        RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(owner, owner.getLocation(), targetServer.getEntities());
+        if (rayTraceResult == null) {
+            if (cursorEntity != null)
+                cursorEntity.die();
+            cursorEntity = null;
+            return;
+        }
+
+        REntity hitEntity = rayTraceResult.getHitEntity() == cursorEntity ? null : rayTraceResult.getHitEntity();
+
+
+        Material activeCursorMaterial = hitEntity == null ? cursorMaterial : highlightMaterial;
+        CursorMode activeCursorMode = allowedCursorModes.stream().filter((mode) -> mode.isActive.test(owner)).min(Comparator.comparingInt(a -> a.priority))
+                .orElse(CursorMode.BLOCK_ALIGNED);
+
+        Location activeCursorLocation = hitEntity == null ? activeCursorMode.positionTransform.apply(owner, rayTraceResult).toLocation(WORLD)
+                : new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()).toLocation(WORLD);
+
+        cursorLocation = activeCursorLocation;
+        isHittingEntity = hitEntity != null;
+
+        if (cursorEntity == null) {
+            cursorEntity = new RFallingBlockEntity(cursorServer, activeCursorLocation, activeCursorMaterial);
+            cursorEntity.setNoGravity(true);
+        } else if (cursorEntity.getMaterial() == activeCursorMaterial) {
+            cursorEntity.move(activeCursorLocation);
+        } else {
+            cursorEntity.die();
+            cursorEntity = new RFallingBlockEntity(cursorServer, activeCursorLocation, activeCursorMaterial);
+            cursorEntity.setNoGravity(true);
+            if (activeCursorMaterial == highlightMaterial) {
+                cursorEntity.setGlowing(true);
+            }
+        }
+    }
+
+    public void hide() {
+        visible = false;
+        if (cursorEntity != null) {
+            cursorEntity.die();
+            cursorEntity = null;
+        }
+    }
+
+    public void show() {
+        visible = true;
+    }
+
+    final void handleClick(Action action) {
+        if (!visible)
+            return;
+
+        onClick(Optional.ofNullable(this.cursorLocation), isHittingEntity, action);
+    }
+
+    public void close() {
+        cursorServer.close();
+        CursorManager.getInstance().unregisterCursor(this);
+    }
+
+    @AllArgsConstructor
+    public enum CursorMode {
+        FREE(1, (player, rayTraceResult) -> {
+            Vector pos = rayTraceResult.getHitPosition();
+
+            BlockFace face = rayTraceResult.getHitBlockFace();
+            if (face != null) {
+                switch (face) {
+                    case DOWN:
+                        pos.setY(pos.getY() - 0.98);
+                        break;
+                    case EAST:
+                        pos.setX(pos.getX() + 0.49);
+                        break;
+                    case WEST:
+                        pos.setX(pos.getX() - 0.49);
+                        break;
+                    case NORTH:
+                        pos.setZ(pos.getZ() - 0.49);
+                        break;
+                    case SOUTH:
+                        pos.setZ(pos.getZ() + 0.49);
+                        break;
+                    default:
+                        break;
+                }
+
+                if (face.getModY() == 0 && player.isSneaking()) {
+                    pos.setY(pos.getY() - 0.49);
+                }
+            }
+
+            return pos;
+        }, (player) -> player.isSneaking()),
+
+        BLOCK_ALIGNED(0, (player, rayTraceResult) -> {
+            Vector pos = rayTraceResult.getHitPosition();
+
+            BlockFace face = rayTraceResult.getHitBlockFace();
+            if (face != null) {
+                switch (face) {
+                    case DOWN:
+                        pos.setY(pos.getY() - 0.98);
+                        break;
+                    case EAST:
+                        pos.setX(pos.getX() + 0.49);
+                        break;
+                    case WEST:
+                        pos.setX(pos.getX() - 0.49);
+                        break;
+                    case NORTH:
+                        pos.setZ(pos.getZ() - 0.49);
+                        break;
+                    case SOUTH:
+                        pos.setZ(pos.getZ() + 0.49);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            pos.setX(pos.getBlockX() + 0.5);
+            if (pos.getY() - pos.getBlockY() != 0 && face == BlockFace.UP) {
+                pos.setY(pos.getBlockY() + 1.0);
+            } else {
+                pos.setY(pos.getBlockY());
+            }
+            pos.setZ(pos.getBlockZ() + 0.5);
+            return pos;
+        }, (player) -> true);
+
+
+        private final int priority;
+        private final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> positionTransform;
+        private final Predicate<Player> isActive;
+    }
+
+    public abstract void onClick(Optional<Location> cursorLocation, boolean didHitEntity, Action action);
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/cursor/CursorManager.java

@@ -0,0 +1,118 @@
+package de.steamwar.bausystem.utils.cursor;
+
+import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.linkage.Linked;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+@Linked
+public class CursorManager implements Listener {
+    @Getter
+    private static CursorManager instance;
+
+    private final Set<Player> calculationActive = new HashSet<>();
+    private final Map<Player, List<Cursor>> activeCursors = new HashMap<>();
+
+    public CursorManager() {
+        if (instance == null) {
+            instance = this;
+        }
+
+        BiFunction<Player, Object, Object> function = (player, object) -> {
+            updateCursors(player);
+            return object;
+        };
+
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            Set<Player> playersWithActiveCursor = activeCursors.keySet();
+
+            playersWithActiveCursor.forEach(this::updateCursors);
+        }, 0);
+
+        Class<?> positionPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
+        Class<?> lookPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot");
+        Class<?> positionLookPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
+
+        TinyProtocol.instance.addFilter(positionPacketClass, function);
+        TinyProtocol.instance.addFilter(lookPacketClass, function);
+        TinyProtocol.instance.addFilter(positionLookPacketClass, function);
+    }
+
+    void registerCursor(Cursor cursor) {
+        List<Cursor> cursorsOfPlayer = activeCursors.getOrDefault(cursor.getOwner(), new ArrayList<>());
+        cursorsOfPlayer.add(cursor);
+        activeCursors.put(cursor.getOwner(), cursorsOfPlayer);
+    }
+
+    void unregisterCursor(Cursor cursor) {
+        List<Cursor> cursorsOfPlayer = activeCursors.get(cursor.getOwner());
+        if (cursorsOfPlayer != null) {
+            cursorsOfPlayer.remove(cursor);
+            if (cursorsOfPlayer.isEmpty()) {
+                activeCursors.remove(cursor.getOwner());
+            }
+        }
+    }
+
+    private void closeCursorsOf(Player player) {
+        List<Cursor> cursorsOfPlayer = activeCursors.remove(player);
+        if (cursorsOfPlayer != null) {
+            new ArrayList<>(cursorsOfPlayer).forEach(Cursor::close);
+        }
+
+    }
+
+
+    private void updateCursors(Player player) {
+        if (!activeCursors.containsKey(player)) {
+            return;
+        }
+
+        synchronized (calculationActive) {
+            if (calculationActive.contains(player)) {
+                return;
+            } else {
+                calculationActive.add(player);
+            }
+        }
+
+        List<Cursor> cursors = activeCursors.get(player);
+
+        if (cursors != null) {
+            cursors.forEach(Cursor::render);
+        }
+
+        synchronized (calculationActive) {
+            calculationActive.remove(player);
+        }
+    }
+
+    @EventHandler
+    private void handlePlayerInteract(PlayerInteractEvent event) {
+        Player player = event.getPlayer();
+
+        List<Cursor> cursorsOfPlayer = activeCursors.get(player);
+        if (cursorsOfPlayer != null) {
+            cursorsOfPlayer.forEach(cursor -> cursor.handleClick(event.getAction()));
+        }
+    }
+
+    @EventHandler
+    private void handlePlayerQuit(PlayerQuitEvent event) {
+        closeCursorsOf(event.getPlayer());
+    }
+}

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java

@@ -84,12 +84,7 @@ public class FixedFlagStorage implements FlagStorage {
 
     @Override
     public void clear() {
-        for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.TESTBLOCK) continue;
-            if (flag == Flag.COLOR) continue;
-            if (flag == Flag.CHANGED) continue;
-            flagMap.remove(flag);
-        }
+        flagMap.clear();
     }
 
     @Override

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java

@@ -91,12 +91,7 @@ public class FixedGlobalFlagStorage implements FlagStorage {
 
     @Override
     public void clear() {
-        for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.TESTBLOCK) continue;
-            if (flag == Flag.COLOR) continue;
-            if (flag == Flag.CHANGED) continue;
-            flagMap.remove(flag);
-        }
+        flagMap.clear();
     }
 
     @Override

BauSystem/build.gradle.kts

@@ -50,6 +50,5 @@ tasks.register<DevServer>("DevBau21") {
     description = "Run a 1.21 Dev Bau"
     dependsOn(":SpigotCore:shadowJar")
     dependsOn(":BauSystem:shadowJar")
-    dependsOn(":SchematicSystem:shadowJar")
     template = "Bau21"
 }

CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java

@@ -1,20 +1,18 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ * 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 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.
+ * 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/>.
+ * 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.linkage;
@@ -32,6 +30,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public abstract class AbstractLinker<T> {
@@ -52,16 +51,13 @@ public abstract class AbstractLinker<T> {
         List<Class<?>> classes;
         try {
             classes = new BufferedReader(new InputStreamReader(plugin.getClass().getResourceAsStream("/META-INF/annotations/de.steamwar.linkage.Linked")))
-                    .lines()
-                    .map(s -> {
+                    .lines().map(s -> {
                         try {
                             return Class.forName(s, false, plugin.getClass().getClassLoader());
                         } catch (ClassNotFoundException | NoClassDefFoundError e) {
                             throw new SecurityException(e.getMessage(), e);
                         }
-                    })
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
+                    }).filter(Objects::nonNull).collect(Collectors.toList());
         } catch (SecurityException e) {
             Throwable cause = e.getCause();
             throw new LinkException(cause.getMessage(), cause);
@@ -71,12 +67,15 @@ public abstract class AbstractLinker<T> {
             classes.forEach(clazz -> {
                 MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
                 MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
-                if (!versionCheck(clazz, minVersion, maxVersion)) return;
+                if (!versionCheck(clazz, minVersion, maxVersion))
+                    return;
                 EventMode eventMode = clazz.getAnnotation(EventMode.class);
-                if (!eventModeCheck(clazz, eventMode)) return;
+                if (!eventModeCheck(clazz, eventMode))
+                    return;
                 PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
                 for (PluginCheck pluginCheck : pluginChecks) {
-                    if (!pluginCheck(clazz, pluginCheck)) return;
+                    if (!pluginCheck(clazz, pluginCheck))
+                        return;
                 }
 
                 Object any;
@@ -157,12 +156,14 @@ public abstract class AbstractLinker<T> {
     /**
      * There is no need in calling {@link Enable#enable()} by this method.
      */
-    protected void linkObject(Object any) {
-    }
+    protected void linkObject(Object any) {}
 
     /**
      * There is no need in calling {@link Disable#disable()} ()} by this method.
      */
-    protected void unlinkObject(Object any) {
+    protected void unlinkObject(Object any) {}
+
+    public final <L> Optional<L> get(Class<L> clazz) {
+        return Optional.ofNullable((L) instances.get(clazz));
     }
 }

CommonCore/SQL/build.gradle.kts

@@ -18,26 +18,11 @@
  */
 
 plugins {
-    steamwar.kotlin
-}
-
-kotlin {
-    jvmToolchain(8)
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    steamwar.java
 }
 
 dependencies {
     compileOnly(libs.sqlite)
 
     implementation("org.yaml:snakeyaml:2.2")
-
-    compileOnlyApi("org.jetbrains.kotlin:kotlin-stdlib:2.2.21")
-    compileOnlyApi(libs.exposedCore)
-    compileOnlyApi(libs.exposedDao)
-    compileOnlyApi(libs.exposedJdbc)
-    compileOnlyApi(libs.exposedTime)
-}
+}

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

@@ -0,0 +1,125 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SqlTypeMapper;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NonNull;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+
+@AllArgsConstructor
+public class AuditLog {
+
+    static {
+        SqlTypeMapper.nameEnumMapper(AuditLog.Type.class);
+    }
+
+    public static final String SERVER_NAME_VELOCITY = "Velocity";
+
+    private static final Table<AuditLog> table = new Table<>(AuditLog.class);
+
+    private static final Statement create = table.insertFields(true, "time", "serverName", "serverOwner", "actor", "actionType", "actionText");
+
+    @Getter
+    @Field
+    private final Timestamp time;
+
+    @Getter
+    @Field
+    private final String serverName;
+
+    @Field(nullable = true)
+    private final int serverOwner;
+
+    @Field
+    private final int actor;
+
+    @Getter
+    @Field
+    private final Type actionType;
+
+    @Getter
+    @Field
+    private final String actionText;
+
+    public enum Type {
+        JOIN,
+        LEAVE,
+        COMMAND,
+        SENSITIVE_COMMAND,
+
+        CHAT,
+        GUI_OPEN,
+        GUI_CLOSE,
+        GUI_CLICK,
+    }
+
+    private static void create(String serverName, SteamwarUser serverOwner, SteamwarUser actor, Type actionType, String text) {
+        create.insertGetKey(Timestamp.from(Instant.now()), serverName, serverOwner, actor, actionType, text);
+    }
+
+    public static void createJoin(@NonNull String jointServerName, SteamwarUser serverOwner, @NonNull SteamwarUser joinedPlayer) {
+        create(jointServerName, serverOwner, joinedPlayer, Type.JOIN, "");
+    }
+
+    public static void createLeave(@NonNull String leftServerName, SteamwarUser serverOwner, @NonNull SteamwarUser joinedPlayer) {
+        create(leftServerName, serverOwner, joinedPlayer, Type.LEAVE, "");
+    }
+
+    public static void createCommand(@NonNull String serverName, SteamwarUser serverOwner, SteamwarUser player, @NonNull String command) {
+        if (player == null) return;
+        create(serverName, serverOwner, player, Type.COMMAND, command);
+    }
+
+    public static void createSensitiveCommand(@NonNull String serverName, SteamwarUser serverOwner, SteamwarUser player, @NonNull String command) {
+        if (player == null) return;
+        create(serverName, serverOwner, player, Type.SENSITIVE_COMMAND, command);
+    }
+
+    public static void createChat(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser chatter, @NonNull String chat) {
+        create(serverName, serverOwner, chatter, Type.CHAT, chat);
+    }
+
+    public static void createGuiOpen(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName) {
+        create(serverName, serverOwner, player, Type.GUI_OPEN, guiName);
+    }
+
+    public static void createGuiClick(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName, @NonNull String clickType, int slot, @NonNull String itemName) {
+        create(serverName, serverOwner, player, Type.GUI_CLICK, "Gui: " + guiName + "\nSlot: " + slot + "\nClickType: " + clickType + "\nItemName: " + itemName);
+    }
+
+    public static void createGuiClose(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName) {
+        create(serverName, serverOwner, player, Type.GUI_CLOSE, guiName);
+    }
+
+    public SteamwarUser getServerOwner() {
+        return SteamwarUser.get(serverOwner);
+    }
+
+    public SteamwarUser getActor() {
+        return SteamwarUser.get(actor);
+    }
+}

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

@@ -1,121 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.dao.IntEntity
-import org.jetbrains.exposed.v1.dao.IntEntityClass
-import org.jetbrains.exposed.v1.javatime.timestamp
-import java.time.Instant
-
-object AuditLogTable: IntIdTable("AuditLog", "AuditLogId") {
-    val time = timestamp("Time")
-    val server = varchar("ServerName", 255)
-    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable()
-    val actor = reference("Actor", SteamwarUserTable)
-    val action = enumerationByName("ActionType", 255, AuditLog.Type::class)
-    val actionText = text("ActionText")
-}
-
-class AuditLog(id: EntityID<Int>): IntEntity(id) {
-    companion object: IntEntityClass<AuditLog>(AuditLogTable) {
-        const val SERVER_NAME_VELOCITY: String = "Velocity"
-
-        private fun create(
-            serverName: String,
-            serverOwner: SteamwarUser?,
-            actor: SteamwarUser,
-            actionType: Type,
-            text: String = ""
-        ) = useDb {
-            new {
-                this.time = Instant.now()
-                this.server = serverName
-                this.serverOwner = serverOwner?.id
-                this.actor = actor.id
-                this.action = actionType
-                this.actionText = text
-            }
-        }
-
-        @JvmStatic
-        fun createJoin(jointServerName: String, serverOwner: SteamwarUser?, joinedPlayer: SteamwarUser) = create(jointServerName, serverOwner, joinedPlayer, Type.JOIN)
-
-        @JvmStatic
-        fun createLeave(leftServerName: String, serverOwner: SteamwarUser?, joinedPlayer: SteamwarUser) = create(leftServerName, serverOwner, joinedPlayer, Type.LEAVE)
-
-        @JvmStatic
-        fun createCommand(serverName: String, serverOwner: SteamwarUser?, player: SteamwarUser?, command: String) = player?.let { create(serverName, serverOwner, it, Type.COMMAND, command) }
-
-        @JvmStatic
-        fun createSensitiveCommand(
-            serverName: String,
-            serverOwner: SteamwarUser?,
-            player: SteamwarUser?,
-            command: String
-        ) = player?.let { create(serverName, serverOwner, it, Type.SENSITIVE_COMMAND, command) }
-
-        @JvmStatic
-        fun createChat(serverName: String, serverOwner: SteamwarUser?, chatter: SteamwarUser, chat: String) = create(serverName, serverOwner, chatter, Type.CHAT, chat)
-
-        @JvmStatic
-        fun createGuiOpen(serverName: String, serverOwner: SteamwarUser?, player: SteamwarUser, guiName: String) = create(serverName, serverOwner, player, Type.GUI_OPEN, guiName)
-
-        @JvmStatic
-        fun createGuiClick(
-            serverName: String,
-            serverOwner: SteamwarUser?,
-            player: SteamwarUser,
-            guiName: String,
-            clickType: String,
-            slot: Int,
-            itemName: String
-        ) = create(
-            serverName,
-            serverOwner,
-            player,
-            Type.GUI_CLICK,
-            "Gui: $guiName\nSlot: $slot\nClickType: $clickType\nItemName: $itemName"
-        )
-
-        @JvmStatic
-        fun createGuiClose(serverName: String, serverOwner: SteamwarUser?, player: SteamwarUser, guiName: String) = create(serverName, serverOwner, player, Type.GUI_CLOSE, guiName)
-    }
-
-    var time by AuditLogTable.time
-    var server by AuditLogTable.server
-    var serverOwner by AuditLogTable.serverOwner
-    var actor by AuditLogTable.actor
-    var action by AuditLogTable.action
-    var actionText by AuditLogTable.actionText
-
-    enum class Type {
-        JOIN,
-        LEAVE,
-        COMMAND,
-        SENSITIVE_COMMAND,
-        CHAT,
-        GUI_OPEN,
-        GUI_CLOSE,
-        GUI_CLICK,
-    }
-}

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

@@ -0,0 +1,67 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.List;
+
+@AllArgsConstructor
+public class BannedUserIPs {
+
+    private static final Table<BannedUserIPs> table = new Table<>(BannedUserIPs.class);
+
+    private static final SelectStatement<BannedUserIPs> getByID = table.selectFields("UserID");
+    private static final SelectStatement<BannedUserIPs> getByIP = new SelectStatement<>(table, "SELECT * FROM BannedUserIPs WHERE IP = ? ORDER BY Timestamp DESC");
+    private static final Statement banIP = table.insertAll();
+    private static final Statement unbanIPs = table.deleteFields("UserID");
+
+    @Getter
+    @Field(keys = {Table.PRIMARY})
+    private final int userID;
+    @Getter
+    @Field(def = "CURRENT_TIMESTAMP")
+    private final Timestamp timestamp;
+    @Field(keys = {Table.PRIMARY})
+    private final String ip;
+
+    public static List<BannedUserIPs> get(int userID) {
+        return getByID.listSelect(userID);
+    }
+
+    public static List<BannedUserIPs> get(String ip) {
+        return getByIP.listSelect(ip);
+    }
+
+    public static void banIP(int userID, String ip){
+        banIP.update(userID, Timestamp.from(Instant.now()), ip);
+    }
+
+    public static void unbanIPs(int userID) {
+        unbanIPs.update(userID);
+    }
+}

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

@@ -1,78 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.dao.id.CompositeID
-import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.dao.CompositeEntity
-import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.javatime.timestamp
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.insertIgnore
-import java.sql.Timestamp
-import java.time.Instant
-
-object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
-    val userId = reference("UserID", SteamwarUserTable)
-    val timestamp = timestamp("Timestamp")
-    val ip = varchar("IP", 45)
-
-    override val primaryKey = PrimaryKey(userId, ip)
-}
-
-class BannedUserIPs(id: EntityID<CompositeID>): CompositeEntity(id) {
-    companion object: CompositeEntityClass<BannedUserIPs>(BannedUserIPsTable) {
-
-        @JvmStatic
-        fun get(userId: Int) = useDb {
-            find { BannedUserIPsTable.userId eq userId }.toList()
-        }
-
-        @JvmStatic
-        fun get(ip: String) = useDb {
-            find { BannedUserIPsTable.ip eq ip }.toList()
-        }
-
-        @JvmStatic
-        fun banIP(userId: Int, ip: String) = useDb {
-            BannedUserIPsTable.insertIgnore {
-                it[BannedUserIPsTable.userId] = userId
-                it[BannedUserIPsTable.ip] = ip
-                it[BannedUserIPsTable.timestamp] = Instant.now()
-            }
-        }
-
-        @JvmStatic
-        fun unbanIPs(userId: Int) = useDb {
-            BannedUserIPsTable.deleteWhere { BannedUserIPsTable.userId eq userId }
-        }
-    }
-
-    val userID by BannedUserIPsTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
-    val timestamp: Timestamp by BannedUserIPsTable.timestamp.transform({ it.toInstant() }, { Timestamp.from(it) })
-    val ip by BannedUserIPsTable.ip
-
-    fun remove() = useDb {
-        delete()
-    }
-}

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

@@ -0,0 +1,123 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.Getter;
+
+import java.util.*;
+
+public class BauweltMember {
+    private static final Map<Integer, BauweltMember> memberCache = new HashMap<>();
+
+    public static void clear() {
+        memberCache.clear();
+    }
+
+    private static final Table<BauweltMember> table = new Table<>(BauweltMember.class);
+    private static final SelectStatement<BauweltMember> getMember = table.select(Table.PRIMARY);
+    private static final SelectStatement<BauweltMember> getMembers = table.selectFields("BauweltID");
+    private static final Statement update = table.insertAll();
+    private static final Statement delete = table.delete(Table.PRIMARY);
+
+    public static void addMember(UUID ownerID, UUID memberID) {
+        new BauweltMember(SteamwarUser.get(ownerID).getId(), SteamwarUser.get(memberID).getId(), false, false).updateDB();
+    }
+
+    public static BauweltMember getBauMember(UUID ownerID, UUID memberID){
+        return getBauMember(SteamwarUser.get(ownerID).getId(), SteamwarUser.get(memberID).getId());
+    }
+
+    public static BauweltMember getBauMember(int ownerID, int memberID){
+        BauweltMember member = memberCache.get(memberID);
+        if(member != null && member.bauweltID == ownerID)
+            return member;
+        return getMember.select(ownerID, memberID);
+    }
+
+    public static List<BauweltMember> getMembers(UUID bauweltID){
+        return getMembers(SteamwarUser.get(bauweltID).getId());
+    }
+
+    public static List<BauweltMember> getMembers(int bauweltID){
+        return getMembers.listSelect(bauweltID);
+    }
+
+    @Getter
+    @Field(keys = {Table.PRIMARY})
+    private final int bauweltID;
+    @Getter
+    @Field(keys = {Table.PRIMARY})
+    private final int memberID;
+    @Getter
+    @Field(def = "0")
+    private boolean worldEdit;
+    @Getter
+    @Field(def = "0")
+    private boolean world;
+
+    public BauweltMember(int bauweltID, int memberID, boolean worldEdit, boolean world) {
+        this.bauweltID = bauweltID;
+        this.memberID = memberID;
+        this.worldEdit = worldEdit;
+        this.world = world;
+        memberCache.put(memberID, this);
+    }
+
+    public void setWorldEdit(boolean worldEdit) {
+        this.worldEdit = worldEdit;
+        updateDB();
+    }
+
+    public void setWorld(boolean world) {
+        this.world = world;
+        updateDB();
+    }
+
+    private void updateDB(){
+        update.update(bauweltID, memberID, worldEdit, world);
+    }
+
+    public void remove(){
+        delete.update(bauweltID, memberID);
+        memberCache.remove(memberID);
+    }
+
+    public boolean isBuild() {
+        return worldEdit;
+    }
+
+    public boolean isSupervisor() {
+        return world;
+    }
+
+    public void setBuild(boolean build) {
+        this.worldEdit = build;
+        updateDB();
+    }
+
+    public void setSupervisor(boolean supervisor) {
+        this.world = supervisor;
+        updateDB();
+    }
+}

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

@@ -1,130 +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.sql
-
-import de.steamwar.sql.BauweltMemberTable.bauweltId
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.dao.id.CompositeID
-import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.dao.CompositeEntity
-import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.jdbc.insertIgnore
-import java.util.*
-
-object BauweltMemberTable: CompositeIdTable("BauweltMember") {
-    val bauweltId = reference("BauweltID", SteamwarUserTable)
-    val memberId = reference("MemberID", SteamwarUserTable)
-    val build = bool("Build")
-    val worldEdit = bool("WorldEdit")
-    val world = bool("World")
-
-    override val primaryKey = PrimaryKey(bauweltId, memberId)
-
-    init {
-        addIdColumn(bauweltId)
-        addIdColumn(memberId)
-    }
-}
-
-class BauweltMember(id: EntityID<CompositeID>): CompositeEntity(id) {
-    companion object: CompositeEntityClass<BauweltMember>(BauweltMemberTable) {
-        private val cache = mutableMapOf<Int, BauweltMember>()
-
-        private fun cache(member: BauweltMember) = cache.put(member.memberID, member)
-
-        @JvmStatic
-        fun clear() = cache.clear()
-
-        @JvmStatic
-        @Deprecated("Use addMember(ownerId: Int, newMemberId: Int)")
-        fun addMember(ownerId: UUID, newMemberId: UUID) = addMember(SteamwarUser.get(ownerId)!!.id, SteamwarUser.get(newMemberId)!!.id)
-
-        @JvmStatic
-        fun addMember(ownerId: Int, newMemberId: Int) = addMember(EntityID(ownerId, SteamwarUserTable), EntityID(newMemberId, SteamwarUserTable))
-
-        fun addMember(ownerId: EntityID<Int>, newMemberId: EntityID<Int>) = useDb {
-            BauweltMemberTable.insertIgnore {
-                it[bauweltId] = ownerId
-                it[memberId] = newMemberId
-                it[build] = false
-                it[worldEdit] = false
-                it[world] = false
-            }
-        }
-
-        @JvmStatic
-        @Deprecated("Use getBauMember(bauwelt: Int, member: Int)")
-        fun getBauMember(bauwelt: UUID, member: UUID) = useDb {
-            find { (bauweltId eq SteamwarUser.get(bauwelt)!!.id) and (BauweltMemberTable.memberId eq SteamwarUser.get(member)!!.id) }.firstOrNull()?.also { cache(it) }
-        }
-
-        @JvmStatic
-        fun getBauMember(bauwelt: Int, member: Int) = useDb {
-            find { (bauweltId eq bauwelt) and (BauweltMemberTable.memberId eq member) }.firstOrNull()?.also { cache(it) }
-        }
-
-        @JvmStatic
-        @Deprecated("Use getMembers(bauwelt: Int)")
-        fun getMembers(bauwelt: UUID) = getMembers(SteamwarUser.get(bauwelt)!!.id.value)
-
-        @JvmStatic
-        fun getMembers(bauwelt: Int) = useDb {
-            find { bauweltId eq bauwelt }.toList().also { it.forEach { cache(it) } }
-        }
-    }
-
-    val bauweltID by BauweltMemberTable.bauweltId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
-    val memberID by BauweltMemberTable.memberId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
-    private var worldEditInternal by BauweltMemberTable.worldEdit
-    var worldEdit: Boolean
-        get() = worldEditInternal
-        set(value) = useDb {
-            worldEditInternal = value
-        }
-    private var buildInternal by BauweltMemberTable.build
-    var build: Boolean
-        get() = buildInternal
-        set(value) = useDb {
-            buildInternal = value
-        }
-    private var worldInternal by BauweltMemberTable.world
-    var world: Boolean
-        get() = worldInternal
-        set(value) = useDb {
-            worldInternal = value
-        }
-    var supervisor: Boolean
-        get() = world
-        set(value) = useDb {
-            world = value
-        }
-
-    fun isBuild() = build
-    fun isSupervisor() = world
-    fun isWorldEdit() = build
-    fun isWorld() = world
-
-    fun remove() = useDb {
-        delete()
-    }
-}

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

@@ -0,0 +1,101 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+@AllArgsConstructor
+public class CheckedSchematic {
+
+    private static final Table<CheckedSchematic> table = new Table<>(CheckedSchematic.class);
+    private static final SelectStatement<CheckedSchematic> statusOfNode = new SelectStatement<>(table, "SELECT * FROM CheckedSchematic WHERE NodeId = ? AND DeclineReason != 'Prüfvorgang abgebrochen' ORDER BY EndTime DESC");
+    private static final SelectStatement<CheckedSchematic> nodeHistory = new SelectStatement<>(table, "SELECT * FROM CheckedSchematic WHERE NodeId = ? AND DeclineReason != '' AND DeclineReason != 'Prüfvorgang abgebrochen' ORDER BY EndTime DESC");
+    private static final Statement insert = table.insertAll();
+
+    private static final SelectStatement<CheckedSchematic> getUnseen = new SelectStatement<>(table, "SELECT * FROM CheckedSchematic WHERE Seen = 0 AND NodeOwner = ? ORDER BY StartTime DESC");
+    private static final Statement updateSeen = new Statement("UPDATE CheckedSchematic SET Seen = ? WHERE StartTime = ? AND EndTime = ? AND NodeName = ?");
+
+    public static void create(SchematicNode node, int validator, Timestamp startTime, Timestamp endTime, String reason, boolean seen) {
+        insert.update(node.getId(), node.getOwner(), node.getName(), validator, startTime, endTime, reason, seen, node.getSchemtype().toDB().substring(1));
+    }
+
+    public static List<CheckedSchematic> getLastDeclinedOfNode(int node) {
+        return statusOfNode.listSelect(node);
+    }
+
+    public static List<CheckedSchematic> previousChecks(SchematicNode node) {
+        return nodeHistory.listSelect(node.getId());
+    }
+
+    public static List<CheckedSchematic> getUnseen(SteamwarUser owner) {
+        return getUnseen.listSelect(owner);
+    }
+
+    @Field(nullable = true)
+    private final Integer nodeId;
+    @Field
+    private final int nodeOwner;
+    @Field
+    private final String nodeName;
+    @Getter
+    @Field
+    private final int validator;
+    @Getter
+    @Field
+    private final Timestamp startTime;
+    @Getter
+    @Field
+    private final Timestamp endTime;
+    @Getter
+    @Field
+    private final String declineReason;
+    @Getter
+    @Field
+    private boolean seen;
+    @Getter
+    @Field
+    private final String nodeType;
+
+    public int getNode() {
+        return nodeId;
+    }
+
+    public String getSchemName() {
+        return nodeName;
+    }
+
+    public int getSchemOwner() {
+        return nodeOwner;
+    }
+
+    public void setSeen(boolean seen) {
+        this.seen = seen;
+        updateSeen.update(seen, startTime, endTime, nodeName);
+    }
+}

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

@@ -1,100 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.SortOrder
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.dao.id.CompositeID
-import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.core.neq
-import org.jetbrains.exposed.v1.dao.CompositeEntity
-import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.javatime.timestamp
-import org.jetbrains.exposed.v1.jdbc.insertIgnore
-import java.sql.Timestamp
-
-object CheckedSchematicTable: CompositeIdTable("CheckedSchematic") {
-    val nodeId = optReference("NodeId", SchematicNodeTable)
-    val nodeOwner = reference("NodeOwner", SteamwarUserTable)
-    val nodeName = varchar("NodeName", 64).entityId()
-    val validator = reference("Validator", SteamwarUserTable)
-    val startTime = timestamp("StartTime").entityId()
-    val endTime = timestamp("EndTime")
-    val declineReason = text("DeclineReason")
-    val seen = bool("Seen")
-    val nodeType = varchar("NodeType", 16)
-
-    init {
-        addIdColumn(nodeOwner)
-        addIdColumn(nodeName)
-    }
-}
-
-class CheckedSchematic(id: EntityID<CompositeID>): CompositeEntity(id) {
-    companion object: CompositeEntityClass<CheckedSchematic>(CheckedSchematicTable) {
-        @JvmStatic
-        fun create(node: SchematicNode, validator: Int, startTime: Timestamp, endTime: Timestamp, reason: String, seen: Boolean) = useDb {
-            CheckedSchematicTable.insertIgnore {
-                it[this.nodeId] = node.id
-                it[this.nodeOwner] = EntityID(node.owner, SteamwarUserTable)
-                it[this.nodeName] = node.name
-                it[this.validator] = EntityID(validator, SteamwarUserTable)
-                it[this.startTime] = startTime.toInstant()
-                it[this.endTime] = endTime.toInstant()
-                it[this.declineReason] = reason
-                it[this.seen] = seen
-                it[this.nodeType] = node.schemtype.toDB().substring(1)
-            }
-        }
-
-        @JvmStatic
-        fun getLastDeclinedOfNode(node: Int) = useDb {
-            find { (CheckedSchematicTable.nodeId eq node) and (CheckedSchematicTable.declineReason neq "Prüfvorgang abgebrochen") }.orderBy(CheckedSchematicTable.endTime to SortOrder.DESC).toList()
-        }
-
-        @JvmStatic
-        fun previousChecks(node: SchematicNode) = useDb {
-            find { (CheckedSchematicTable.nodeId eq node.id) and (CheckedSchematicTable.declineReason neq "") and (CheckedSchematicTable.declineReason neq "Prüfvorgang abgebrochen") }.orderBy(CheckedSchematicTable.endTime to SortOrder.DESC).toList()
-        }
-
-        @JvmStatic
-        fun getUnseen(owner: SteamwarUser) = useDb {
-            find { (CheckedSchematicTable.nodeOwner eq owner.id) and (CheckedSchematicTable.seen eq false) }.orderBy(CheckedSchematicTable.endTime to SortOrder.DESC).toList()
-        }
-    }
-
-    val node by CheckedSchematicTable.nodeId.transform({ it?.let { EntityID(it, SchematicNodeTable) } }, { it?.value })
-    val schemOwner by CheckedSchematicTable.nodeOwner.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
-    val nodeName by CheckedSchematicTable.nodeName
-    val schemName get() = nodeName.value
-    val validator by CheckedSchematicTable.validator.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
-    val startTimeId by CheckedSchematicTable.startTime
-    val startTime get() = Timestamp.from(startTimeId.value)
-    val endTime by CheckedSchematicTable.endTime.transform({ it.toInstant() }, { Timestamp.from(it) })
-    val declineReason by CheckedSchematicTable.declineReason
-    private var wasSeen by CheckedSchematicTable.seen
-    var seen: Boolean
-        get() = wasSeen
-        set(value) = useDb { wasSeen = value }
-    val nodeType by CheckedSchematicTable.nodeType
-}

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

@@ -0,0 +1,125 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.List;
+
+@AllArgsConstructor
+public class Event {
+
+    static {
+        SchematicType.Normal.name(); // Ensure SchematicType is loaded.
+    }
+
+    private static final Table<Event> table = new Table<>(Event.class);
+
+    private static final SelectStatement<Event> byCurrent = new SelectStatement<>(table, "SELECT * FROM Event WHERE Start < now() AND End > now()");
+    private static final SelectStatement<Event> byId = table.select(Table.PRIMARY);
+    private static final SelectStatement<Event> byName = table.select("eventName");
+    private static final SelectStatement<Event> byComing = new SelectStatement<>(table, "SELECT * FROM Event WHERE Start > now()");
+    private static final SelectStatement<Event> all = new SelectStatement<>(table, "SELECT * FROM Event");
+
+    private static final Statement create = table.insertFields(true, "eventName", "deadline", "start", "end", "maximumTeamMembers", "publicSchemsOnly");
+    private static final Statement update = table.update(Table.PRIMARY, "eventName", "deadline", "start", "end", "schemType", "maximumTeamMembers", "publicSchemsOnly");
+    private static final Statement delete = table.delete(Table.PRIMARY);
+
+    private static Event current = null;
+
+    public static Event get(){
+        if(current != null && current.now())
+            return current;
+
+        current = byCurrent.select();
+        return current;
+    }
+
+    public static List<Event> getAll(){
+        return all.listSelect();
+    }
+
+    public static Event create(String eventName, Timestamp start, Timestamp end){
+        return get(create.insertGetKey(eventName, start, start, end, 5, false));
+    }
+
+    public static Event get(int eventID){
+        return byId.select(eventID);
+    }
+
+    public static Event get(String eventName) {
+        return byName.select(eventName);
+    }
+
+    public static List<Event> getComing() {
+        return byComing.listSelect();
+    }
+
+    @Getter
+    @Field(keys = {Table.PRIMARY}, autoincrement = true)
+    private final int eventID;
+    @Getter
+    @Field(keys = {"eventName"})
+    private final String eventName;
+    @Getter
+    @Field
+    private final Timestamp deadline;
+    @Getter
+    @Field
+    private final Timestamp start;
+    @Getter
+    @Field
+    private final Timestamp end;
+    @Getter
+    @Field
+    private final int maximumTeamMembers;
+    @Field(nullable = true)
+    private final SchematicType schemType;
+    @Field
+    private final boolean publicSchemsOnly;
+
+    public boolean publicSchemsOnly() {
+        return publicSchemsOnly;
+    }
+
+    public SchematicType getSchematicType() {
+        return schemType;
+    }
+
+    private boolean now() {
+        Instant now = Instant.now();
+        return now.isAfter(start.toInstant()) && now.isBefore(end.toInstant());
+    }
+
+    public void update(String eventName, Timestamp deadline, Timestamp start, Timestamp end, SchematicType schemType, int maximumTeamMembers, boolean publicSchemsOnly) {
+        update.update(eventName, deadline, start, end, schemType, maximumTeamMembers, publicSchemsOnly, eventID);
+    }
+
+    public void delete() {
+        delete.update(eventID);
+    }
+}

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

@@ -1,121 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.core.greater
-import org.jetbrains.exposed.v1.core.lessEq
-import org.jetbrains.exposed.v1.dao.IntEntity
-import org.jetbrains.exposed.v1.dao.IntEntityClass
-import org.jetbrains.exposed.v1.javatime.timestamp
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
-import java.sql.Timestamp
-import java.time.Instant
-
-object EventTable : IntIdTable("Event", "EventId") {
-    val name = varchar("EventName", 100).uniqueIndex()
-    val deadline = timestamp("Deadline")
-    val start = timestamp("Start")
-    val end = timestamp("End")
-    val maxPlayers = integer("MaximumTeamMembers")
-    val schemType = varchar("SchemType", 16).nullable()
-    val publicsOnly = bool("PublicSchemsOnly")
-}
-
-class Event(id: EntityID<Int>) : IntEntity(id) {
-    companion object : IntEntityClass<Event>(EventTable) {
-        private var current: Event? = null
-
-        @JvmStatic
-        fun get(): Event? = if (current?.now() == true) {
-            current
-        } else useDb {
-            find { EventTable.start.lessEq(Instant.now()) and EventTable.end.greater(Instant.now()) }.firstOrNull()
-                ?.also { current == it }
-        }
-
-        @JvmStatic
-        fun getAll() = useDb { all().toList() }
-
-        @JvmStatic
-        fun create(name: String, start: Timestamp, end: Timestamp) = useDb {
-            EventTable.insertAndGetId {
-                it[this.name] = name
-                it[this.deadline] = start.toInstant()
-                it[this.start] = start.toInstant()
-                it[this.end] = end.toInstant()
-                it[this.maxPlayers] = 5
-                it[this.publicsOnly] = false
-            }.let { get(it) }
-        }
-
-        @JvmStatic
-        fun byId(id: Int) = useDb { findById(id) }
-
-        @JvmStatic
-        fun get(name: String) = useDb { find { EventTable.name eq name }.firstOrNull() }
-
-        @JvmStatic
-        fun getComing() = useDb { find { EventTable.start greater Instant.now() }.toList() }
-    }
-
-    val eventID by EventTable.id.transform({ EntityID(it, EventTable) }, { it.value })
-    var eventName by EventTable.name
-        private set
-    var deadline: Timestamp by EventTable.deadline.transform({ it.toInstant() }, { Timestamp.from(it) })
-        private set
-    var start: Timestamp by EventTable.start.transform({ it.toInstant() }, { Timestamp.from(it) })
-        private set
-    var end: Timestamp by EventTable.end.transform({ it.toInstant() }, { Timestamp.from(it) })
-        private set
-    var maximumTeamMembers by EventTable.maxPlayers
-        private set
-    var schematicType by EventTable.schemType.transform({ it?.toDB() }, { it?.let { SchematicType.fromDB(it) } })
-        private set
-    var publicSchemsOnly by EventTable.publicsOnly
-        private set
-
-    fun publicSchemsOnly() = publicSchemsOnly
-    fun now() = Instant.now().let { it.isAfter(start.toInstant()) && it.isBefore(end.toInstant()) }
-
-    fun update(
-        name: String,
-        deadline: Timestamp,
-        start: Timestamp,
-        end: Timestamp,
-        schematicType: SchematicType?,
-        maxPlayers: Int,
-        publicSchemsOnly: Boolean
-    ) = useDb {
-        this@Event.eventName = name
-        this@Event.deadline = deadline
-        this@Event.start = start
-        this@Event.end = end
-        this@Event.maximumTeamMembers = maxPlayers
-        this@Event.schematicType = schematicType
-        this@Event.publicSchemsOnly = publicSchemsOnly
-    }
-
-    override fun delete() = useDb { super.delete() }
-}

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

@@ -0,0 +1,216 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.sql.Timestamp;
+import java.util.*;
+
+import static java.time.temporal.ChronoUnit.SECONDS;
+
+@AllArgsConstructor
+public class EventFight implements Comparable<EventFight> {
+
+    private static final Table<EventFight> table = new Table<>(EventFight.class);
+    private static final SelectStatement<EventFight> byId = table.select(Table.PRIMARY);
+    private static final SelectStatement<EventFight> byGroup = new SelectStatement<EventFight>(table, "SELECT * FROM EventFight WHERE GroupID = ? ORDER BY StartTime ASC");
+    private static final SelectStatement<EventFight> byGroupLast = new SelectStatement<EventFight>(table, "SELECT * FROM EventFight WHERE GroupID = ? ORDER BY StartTime DESC LIMIT 1");
+    private static final SelectStatement<EventFight> allComing = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE StartTime > now() ORDER BY StartTime ASC");
+    private static final SelectStatement<EventFight> event = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID = ? ORDER BY StartTime ASC");
+    private static final SelectStatement<EventFight> activeFights = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID IN (SELECT EventID FROM Event WHERE Start < now() and End > now()) AND Fight IS NULL AND StartTime < now()");
+    private static final Statement reschedule = table.update(Table.PRIMARY, "StartTime");
+    private static final Statement setResult = table.update(Table.PRIMARY, "Ergebnis");
+    private static final Statement setFight = table.update(Table.PRIMARY, "Fight");
+
+    private static final Statement create = table.insertFields(true, "eventID", "startTime", "spielmodus", "map", "teamBlue", "teamRed", "spectatePort");
+    private static final Statement update = table.update(Table.PRIMARY, "startTime", "spielModus", "map", "teamBlue", "teamRed", "spectatePort");
+    private static final Statement setGroup = table.update(Table.PRIMARY, "GroupID");
+    private static final Statement delete = table.delete(Table.PRIMARY);
+
+    @Getter
+    private static final Queue<EventFight> fights = new PriorityQueue<>();
+
+    public static EventFight get(int fightID) {
+        return byId.select(fightID);
+    }
+
+    public static List<EventFight> get(EventGroup group) {
+        return byGroup.listSelect(group.getId());
+    }
+
+    public static Optional<EventFight> getLast(EventGroup group) {
+        return Optional.ofNullable(byGroupLast.select(group.getId()));
+    }
+
+    public static void loadAllComingFights() {
+        fights.clear();
+        fights.addAll(allComing.listSelect());
+    }
+
+    public static List<EventFight> getEvent(int eventID) {
+        return event.listSelect(eventID);
+    }
+
+    private static List<EventFight> activeFightsCache = null;
+
+    public static void clearActiveFightsCache() {
+        activeFightsCache = null;
+    }
+
+    public static List<EventFight> getActiveFights() {
+        if (activeFightsCache == null) {
+            activeFightsCache = activeFights.listSelect();
+        }
+        return activeFightsCache;
+    }
+
+    public static EventFight create(int event, Timestamp from, String spielmodus, String map, int blueTeam, int redTeam, Integer spectatePort) {
+        return get(create.insertGetKey(event, from, spielmodus, map, blueTeam, redTeam, spectatePort));
+    }
+
+    @Getter
+    @Field
+    private final int eventID;
+    @Getter
+    @Field(keys = {Table.PRIMARY}, autoincrement = true)
+    private final int fightID;
+    @Getter
+    @Setter
+    @Field(nullable = true, def = "null")
+    private Integer groupId;
+    @Getter
+    @Setter
+    @Field
+    private Timestamp startTime;
+    @Getter
+    @Setter
+    @Field
+    private String spielmodus;
+    @Getter
+    @Setter
+    @Field
+    private String map;
+    @Getter
+    @Setter
+    @Field
+    private int teamBlue;
+    @Getter
+    @Setter
+    @Field
+    private int teamRed;
+    @Getter
+    @Setter
+    @Field(nullable = true)
+    private Integer spectatePort;
+    @Getter
+    @Setter
+    @Field(def = "1")
+    private int bestOf;
+    @Getter
+    @Field(def = "0")
+    private int ergebnis;
+    @Field(nullable = true)
+    private int fight;
+
+    public Optional<EventGroup> getGroup() {
+        return Optional.ofNullable(groupId).flatMap(EventGroup::get);
+    }
+
+    public Optional<Team> getWinner() {
+        if(ergebnis == 0)
+            return Optional.empty();
+        return Optional.ofNullable(ergebnis == 1 ? Team.get(teamBlue) : Team.get(teamRed));
+    }
+
+    public Optional<Team> getLosser() {
+        if(ergebnis == 0)
+            return Optional.empty();
+        return Optional.ofNullable(ergebnis == 1 ? Team.get(teamRed) : Team.get(teamBlue));
+    }
+
+    public List<EventRelation> getDependents() {
+        return EventRelation.getFightRelations(this);
+    }
+
+    public void setErgebnis(int winner) {
+        this.ergebnis = winner;
+        setResult.update(winner, fightID);
+    }
+
+    public void setFight(int fight) {
+        //Fight.FightID, not EventFight.FightID
+        this.fight = fight;
+        setFight.update(fight, fightID);
+    }
+
+    public void setGroup(Integer group) {
+        setGroup.update(group, fightID);
+        this.groupId = group;
+    }
+
+    public boolean hasFinished() {
+        return fight != 0 || ergebnis != 0;
+    }
+
+    public void reschedule() {
+        startTime = Timestamp.from(new Date().toInstant().plus(30, SECONDS));
+        reschedule.update(startTime, fightID);
+    }
+
+    @Override
+    public int hashCode(){
+        return fightID;
+    }
+
+    @Override
+    public boolean equals(Object o){
+        if(o == null)
+            return false;
+        if(!(o instanceof EventFight))
+            return false;
+        return fightID == ((EventFight) o).fightID;
+    }
+
+    @Override
+    public int compareTo(EventFight o) {
+        return startTime.compareTo(o.startTime);
+    }
+
+    public void update(Timestamp startTime, String spielmodus, String map, int teamBlue, int teamRed, Integer spectatePort) {
+        update.update(startTime, spielmodus, map, teamBlue, teamRed, spectatePort, fightID);
+        this.startTime = startTime;
+        this.spielmodus = spielmodus;
+        this.map = map;
+        this.teamBlue = teamBlue;
+        this.teamRed = teamRed;
+        this.spectatePort = spectatePort;
+    }
+
+    public void delete() {
+        delete.update(fightID);
+    }
+}

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

@@ -1,188 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.*
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.dao.IntEntity
-import org.jetbrains.exposed.v1.dao.IntEntityClass
-import org.jetbrains.exposed.v1.javatime.timestamp
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.select
-import java.sql.Timestamp
-import java.time.Instant
-import java.util.*
-
-object EventFightTable : IntIdTable("EventFight", "FightID") {
-    val eventId = reference("EventID", EventTable)
-    val startTime = timestamp("StartTime")
-    val gamemode = text("Spielmodus")
-    val map = text("Map")
-    val groupId = optReference("GroupId", EventGroupTable)
-    val teamBlue = reference("TeamBlue", TeamTable)
-    val teamRed = reference("TeamRed", TeamTable)
-    val spectatePort = integer("SpectatePort").nullable()
-    val bestOf = integer("BestOf")
-    val ergebnis = integer("Ergebnis")
-    val fight = optReference("Fight", FightTable)
-}
-
-class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {
-    companion object : IntEntityClass<EventFight>(EventFightTable) {
-        val fights: Queue<EventFight> = PriorityQueue()
-            @JvmStatic get
-
-        @JvmStatic
-        fun byId(fightId: Int) = useDb { findById(fightId) }
-
-        @JvmStatic
-        fun byId(group: EventGroup) = useDb {
-            find { EventFightTable.groupId eq group.id }.orderBy(EventFightTable.startTime to SortOrder.DESC).toList()
-        }
-
-        @JvmStatic
-        fun getLast(group: EventGroup) = useDb {
-            Optional.ofNullable(
-                find { EventFightTable.groupId eq group.id }.orderBy(EventFightTable.startTime to SortOrder.DESC)
-                    .firstOrNull()
-            )
-        }
-
-        @JvmStatic
-        fun loadAllComingFights() = useDb {
-            fights.clear()
-            fights.addAll(find { EventFightTable.startTime greaterEq Instant.now() }.orderBy(EventFightTable.startTime to SortOrder.ASC))
-        }
-
-        @JvmStatic
-        fun getEvent(eventId: Int) = useDb {
-            find { EventFightTable.eventId eq eventId }.orderBy(EventFightTable.startTime to SortOrder.ASC).toList()
-        }
-
-        private var activeFightsCache: List<EventFight>? = null
-
-        @JvmStatic
-        fun clearActiveFightsCache() {
-            activeFightsCache = null
-        }
-
-        @JvmStatic
-        fun getActiveFights(): List<EventFight> {
-            if (activeFightsCache == null) {
-                activeFightsCache = useDb {
-                    find {
-                        EventFightTable.fight.isNull() and (EventFightTable.startTime less Instant.now()) and (EventFightTable.eventId.inSubQuery(
-                            EventTable.select(
-                                EventTable.id
-                            )
-                                .where { (EventTable.start less Instant.now()) and (EventTable.end greater Instant.now()) }))
-                    }.orderBy(EventFightTable.startTime to SortOrder.ASC).toList()
-                }
-            }
-
-            return activeFightsCache!!
-        }
-
-        @JvmStatic
-        fun create(
-            event: Int,
-            from: Timestamp,
-            spielmodus: String,
-            map: String,
-            blueTeam: Int,
-            redTeam: Int,
-            spectatePort: Int?
-        ) = useDb {
-            get(
-                EventFightTable.insertAndGetId {
-                    it[eventId] = EntityID(event, EventTable)
-                    it[startTime] = from.toInstant()
-                    it[gamemode] = spielmodus
-                    it[EventFightTable.map] = map
-                    it[teamBlue] = EntityID(blueTeam, TeamTable)
-                    it[teamRed] = EntityID(redTeam, TeamTable)
-                    it[EventFightTable.spectatePort] = spectatePort
-                }
-            )
-        }
-    }
-
-    val fightID by EventFightTable.id.transform({ EntityID(it, EventFightTable) }, { it.value })
-    var teamBlue by EventFightTable.teamBlue.transform({ EntityID(it, TeamTable) }, { it.value })
-    var teamRed by EventFightTable.teamRed.transform({ EntityID(it, TeamTable) }, { it.value })
-    private var fightErgebnis by EventFightTable.ergebnis
-    var ergebnis: Int
-        get() = fightErgebnis
-        set(value) = useDb {
-            fightErgebnis = value
-        }
-    var eventID by EventFightTable.eventId.transform({ EntityID(it, EventTable) }, { it.value })
-    var startTime by EventFightTable.startTime.transform({ it.toInstant() }, { Timestamp.from(it) })
-    var spielmodus by EventFightTable.gamemode
-    var map by EventFightTable.map
-    var groupId by EventFightTable.groupId
-    val group by lazy { useDb { Optional.ofNullable(groupId).map { EventGroup[it] } } }
-    var spectatePort by EventFightTable.spectatePort
-    private var fightStat by EventFightTable.fight.transform({ it?.let { EntityID(it, EventFightTable) } }, { it?.value })
-    var fight: Int?
-        get() = fightStat
-        set(value) = useDb {
-            fightStat = value
-        }
-    val dependents by lazy { useDb { EventRelation.getFightRelations(this@EventFight).toList() } }
-
-    val winner: Team?
-        get() = useDb { if (ergebnis == 1) Team[teamBlue] else if (ergebnis == 2) Team[teamRed] else null }
-    val losser: Team?
-        get() = useDb { if (ergebnis == 1) Team[teamRed] else if (ergebnis == 2) Team[teamBlue] else null }
-
-    fun setGroup(group: Int?) = useDb { groupId = group?.let { EntityID(it, EventGroupTable) } }
-    fun hasFinished() = fight != null || ergebnis != 0
-
-    fun reschedule() = useDb {
-        startTime = Timestamp.from(Instant.now().plusSeconds(30))
-    }
-
-    override fun hashCode() = fightID
-    override fun equals(other: Any?) = other is EventFight && other.fightID == fightID
-    override fun compareTo(other: EventFight): Int = startTime.compareTo(other.startTime)
-
-    fun update(
-        startTime: Timestamp,
-        spielmodus: String,
-        map: String,
-        teamBlue: Int,
-        teamRed: Int,
-        spectatePort: Int?
-    ) = useDb {
-        this@EventFight.startTime = startTime
-        this@EventFight.spielmodus = spielmodus
-        this@EventFight.map = map
-        this@EventFight.teamBlue = teamBlue
-        this@EventFight.teamRed = teamRed
-        this@EventFight.spectatePort = spectatePort
-    }
-
-    override fun delete() = useDb {
-        super.delete()
-    }
-}

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

@@ -0,0 +1,173 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Getter
+@Setter
+public class EventGroup {
+    static {
+        SqlTypeMapper.ordinalEnumMapper(EventGroupType.class);
+    }
+
+    private static final Table<EventGroup> table = new Table<>(EventGroup.class);
+
+    private static final SelectStatement<EventGroup> get = table.select(Table.PRIMARY);
+    private static final SelectStatement<EventGroup> byEvent = new SelectStatement<>(table, "SELECT * FROM EventGroup WHERE EventID = ?");
+
+    private static final Statement insert = table.insertFields(true, "EventID", "Name", "Type");
+    private static final Statement update = table.update(Table.PRIMARY, "Name", "Type", "PointsPerWin", "PointsPerLoss", "PointsPerDraw");
+    private static final Statement delete = table.delete(Table.PRIMARY);
+
+    public static List<EventGroup> get(Event eventID) {
+        return byEvent.listSelect(eventID.getEventID());
+    }
+
+    public static EventGroup create(Event event, String name, EventGroupType type) {
+        int key = insert.insertGetKey(event.getEventID(), name, type);
+        return EventGroup.get(key).get();
+    }
+
+    public static Optional<EventGroup> get(int id) {
+        return Optional.ofNullable(get.select(id));
+    }
+
+    @Field(keys = Table.PRIMARY)
+    private final int id;
+
+    @Field(keys = "EVENT_NAME")
+    private int eventID;
+
+    @Field(keys = "EVENT_NAME")
+    private String name;
+
+    @Field
+    private EventGroupType type;
+
+    @Field
+    private int pointsPerWin;
+
+    @Field
+    private int pointsPerLoss;
+
+    @Field
+    private int pointsPerDraw;
+
+    public EventGroup(int id, int eventID, String name, EventGroupType type, int pointsPerWin, int pointsPerLoss, int pointsPerDraw) {
+        this.id = id;
+        this.eventID = eventID;
+        this.name = name;
+        this.type = type;
+        this.pointsPerWin = pointsPerWin;
+        this.pointsPerLoss = pointsPerLoss;
+        this.pointsPerDraw = pointsPerDraw;
+    }
+
+    private Map<Team, Integer> points;
+
+    public List<EventFight> getFights() {
+        return EventFight.get(this);
+    }
+
+    public Set<Integer> getTeamsId() {
+        return getFights().stream().flatMap(fight -> Stream.of(fight.getTeamBlue(), fight.getTeamRed()))
+                .collect(Collectors.toSet());
+    }
+
+    public Set<Team> getTeams() {
+        return getTeamsId().stream().map(Team::get).collect(Collectors.toSet());
+    }
+
+    public Optional<EventFight> getLastFight() {
+        return EventFight.getLast(this);
+    }
+
+    public List<EventRelation> getDependents() {
+        return EventRelation.getGroupRelations(this);
+    }
+
+    public Map<Team, Integer> calculatePoints() {
+        if (points == null) {
+            Map<Integer, Integer> p = getTeamsId().stream().collect(Collectors.toMap(team -> team, team -> 0));
+
+            for (EventFight fight : getFights()) {
+                int blueTeamAdd = 0;
+                int redTeamAdd = 0;
+
+                if (!fight.hasFinished()) {
+                    continue;
+                }
+
+                switch (fight.getErgebnis()) {
+                    case 1:
+                        blueTeamAdd += pointsPerWin;
+                        redTeamAdd += pointsPerLoss;
+                        break;
+                    case 2:
+                        blueTeamAdd += pointsPerLoss;
+                        redTeamAdd += pointsPerWin;
+                        break;
+                    case 0:
+                        if (fight.getFightID() != 0) {
+                            blueTeamAdd += pointsPerDraw;
+                            redTeamAdd += pointsPerDraw;
+                        }
+                        break;
+                }
+
+                p.put(fight.getTeamBlue(), p.get(fight.getTeamBlue()) + blueTeamAdd);
+                p.put(fight.getTeamRed(), p.get(fight.getTeamRed()) + redTeamAdd);
+            }
+
+            points = p.entrySet().stream().collect(Collectors.toMap(integerIntegerEntry -> Team.get(integerIntegerEntry.getKey()), Map.Entry::getValue));
+        }
+
+        return points;
+    }
+
+    public void update(String name, EventGroupType type, int pointsPerWin, int pointsPerLoss, int pointsPerDraw) {
+        update.update(name, type, pointsPerWin, pointsPerLoss, pointsPerDraw, id);
+        this.name = name;
+        this.type = type;
+        this.pointsPerWin = pointsPerWin;
+        this.pointsPerLoss = pointsPerLoss;
+        this.pointsPerDraw = pointsPerDraw;
+    }
+
+    public boolean needsTieBreak() {
+        return calculatePoints().values().stream().sorted().limit(2).distinct().count() < 2;
+    }
+
+    public void delete() {
+        delete.update(id);
+    }
+
+    public static enum EventGroupType {
+        GROUP_STAGE,
+        ELIMINATION_STAGE
+    }
+}

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

@@ -1,153 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.dao.IntEntity
-import org.jetbrains.exposed.v1.dao.IntEntityClass
-import java.util.*
-
-object EventGroupTable : IntIdTable("EventGroup", "Id") {
-    val event = reference("EventID", EventTable)
-    val name = varchar("Name", 64)
-    val type = enumeration("Type", EventGroup.EventGroupType::class)
-    val pointsPerWin = integer("PointsPerWin").default(3)
-    val pointsPerLoss = integer("PointsPerLoss").default(0)
-    val pointsPerDraw = integer("PointsPerDraw").default(1)
-}
-
-class EventGroup(id: EntityID<Int>) : IntEntity(id) {
-    companion object : IntEntityClass<EventGroup>(EventGroupTable) {
-
-        @JvmStatic
-        fun get(event: Event) = useDb { find { EventGroupTable.event eq event.id }.toList() }
-
-        @JvmStatic
-        fun byId(groupId: Int) = useDb { Optional.ofNullable(findById(groupId)) }
-
-        @JvmStatic
-        fun create(event: Event, name: String, type: EventGroupType) = useDb {
-            new {
-                this.eventID = event.id.value
-                this.groupName = name
-                this.groupType = type
-            }
-        }
-    }
-
-    var eventID by EventGroupTable.event.transform({ EntityID(it, EventTable) }, { it.value })
-        private set
-    private var groupName by EventGroupTable.name
-    private var groupType by EventGroupTable.type
-    private var groupPointsPerWin by EventGroupTable.pointsPerWin
-    private var groupPointsPerLoss by EventGroupTable.pointsPerLoss
-    private var groupPointsPerDraw by EventGroupTable.pointsPerDraw
-    val fights by lazy { useDb { EventFight.find { EventFightTable.groupId eq id }.toList() } }
-    val teamsId by lazy { fights.flatMap { listOf(it.teamBlue, it.teamRed) }.toSet() }
-
-    var name: String
-        get() = groupName
-        set(value) {
-            groupName = value
-        }
-    var type: EventGroupType
-        get() = groupType
-        set(value) {
-            groupType = value
-        }
-    var pointsPerWin: Int
-        get() = groupPointsPerWin
-        set(value) {
-            groupPointsPerWin = value
-        }
-    var pointsPerLoss: Int
-        get() = groupPointsPerLoss
-        set(value) {
-            groupPointsPerLoss = value
-        }
-    var pointsPerDraw: Int
-        get() = groupPointsPerDraw
-        set(value) {
-            groupPointsPerDraw = value
-        }
-    val dependents by lazy { EventRelation.getGroupRelations(this).toList() }
-    val lastFight by lazy { Optional.ofNullable(fights.maxByOrNull { it.startTime }) }
-
-    fun getId() = id.value
-
-    private var points: Map<Team, Int>? = null
-
-    fun calculatePoints(): Map<Team, Int> {
-        if (points == null) {
-            val p: MutableMap<Int, Int> = teamsId.associateWith { 0 }.toMutableMap()
-
-            for (fight in fights) {
-                var blueTeamAdd = 0
-                var redTeamAdd = 0
-
-                if (!fight.hasFinished()) {
-                    continue
-                }
-
-                when (fight.ergebnis) {
-                    1 -> {
-                        blueTeamAdd += pointsPerWin
-                        redTeamAdd += pointsPerLoss
-                    }
-                    2 -> {
-                        blueTeamAdd += pointsPerLoss
-                        redTeamAdd += pointsPerWin
-                    }
-                    0 -> if (fight.fight != null) {
-                        blueTeamAdd += pointsPerDraw
-                        redTeamAdd += pointsPerDraw
-                    }
-                }
-
-                p[fight.teamBlue] = p[fight.teamBlue]?.plus(blueTeamAdd) ?: blueTeamAdd
-                p[fight.teamRed] = p[fight.teamRed]?.plus(redTeamAdd) ?: redTeamAdd
-            }
-
-            return p.mapKeys { Team.byId(it.key) }.also { points = it }
-        } else {
-            return points!!
-        }
-    }
-
-    fun needsTieBreak() = calculatePoints().values.let { it.size == it.toSet().size }
-
-    fun update(name: String, type: EventGroupType, pointsPerWin: Int, pointsPerLoss: Int, pointsPerDraw: Int) = useDb {
-        this@EventGroup.name = name
-        this@EventGroup.type = type
-        this@EventGroup.pointsPerWin = pointsPerWin
-        this@EventGroup.pointsPerLoss = pointsPerLoss
-        this@EventGroup.pointsPerDraw = pointsPerDraw
-    }
-
-    override fun delete() = useDb { super.delete() }
-
-    enum class EventGroupType {
-        GROUP_STAGE,
-        ELIMINATION_STAGE
-    }
-}

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

@@ -0,0 +1,192 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@AllArgsConstructor
+@Getter
+@Setter
+public class EventRelation {
+
+    static {
+        SqlTypeMapper.ordinalEnumMapper(FightTeam.class);
+        SqlTypeMapper.ordinalEnumMapper(FromType.class);
+    }
+
+    private static final Table<EventRelation> table = new Table<>(EventRelation.class);
+
+    private static final SelectStatement<EventRelation> get = new SelectStatement<>(table, "SELECT * FROM EventRelation WHERE FromType = ? AND FromId = ?");
+    private static final SelectStatement<EventRelation> byId = new SelectStatement<>(table, "SELECT * FROM EventRelation WHERE id = ?");
+    private static final SelectStatement<EventRelation> byEvent = new SelectStatement<>(table, "SELECT ER.* FROM EventRelation ER JOIN EventFight EF ON EF.fightId = ER.fightId WHERE EF.EventID = ?");
+    private static final Statement insert = table.insertFields(true, "fightId", "fightTeam", "fromType", "fromId", "fromPlace");
+    private static final Statement update = table.update(Table.PRIMARY, "fromType", "fromId", "fromPlace");
+    private static final Statement updateTeam = table.update(Table.PRIMARY, "fightTeam");
+    private static final Statement delete = table.delete(Table.PRIMARY);
+
+    public static List<EventRelation> get(Event event) {
+        return byEvent.listSelect(event.getEventID());
+    }
+
+    public static EventRelation get(int id) {
+        return byId.select(id);
+    }
+
+    public static List<EventRelation> getFightRelations(EventFight fight) {
+        return get.listSelect(FromType.FIGHT, fight.getFightID());
+    }
+
+    public static List<EventRelation> getGroupRelations(EventGroup group) {
+        return get.listSelect(FromType.GROUP, group.getId());
+    }
+
+    public static EventRelation create(EventFight fight, FightTeam fightTeam, FromType fromType, int fromId, int fromPlace) {
+        int id = insert.insertGetKey(fight.getFightID(), fightTeam, fromType, fromId, fromPlace);
+        return get(id);
+    }
+
+    @Field(keys = Table.PRIMARY)
+    private final int id;
+
+    @Field
+    private int fightId;
+
+    @Field
+    private FightTeam fightTeam;
+
+    @Field
+    private FromType fromType;
+
+    @Field
+    private int fromId;
+
+    @Field
+    private int fromPlace;
+
+    public EventFight getFight() {
+        return EventFight.get(fightId);
+    }
+
+    public Optional<EventFight> getFromFight() {
+        if(fromType == FromType.FIGHT) {
+            return Optional.of(EventFight.get(fromId));
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    public Optional<EventGroup> getFromGroup() {
+        if(fromType == FromType.GROUP) {
+            return EventGroup.get(fromId);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    public void delete() {
+        delete.update(id);
+    }
+
+    public void setUpdateTeam(FightTeam team) {
+        updateTeam.update(id, team);
+        this.fightTeam = team;
+    }
+
+    public void setFromFight(EventFight fight, int place) {
+        setFrom(fight.getFightID(), place, FromType.FIGHT);
+    }
+
+    public void setFromGroup(EventGroup group, int place) {
+        setFrom(group.getId(), place, FromType.GROUP);
+    }
+
+    private void setFrom(int fightId, int place, FromType type) {
+        update.update(type, fightId, place, id);
+        this.fromType = type;
+        this.fromId = fightId;
+        this.fromPlace = place;
+    }
+
+    public Optional<Team> getAdvancingTeam() {
+        if (fromType == FromType.FIGHT) {
+            if (fromPlace == 0) {
+                return getFromFight().flatMap(EventFight::getWinner);
+            } else {
+                return getFromFight().flatMap(EventFight::getLosser);
+            }
+        } else if (fromType == FromType.GROUP) {
+            return getFromGroup().map(EventGroup::calculatePoints)
+                    .flatMap(points -> points.entrySet().stream()
+                            .sorted(Map.Entry.<Team, Integer>comparingByValue().reversed())
+                            .skip(fromPlace)
+                            .findFirst()
+                            .map(Map.Entry::getKey));
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    public boolean apply() {
+        Optional<Integer> team = getAdvancingTeam().map(Team::getTeamId);
+        if(!team.isPresent())
+            return false;
+
+        EventFight fight = getFight();
+        if(fightTeam == FightTeam.RED) {
+            fight.update(
+                    fight.getStartTime(),
+                    fight.getSpielmodus(),
+                    fight.getMap(),
+                    fight.getTeamBlue(),
+                    team.get(),
+                    fight.getSpectatePort()
+            );
+        } else {
+            fight.update(
+                    fight.getStartTime(),
+                    fight.getSpielmodus(),
+                    fight.getMap(),
+                    team.get(),
+                    fight.getTeamRed(),
+                    fight.getSpectatePort()
+            );
+        }
+
+        return true;
+    }
+
+    public static enum FightTeam {
+        BLUE,
+        RED
+    }
+
+    public static enum FromType {
+        FIGHT,
+        GROUP
+    }
+}

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

@@ -1,149 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.dao.IntEntity
-import org.jetbrains.exposed.v1.dao.IntEntityClass
-import org.jetbrains.exposed.v1.jdbc.select
-
-object EventRelationTable : IntIdTable("EventRelation") {
-    val fightId = reference("FightId", EventFightTable)
-    val fightTeam = enumeration("FightTeam", EventRelation.FightTeam::class)
-    val fromType = enumeration("FromType", EventRelation.FromType::class)
-    val fromId = integer("FromId")
-    val fromPlace = integer("FromPlace")
-}
-
-class EventRelation(id: EntityID<Int>) : IntEntity(id) {
-    companion object : IntEntityClass<EventRelation>(EventRelationTable) {
-        @JvmStatic
-        fun get(event: Event) = useDb {
-            EventRelationTable.innerJoin(EventFightTable)
-                .select(EventRelationTable.columns)
-                .where { EventFightTable.eventId eq event.id }
-                .map { wrapRow(it) }
-        }
-
-        @JvmStatic
-        fun byId(id: Int) = useDb { findById(id) }
-
-        @JvmStatic
-        fun getFightRelations(fight: EventFight) =
-            useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) } }
-
-        @JvmStatic
-        fun getGroupRelations(group: EventGroup) =
-            useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) } }
-
-        @JvmStatic
-        fun create(fight: EventFight, fightTeam: FightTeam, fromType: FromType, fromId: Int, fromPlace: Int) = useDb {
-            new {
-                this.fightEntityId = fight.id
-                this.fightTeam = fightTeam
-                this.fromType = fromType
-                this.fromId = fromId
-                this.fromPlace = fromPlace
-            }
-        }
-    }
-
-    var fightEntityId by EventRelationTable.fightId
-    var fightId: Int
-        get() = fightEntityId.value
-        set(value) = useDb { fightEntityId = EntityID(value, EventFightTable) }
-    val fight by lazy { useDb { EventFight[fightEntityId] } }
-    var fightTeam by EventRelationTable.fightTeam
-        private set
-    var fromType by EventRelationTable.fromType
-        private set
-    var fromId by EventRelationTable.fromId
-        private set
-
-    var fromFightId: Int?
-        get() = if (fromType == FromType.FIGHT) fromId else null
-        set(value) = useDb {
-            fromType = FromType.FIGHT
-            fromId = value!!
-        }
-    val fromFight: EventFight?
-        get() = fromFightId?.let { useDb { EventFight[it] } }
-    var fromGroupId: Int?
-        get() = if (fromType == FromType.GROUP) fromId else null
-        set(value) = useDb {
-            fromType = FromType.GROUP
-            fromId = value!!
-        }
-    val fromGroup: EventGroup?
-        get() = fromGroupId?.let { useDb { EventGroup[it] } }
-    var fromPlace by EventRelationTable.fromPlace
-        private set
-
-    fun getId() = id.value
-    fun setUpdateTeam(team: FightTeam) = useDb {
-        fightTeam = team
-    }
-
-    fun setFromFight(fight: EventFight, place: Int) = useDb {
-        fromType = FromType.FIGHT
-        fromId = fight.id.value
-        fromPlace = place
-    }
-
-    fun setFromGroup(group: EventGroup, place: Int) = useDb {
-        fromType = FromType.GROUP
-        fromId = group.id.value
-        fromPlace = place
-    }
-
-    fun getAdvancingTeam(): Team? = useDb { when(fromType) {
-        FromType.FIGHT -> if (fromPlace == 0) fromFight?.winner else fromFight?.losser
-        FromType.GROUP -> fromGroup?.calculatePoints()?.toList()?.sortedBy { (_, v) -> v }?.reversed()?.elementAt(fromPlace)?.first
-    } }
-
-    fun apply(): Boolean {
-        val team = getAdvancingTeam() ?: return false
-
-        useDb {
-            when(fightTeam) {
-                FightTeam.BLUE -> fight.teamBlue = team.teamId
-                FightTeam.RED -> fight.teamRed = team.teamId
-            }
-        }
-
-        return true
-    }
-
-    override fun delete() = useDb {
-        super.delete()
-    }
-
-    enum class FightTeam {
-        BLUE, RED
-    }
-
-    enum class FromType {
-        FIGHT, GROUP
-    }
-}

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

@@ -0,0 +1,134 @@
+/*
+ *   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.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+public class Fight {
+
+    private static final Table<Fight> table = new Table<>(Fight.class);
+    private static final SelectStatement<Fight> getPage = new SelectStatement<>(table, "SELECT f.*, (b.NodeId IS NULL OR b.Config & 2) AND (r.NodeId IS NULL OR r.Config & 2) AS ReplayAllowed FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
+    private static final SelectStatement<Fight> getById = new SelectStatement<>(table, "SELECT f.*, (b.NodeId IS NULL OR b.Config & 2) AND (r.NodeId IS NULL OR r.Config & 2) AS ReplayAllowed FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId WHERE FightId = ?");
+    private static final Statement insert = table.insertFields(true, "GameMode", "Server", "StartTime", "Duration", "BlueLeader", "RedLeader", "BlueSchem", "RedSchem", "Win", "WinCondition");
+    private static final Statement updateReplayAvailable = table.update(Table.PRIMARY, "ReplayAvailable");
+
+    public static List<Fight> getPage(int page, int elementsPerPage) {
+        List<Fight> fights = getPage.listSelect(page * elementsPerPage, elementsPerPage);
+
+        List<FightPlayer> fightPlayers = FightPlayer.batchGet(fights.stream().map(f -> f.fightID));
+        for(Fight fight : fights) {
+            fight.initPlayers(fightPlayers);
+        }
+
+        SteamwarUser.batchCache(fightPlayers.stream().map(FightPlayer::getUserID).collect(Collectors.toSet()));
+        return fights;
+    }
+
+    public static Fight getById(int fightID) {
+        return getById.select(fightID);
+    }
+
+    public static int create(String gamemode, String server, Timestamp starttime, int duration, int blueleader, int redleader, Integer blueschem, Integer redschem, int win, String wincondition){
+        return insert.insertGetKey(gamemode, server, starttime, duration, blueleader, redleader, blueschem, redschem, win, wincondition);
+    }
+
+    public static void markReplayAvailable(int fightID) {
+        updateReplayAvailable.update(true, fightID);
+    }
+
+    @Getter
+    @Field(keys = {Table.PRIMARY}, autoincrement = true)
+    private final int fightID;
+    @Field
+    private final String gameMode;
+    @Getter
+    @Field
+    private final String server;
+    @Getter
+    @Field
+    private final Timestamp startTime;
+    @Field
+    private final int duration;
+    @Field
+    private final int blueLeader;
+    @Field
+    private final int redLeader;
+    @Field(nullable = true)
+    private final Integer blueSchem;
+    @Field(nullable = true)
+    private final Integer redSchem;
+    @Getter
+    @Field
+    private final int win;
+    @Field
+    private final String wincondition;
+    @Field
+    private final boolean replayAvailable;
+    @Field // Virtual field for easy select
+    private final boolean replayAllowed;
+
+    @Getter
+    private final List<FightPlayer> bluePlayers = new ArrayList<>();
+    @Getter
+    private final List<FightPlayer> redPlayers = new ArrayList<>();
+
+    public SchematicType getSchemType() {
+        return SchematicType.fromDB(gameMode);
+    }
+
+    public SteamwarUser getBlueLeader() {
+        return SteamwarUser.get(blueLeader);
+    }
+
+    public SteamwarUser getRedLeader() {
+        return SteamwarUser.get(redLeader);
+    }
+
+    public boolean replayAllowed() {
+        return replayExists() && replayAllowed;
+    }
+
+    public boolean replayExists() {
+        return getSchemType() != null && replayAvailable;
+    }
+
+    private void initPlayers(List<FightPlayer> fightPlayers) {
+        for(FightPlayer fp : fightPlayers) {
+            if(fp.getFightID() != fightID)
+                continue;
+
+            if(fp.getTeam() == 1)
+                bluePlayers.add(fp);
+            else
+                redPlayers.add(fp);
+        }
+    }
+}