Revert "Fix CraftbukkitWrapper20"

This reverts commit db3f98209e.

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

@@ -0,0 +1,46 @@
+/*
+ *   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,6 +1030,7 @@ 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_START_HELP=§8/§etls start §8- §7Start the TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8: §7Stop 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

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -961,6 +961,7 @@ 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_START_HELP=§8/§etls start §8- §7Starte den TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8: §7Stope 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

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

@@ -27,8 +27,6 @@ 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
@@ -39,13 +37,12 @@ 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}
      */
-    REAL_SPECTATOR(bauweltMember -> {
+    SPECTATOR(bauweltMember -> {
         return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
     }),
     /**
@@ -55,28 +52,6 @@ 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) {
@@ -86,10 +61,10 @@ public enum Permission {
 
     public boolean hasPermission(Player member) {
         if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
-            return this != REAL_SPECTATOR;
+            return this != SPECTATOR;
         }
         BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (bauweltMember == null) return this == REAL_SPECTATOR;
+        if (bauweltMember == null) return this == SPECTATOR;
         return permissionPredicate.test(bauweltMember);
     }
 }

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

@@ -32,6 +32,7 @@ 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;
@@ -120,6 +121,7 @@ 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

@@ -1,71 +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.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/countingwand/Countingwand.java

@@ -21,9 +21,10 @@ 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;
@@ -31,13 +32,32 @@ 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");
@@ -47,61 +67,20 @@ public class Countingwand {
 		return itemStack;
 	}
 
-	private final Map<String, Pair<Point, Point>> selections = new HashMap<>();
-
     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());
+        SWPlayer player = SWPlayer.of(p);
-		final boolean newPos;
+        CountingWandComponent countingWandComponent = player.getComponentOrDefault(CountingWandComponent.class, CountingWandComponent::new);
-		if (selection != null) {
+        if (countingWandComponent.setPosition(pos1, point)) {
-			if (pos1) {
+            Point point1 = countingWandComponent.pos1;
-				newPos = !point.equals(selection.setKey(point));
+            Point point2 = countingWandComponent.pos2;
-			} else {
+            int amount = (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
-				newPos = !point.equals(selection.setValue(point));
+            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);
         }
-		} 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,7 +27,6 @@ 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;
@@ -67,9 +66,4 @@ 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,8 +25,11 @@ 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;
@@ -45,7 +48,28 @@ import java.util.*;
 @UtilityClass
 public class Detonator {
 
-    private static final Map<Player, REntityServer> ENTITIES_MAP = new HashMap<>();
+    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 Vector HALF = new Vector(0.5, 0, 0.5);
 
     public static boolean isDetonator(ItemStack itemStack) {
@@ -53,28 +77,19 @@ public class Detonator {
     }
 
     public static void showDetonator(Player p, List<Location> locs) {
-        if (ENTITIES_MAP.containsKey(p)) return;
+        DetonatorComponent detonatorComponent = SWPlayer.of(p).getComponentOrDefault(DetonatorComponent.class, DetonatorComponent::new);
-        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(entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
+            RFallingBlockEntity entity = new RFallingBlockEntity(detonatorComponent.entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
             entity.setNoGravity(true);
         });
     }
 
     public static void hideDetonator(Player p) {
-        ENTITIES_MAP.remove(p).close();
+        SWPlayer.of(p).removeComponent(DetonatorComponent.class);
     }
 
     public static boolean hasActiveDetonatorShow(Player p) {
-        return ENTITIES_MAP.containsKey(p);
+        return SWPlayer.of(p).hasComponent(DetonatorComponent.class);
     }
 
     public static void activateDetonator(DetonatorStorage detonator) {

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

@@ -24,6 +24,7 @@ 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;
@@ -36,15 +37,11 @@ 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));
@@ -66,64 +63,59 @@ 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 (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Detonator.isDetonator(event.getItem())) {
+        if (!Detonator.isDetonator(event.getItem())) return;
-            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);
-            HAS_UPDATED.add(event.getPlayer());
+            SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
         }
     }
 
     @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());
             }
-        } else {
+            return;
+        }
         if (!Detonator.hasActiveDetonatorShow(event.getPlayer())) {
             Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
+            return;
         }
-        }
+        Detonator.DetonatorComponent component = SWPlayer.of(event.getPlayer())
-
+                .getComponentAndFilter(Detonator.DetonatorComponent.class, Detonator.DetonatorComponent::isHasUpdated)
-        if (HAS_UPDATED.contains(event.getPlayer())) {
+                .orElse(null);
-            HAS_UPDATED.remove(event.getPlayer());
+        if (component == null) return;
-            if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
+        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 (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
+        if (!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) return;
-            HAS_UPDATED.add(event.getPlayer());
+        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
-        }
     }
 
     @EventHandler
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem())) {
+        if (!(Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem()))) return;
-            HAS_UPDATED.add(event.getPlayer());
+        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
-        }
     }
 }

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

@@ -26,6 +26,7 @@ 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;
@@ -40,21 +41,17 @@ 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 {
+public class Loader implements Listener, SWPlayer.Component {
-
-    private static final Map<Player, Loader> LOADER_MAP = new HashMap<>();
 
     public static Loader getLoader(Player player) {
-        return LOADER_MAP.get(player);
+        return SWPlayer.of(player).getComponent(Loader.class).orElse(null);
     }
 
     public static void newLoader(Player player) {
-        LOADER_MAP.put(player, new Loader(player));
+        SWPlayer.of(player).setComponent(new Loader(player));
     }
 
     private final Player p;
@@ -145,7 +142,7 @@ public class Loader implements Listener {
             recorder = null;
         }
         elements.clear();
-        LOADER_MAP.remove(p);
+        SWPlayer.of(p).removeComponent(Loader.class);
     }
 
     public boolean setTicksBetweenShots(int delay) {

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

@@ -29,6 +29,7 @@ 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;
@@ -156,6 +157,7 @@ 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,6 +21,7 @@ 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;
@@ -34,7 +35,7 @@ import org.bukkit.entity.Player;
 
 import java.util.*;
 
-public class ObserverTracer {
+public class ObserverTracer implements SWPlayer.Component {
 
     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,6 +21,7 @@ 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;
 
@@ -41,23 +42,23 @@ public class ObserverTracerCommand extends SWCommand {
     @Register(value = "disable", description = "OBSERVER_HELP_DISABLE")
     public void disable(Player p) {
         ObserverTracerListener.enabled.remove(p);
-        ObserverTracerListener.observerTracerMap.remove(p);
+        SWPlayer.of(p).removeComponent(ObserverTracer.class);
         BauSystem.MESSAGE.send("OBSERVER_DISABLE", p);
     }
 
     @Register(value = "delete", description = "OBSERVER_HELP_DELETE")
     public void delete(@Validator Player p) {
-        ObserverTracerListener.observerTracerMap.remove(p);
+        SWPlayer.of(p).removeComponent(ObserverTracer.class);
         BauSystem.MESSAGE.send("OBSERVER_DELETE", p);
     }
 
     @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE")
     public void retrace(@Validator Player p) {
-        if (ObserverTracerListener.observerTracerMap.containsKey(p)) {
+        if (SWPlayer.of(p).hasComponent(ObserverTracer.class)) {
             BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p);
             return;
         }
-        ObserverTracerListener.observerTracerMap.get(p).trace();
+        SWPlayer.of(p).getComponent(ObserverTracer.class).ifPresent(ObserverTracer::trace);
         BauSystem.MESSAGE.send("OBSERVER_RETRACE_DONE", p);
     }
 }

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

@@ -22,6 +22,7 @@ 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;
@@ -34,23 +35,19 @@ 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(), () -> {
-            observerTracerMap.forEach((player, observerTracer) -> {
+            SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                if (player.getGameMode() == GameMode.SPECTATOR) {
+                if (pair.getKey().getGameMode() != GameMode.SPECTATOR) return;
-                    observerTracer.show();
+                pair.getValue().show();
-                }
             });
         }, 15L, 15L);
     }
@@ -58,20 +55,16 @@ public class ObserverTracerListener implements Listener {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!enabled.contains(event.getPlayer())) {
+        if (!enabled.contains(event.getPlayer())) return;
-            return;
+        if (event.getClickedBlock() == null) return;
-        }
+        ObserverTracer observerTracer = SWPlayer.of(event.getPlayer()).getComponent(ObserverTracer.class).orElse(null);
-        if (event.getClickedBlock() == null) {
+        if (observerTracer != null) {
-            return;
-        }
-        if (observerTracerMap.containsKey(event.getPlayer())) {
-            ObserverTracer observerTracer = observerTracerMap.get(event.getPlayer());
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 if (!observerTracer.trace()) {
                     createNew(event);
                 }
-                observerTracerMap.forEach((player, o) -> {
+                SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                    o.trace();
+                    pair.getValue().trace();
                 });
             }, 1L);
         } else {
@@ -86,13 +79,13 @@ public class ObserverTracerListener implements Listener {
         if (event.getClickedBlock().getType() == Material.OBSERVER) {
             ObserverTracer observerTracer = new ObserverTracer(event.getPlayer(), event.getClickedBlock());
             observerTracer.trace();
-            observerTracerMap.put(event.getPlayer(), observerTracer);
+            SWPlayer.of(event.getPlayer()).setComponent(observerTracer);
         }
     }
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(observerTracerMap::remove);
+        event.getNewBuilder().forEach(player -> SWPlayer.of(player).removeComponent(ObserverTracer.class));
     }
 
     @EventHandler
@@ -103,6 +96,5 @@ 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,8 +26,10 @@ 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;
@@ -39,11 +41,14 @@ import java.util.List;
 @Linked
 public class TNTListener implements Listener, ScoreboardElement {
 
-    private void explode(List<Block> blockList) {
+    private void explode(List<Block> blockList, boolean destroy) {
         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)) {
@@ -57,12 +62,16 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onBlockExplode(BlockExplodeEvent event) {
-        explode(event.blockList());
+        explode(event.blockList(), false);
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onExplode(EntityExplodeEvent event) {
-        explode(event.blockList());
+        if (!(event.getEntity() instanceof TNTPrimed)) {
+            event.blockList().clear();
+            return;
+        }
+        explode(event.blockList(), true);
     }
 
     @Override

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

@@ -72,6 +72,14 @@ 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;
@@ -92,30 +100,11 @@ public class TestblockCommand extends SWCommand {
             }
         }
 
-        // 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;
         if (node == null) {

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) {
-        ScriptRunner.remove(event.getPlayer());
+        playerSet.remove(event.getPlayer());
     }
 
     @EventHandler

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

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

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

@@ -21,44 +21,24 @@ 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(" ");
-        if (calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).contains(split[0])) {
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
-            return;
+        if (scriptData.getCalledCommands().contains(split[0])) return;
-        }
 
-        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).add(split[0]);
+        scriptData.getCalledCommands().add(split[0]);
         event.setCancelled(ScriptRunner.callCommand(event.getPlayer(), split[0].substring(1), split));
-        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).remove(split[0]);
+        scriptData.getCalledCommands().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,6 +25,7 @@ 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;
@@ -43,32 +44,27 @@ 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();
-            LAST_FS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
+            SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
+                    .filter(pair -> millis - pair.getValue().getLastF() > 200)
+                    .forEach(pair -> pair.getValue().setLastF(Long.MAX_VALUE));
         }, 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());
@@ -76,19 +72,20 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (LAST_FS.containsKey(event.getPlayer())) {
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.getLastF() != Long.MAX_VALUE) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DoubleSwap, LuaValue.NIL, event);
             }, 1);
         } else {
-            LAST_FS.put(event.getPlayer(), System.currentTimeMillis());
+            scriptData.setLastF(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());
@@ -99,7 +96,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());
@@ -108,12 +105,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;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (ignore.remove(event.getPlayer())) {
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.isIgnore()) {
+            scriptData.setIgnore(false);
             return;
         }
         LuaTable table = new LuaTable();
@@ -124,7 +121,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());
@@ -150,7 +147,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);
             }
@@ -172,7 +169,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) {
@@ -184,8 +181,9 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ignore.add(event.getPlayer());
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        scriptData.setIgnore(true);
         LuaTable table = new LuaTable();
         table.set("type", event.getItemDrop().getItemStack().getType().name());
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DropItem, table, event);
@@ -194,7 +192,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,6 +48,7 @@ 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<>();
 
@@ -116,7 +117,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 (!commandSplit[0].equals("select") && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
+                if (!ignoreCommandFromWorldEdit.contains(commandSplit[0]) && 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/simulator/execute/StabGenerator.java

@@ -26,6 +26,7 @@ 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;
@@ -51,6 +52,7 @@ 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/slaves/laufbau/LaufbauUtils.java

@@ -20,17 +20,14 @@
 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;
@@ -39,44 +36,45 @@ import yapion.parser.options.StreamOptions;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-@Linked
+@UtilityClass
-public class LaufbauUtils implements Listener {
+public class LaufbauUtils {
 
-    private static Map<Player, YAPIONObject> yapionObjectMap = new HashMap<>();
+    public static class LaufbauComponent implements SWPlayer.Component {
 
-    @EventHandler
+        private YAPIONObject yapionObject = new YAPIONObject();
+
+        @Override
         @SneakyThrows
-    public void onPlayerJoin(PlayerJoinEvent event) {
+        public void onMount(SWPlayer player) {
-        String config = UserConfig.getConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
+            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 yapionObject = new YAPIONParser(gzipInputStream, new StreamOptions().stopOnStreamEnd(true)).parse().result();
+            yapionObject = new YAPIONParser(gzipInputStream, new StreamOptions().stopOnStreamEnd(true)).parse().result();
-        yapionObjectMap.put(event.getPlayer(), yapionObject);
         }
 
-    @EventHandler
+        @Override
         @SneakyThrows
-    public void onPlayerQuit(PlayerQuitEvent event) {
+        public void onUnmount(SWPlayer player) {
-        YAPIONObject yapionObject = yapionObjectMap.get(event.getPlayer());
-        if (yapionObject == null) {
-            return;
-        }
             if (yapionObject.isEmpty()) {
-            UserConfig.removePlayerConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
+                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(event.getPlayer().getUniqueId(), "bausystem-laufbau", Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray()));
+            UserConfig.updatePlayerConfig(player.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) {
@@ -125,11 +123,7 @@ public class LaufbauUtils implements Listener {
             return false;
         }
         String identifier = identifier(bb);
-        YAPIONObject yapionObject = yapionObjectMap.get(p);
+        return SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject.containsKey(identifier);
-        if (yapionObject == null) {
-            return false;
-        }
-        return yapionObject.containsKey(identifier);
     }
 
     @SneakyThrows
@@ -138,11 +132,7 @@ public class LaufbauUtils implements Listener {
             return;
         }
         String identifier = identifier(bb);
-        YAPIONObject yapionObject = yapionObjectMap.get(p);
+        YAPIONObject yapionObject = SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject;
-        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.REAL_SPECTATOR.hasPermission(player)) {
+                if (player != null && Permission.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.REAL_SPECTATOR::hasPermission)
+                        .filter(Permission.SPECTATOR::hasPermission)
                         .map(Player::getName)
                         .collect(Collectors.toList());
             }

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

@@ -22,6 +22,7 @@ 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;
@@ -34,6 +35,7 @@ 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/tls/TLSCommand.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tntlistener;
+package de.steamwar.bausystem.features.tls;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -43,4 +43,13 @@ 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/tls/TLSListener.java

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

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

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

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

@@ -20,6 +20,7 @@ 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;
@@ -39,8 +40,9 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void genericCommand(final Player p) {
-		if (NoClipCommand.getNOCLIPS().contains(p)) {
+        SWPlayer swPlayer = SWPlayer.of(p);
-			p.performCommand("noclip");
+        if (swPlayer.hasComponent(NoClipCommand.NoClipData.class)) {
+            swPlayer.removeComponent(NoClipCommand.NoClipData.class);
             return;
         }
 		if (p.getGameMode() == GameMode.CREATIVE) {
@@ -52,9 +54,7 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void gamemodeCommand(final Player p, final GameMode gameMode) {
-		if (NoClipCommand.getNOCLIPS().contains(p)) {
+        SWPlayer.of(p).removeComponent(NoClipCommand.NoClipData.class);
-			p.performCommand("noclip");
-		}
 		p.setGameMode(gameMode);
 	}
 }

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

@@ -26,6 +26,7 @@ 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;
@@ -56,11 +57,9 @@ public class MaterialCommand extends SWCommand implements Listener {
         WorldEditListener.addCommandExclusion("material");
     }
 
-    private Map<Player, Search> searchMap = new HashMap<>();
-
     @Getter
     @Setter
-    static class Search {
+    public class SearchParameter implements SWPlayer.Component {
         SearchType transparent = SearchType.IGNORE;
         SearchType solid = SearchType.IGNORE;
         SearchType gravity = SearchType.IGNORE;
@@ -104,10 +103,10 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void materialGUI(Player p) {
-        materialGUI(p, searchMap.get(p));
+        materialGUI(p, SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new));
     }
 
-    private static final Map<String, BiConsumer<Search, SearchType>> elements = new HashMap<>();
+    private static final Map<String, BiConsumer<SearchParameter, SearchType>> elements = new HashMap<>();
     static {
         elements.put("-transparent", (search, searchType) -> search.transparent = searchType);
         elements.put("-solid", (search, searchType) -> search.solid = searchType);
@@ -122,15 +121,15 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void search(Player p, @Mapper("search") String... searches) {
-        Search search = new Search();
+        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
         for (String s : searches) {
             boolean has = false;
-            for (Map.Entry<String, BiConsumer<Search, SearchType>> element: elements.entrySet()) {
+            for (Map.Entry<String, BiConsumer<SearchParameter, SearchType>> element: elements.entrySet()) {
                 if (s.startsWith(element.getKey() + ":")) {
-                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
+                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
                     has = true;
                 } else if (s.startsWith(element.getKey().substring(0, 2) + ":")) {
-                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
+                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
                     has = true;
                 }
                 if (has) break;
@@ -141,15 +140,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+)?))*")) {
-                        search.blastResistance = s;
+                        searchParameter.blastResistance = s;
                     }
                     break;
                 default:
-                    search.name = s;
+                    searchParameter.name = s;
                     break;
             }
         }
-        materialGUI(p, search);
+        materialGUI(p, searchParameter);
     }
 
     @Mapper(value = "search", local = true)
@@ -182,7 +181,7 @@ public class MaterialCommand extends SWCommand implements Listener {
         };
     }
 
-    public void materialGUI(Player p, Search search) {
+    public void materialGUI(Player p, SearchParameter search) {
         List<SWListInv.SWListEntry<Material>> swListEntries = new ArrayList<>();
         MaterialLazyInit.materialData.forEach(data -> {
             if (data.is(search)) {
@@ -202,59 +201,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));
-        Search search = searchMap.get(p);
+        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
         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, search.name), clickType -> {
+        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), search.name);
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), searchParameter.name);
             swAnvilInv.setCallback(s -> {
-                search.name = s;
+                searchParameter.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(search.transparent.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.transparent = search.transparent.next();
+            searchParameter.transparent = searchParameter.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(search.solid.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.solid = search.solid.next();
+            searchParameter.solid = searchParameter.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(search.gravity.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.gravity = search.gravity.next();
+            searchParameter.gravity = searchParameter.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(search.occluding.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.occluding = search.occluding.next();
+            searchParameter.occluding = searchParameter.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(search.interacteable.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.interacteable = search.interacteable.next();
+            searchParameter.interacteable = searchParameter.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(search.flammable.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.flammable = search.flammable.next();
+            searchParameter.flammable = searchParameter.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(search.burnable.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.burnable = search.burnable.next();
+            searchParameter.burnable = searchParameter.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(search.waterloggable.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.waterloggable = search.waterloggable.next();
+            searchParameter.waterloggable = searchParameter.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(search.unmoveable.getChatValue(), p)), clickType -> {
+        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 -> {
-            search.unmoveable = search.unmoveable.next();
+            searchParameter.unmoveable = searchParameter.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, search.blastResistance), clickType -> {
+        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), search.blastResistance);
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p), searchParameter.blastResistance);
             swAnvilInv.setCallback(s -> {
                 if (s.isEmpty() || s.matches("((([><]=?)|!|=)\\d+(\\.|,\\d+)?)( ((([><]=?)|!|=)\\d+(\\.|,\\d+)?))*")) {
-                    search.blastResistance = s;
+                    searchParameter.blastResistance = s;
                 }
                 searchGUI(p);
             });
@@ -262,14 +261,4 @@ 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

@@ -133,7 +133,7 @@ public class MaterialLazyInit {
             }), originalMaterial);
         }
 
-        public boolean is(MaterialCommand.Search search) {
+        public boolean is(MaterialCommand.SearchParameter 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,10 +40,6 @@ 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
@@ -59,29 +55,34 @@ 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");
 
-    @Getter
+    public static class NoClipData implements SWPlayer.Component {
-    private static final List<Player> NOCLIPS = new ArrayList<>();
+        private long lastTick = -1;
-    private static final Map<Player, Long> LAST_TICKS = new HashMap<>();
+
+        @Override
+        public void onUnmount(SWPlayer player) {
+            player.setGameMode(GameMode.CREATIVE);
+        }
+    }
 
     public NoClipCommand() {
         super("noclip", "nc");
 
         BiFunction<Player, Object, Object> first = (player, o) -> {
-            if (NOCLIPS.contains(player)) {
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
-                if (LAST_TICKS.getOrDefault(player, -1L).equals(TPSUtils.currentTick.get())) return o;
+            if (noClipData == null) return o;
+            if (noClipData.lastTick == TPSUtils.currentTick.get()) return o;
             NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
-                LAST_TICKS.put(player, TPSUtils.currentTick.get());
+            noClipData.lastTick = TPSUtils.currentTick.get();
-            }
             return o;
         };
         TinyProtocol.instance.addFilter(position, first);
         TinyProtocol.instance.addFilter(positionLook, first);
 
         BiFunction<Player, Object, Object> second = (player, o) -> {
-            if (NOCLIPS.contains(player)) {
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (noClipData == null) return o;
             NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
-                LAST_TICKS.put(player, TPSUtils.currentTick.get());
+            noClipData.lastTick = TPSUtils.currentTick.get();
-            }
             return o;
         };
         TinyProtocol.instance.addFilter(useItem, second);
@@ -89,7 +90,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         TinyProtocol.instance.addFilter(windowClick, second);
 
         BiFunction<Player, Object, Object> third = (player, o) -> {
-            if (NOCLIPS.contains(player)) {
+            if (SWPlayer.of(player).hasComponent(NoClipData.class)) {
                 NMSWrapper.impl.setSlotToItemStack(player, o);
             }
             return o;
@@ -99,9 +100,9 @@ public class NoClipCommand extends SWCommand implements Listener {
 
     @Register(help = true)
     public void genericCommand(@Validator Player player) {
-        if (NOCLIPS.contains(player)) {
+        SWPlayer swPlayer = SWPlayer.of(player);
-            NOCLIPS.remove(player);
+        if (swPlayer.hasComponent(NoClipData.class)) {
-            player.setGameMode(GameMode.CREATIVE);
+            swPlayer.removeComponent(NoClipData.class);
         } else {
             player.setGameMode(GameMode.SPECTATOR);
             NMSWrapper.impl.setPlayerBuildAbilities(player);
@@ -110,7 +111,7 @@ public class NoClipCommand extends SWCommand implements Listener {
             NMSWrapper.impl.setGameStateChangeReason(gameStateChangeObject);
             floatFieldAccessor.set(gameStateChangeObject, 1F);
 
-            NOCLIPS.add(player);
+            swPlayer.setComponent(new NoClipData());
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
             TinyProtocol.instance.sendPacket(player, gameStateChangeObject);
             pseudoGameMode(player, GameMode.SPECTATOR);
@@ -120,30 +121,27 @@ public class NoClipCommand extends SWCommand implements Listener {
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
         event.getNewSpectator().forEach(player -> {
-            if (NOCLIPS.contains(player)) {
+            SWPlayer.of(player).removeComponent(NoClipData.class);
-                NOCLIPS.remove(player);
-                player.setGameMode(GameMode.CREATIVE);
-            }
         });
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onBlock(BlockCanBuildEvent event) {
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setBuildable(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerToggleFlight(PlayerToggleFlightEvent event) {
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
             event.getPlayer().setFlying(true);
         }
@@ -154,7 +152,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         if (event.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) {
             return;
         }
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             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,6 +24,7 @@ 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;
@@ -35,15 +36,11 @@ 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);
     }
@@ -58,13 +55,13 @@ public class SelectBauGuiItem extends BauGuiItem {
 
     private static void selectFinish(Player p, RegionType type, RegionExtensionType extensionType) {
         p.closeInventory();
-        LAST_SELECT_MAP.put(p, new LastSelect(type, extensionType));
+        SWPlayer.of(p).setComponent(new LastSelect(type, extensionType));
         p.performCommand("select " + type.name() + " " + extensionType.toString());
     }
 
     @Override
     public ItemStack getItem(Player player) {
-        LastSelect last = LAST_SELECT_MAP.getOrDefault(player, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+        LastSelect last = SWPlayer.of(player).getComponentOrDefault(LastSelect.class, () -> 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();
     }
@@ -80,7 +77,7 @@ public class SelectBauGuiItem extends BauGuiItem {
             inv.open();
         } else {
             p.closeInventory();
-            LastSelect last = LAST_SELECT_MAP.getOrDefault(p, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+            LastSelect last = SWPlayer.of(p).getComponentOrDefault(LastSelect.class, () -> new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
             p.performCommand("select " + last.getType().name() + " " + last.getExtensionType().toString());
         }
         return false;
@@ -92,7 +89,7 @@ public class SelectBauGuiItem extends BauGuiItem {
     }
 
     @AllArgsConstructor
-    private static class LastSelect {
+    private static class LastSelect implements SWPlayer.Component {
         @Getter
         private final RegionType type;
         @Getter

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

@@ -21,6 +21,7 @@ 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;
@@ -30,7 +31,10 @@ 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.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
@@ -42,8 +46,21 @@ import java.util.Map;
 @Linked
 public class WarpListener implements Listener {
 
-    private Map<Player, REntityServer> warpEntityServer = new HashMap<>();
+    public static class WarpComponent implements SWPlayer.Component {
-    private Map<Player, List<Location>> selected = new HashMap<>();
+        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();
+        }
+    }
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent e) {
@@ -65,20 +82,11 @@ public class WarpListener implements Listener {
     }
 
     private void reshow(Player p, Material material, boolean sneaking) {
-        REntityServer entityServer = warpEntityServer.get(p);
+        SWPlayer swPlayer = SWPlayer.of(p);
-        if (entityServer != null) {
+        swPlayer.removeComponent(WarpComponent.class);
-            entityServer.close();
+        if (material != Material.COMPASS) return;
-        }
-        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<>();
@@ -99,12 +107,9 @@ 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) {
+            if (vector.getX() * vector.getX() + vector.getZ() * vector.getZ() < 25) return;
-                return;
-            }
             vector.setY(0);
 
             Vector position = p.getLocation().toVector().clone().add(vector.normalize().multiply(5));
@@ -112,9 +117,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;
-                selected.computeIfAbsent(p, player -> new ArrayList<>()).add(location);
+                warpComponent.selected.add(location);
             }
-            RArmorStand armorStand = new RArmorStand(finalEntityServer, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
+            RArmorStand armorStand = new RArmorStand(warpComponent.server, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
             armorStand.setDisplayName(name);
             armorStand.setNoGravity(true);
             armorStand.setInvisible(true);
@@ -123,28 +128,13 @@ public class WarpListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if (event.getPlayer().getInventory().getItemInMainHand().getType() != Material.COMPASS) {
+        if (event.getPlayer().getInventory().getItemInMainHand().getType() != Material.COMPASS) return;
-            return;
+        if (event.getAction() != Action.RIGHT_CLICK_AIR) return;
-        }
+        WarpComponent warpComponent = SWPlayer.of(event.getPlayer()).getComponent(WarpComponent.class).orElse(null);
-        if (event.getAction() != Action.RIGHT_CLICK_AIR) {
+        if (warpComponent == null || warpComponent.selected.size() != 1) return;
-            return;
+        Location location = warpComponent.selected.get(0);
-        }
-        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/BauMemberUpdate.java

@@ -59,18 +59,14 @@ public class BauMemberUpdate extends PacketHandler implements Listener {
         Set<Player> newSpectator = new HashSet<>();
         Set<Player> newBuilder = new HashSet<>();
         Bukkit.getOnlinePlayers().forEach(player -> {
-            if (Permission.REAL_SPECTATOR.hasPermission(player)) {
+            if (Permission.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

@@ -1,43 +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.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,6 +49,7 @@ 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 {
@@ -100,10 +101,20 @@ public class SpectatorListener implements Listener {
         materials.add(Material.WATER);
         materials.remove(Material.BARRIER);
         materials.remove(Material.STONE);
-        TechHider techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
+        techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
-            return Permission.BUILD.hasPermission(player) || Permission.isTempOnlySpectator(player) || NO_TECHHIDER.contains(player);
+            return Permission.BUILD.hasPermission(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();
+        }
     }
 
     public static void toggleNoTechHider(Player player) {
@@ -113,6 +124,7 @@ public class SpectatorListener implements Listener {
             NO_TECHHIDER.add(player);
         }
         resendChunks(player);
+        enableOrDisableTechhider();
     }
 
     private static void resendChunks(Player player) {
@@ -131,6 +143,7 @@ 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;
@@ -152,6 +165,7 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+        enableOrDisableTechhider();
         if (!anySupervisorOnline(null) && !BauSystem.DEV_SERVER) {
             Bukkit.getOnlinePlayers().forEach(player -> {
                 player.kickPlayer("");
@@ -161,7 +175,6 @@ public class SpectatorListener implements Listener {
 
         event.getChanged().forEach(player -> {
             NO_TECHHIDER.remove(player);
-            if (Permission.isTempOnlySpectator(player)) return;
             resendChunks(player);
         });
     }
@@ -169,6 +182,7 @@ 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,6 +23,7 @@ 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;
@@ -35,13 +36,10 @@ 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;
 
@@ -71,32 +69,23 @@ 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);
         }
-        selectors.put(event.getPlayer(), selector);
+        SWPlayer.of(event.getPlayer()).setComponent(selector);
     }
 
-    @EventHandler
+    private class Selector implements SWPlayer.Component {
-    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;
 
@@ -154,6 +143,7 @@ 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);
         }
@@ -190,5 +180,10 @@ 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);
-                }, 1L);
+                }, 0);
                 return null;
             }
             return o;

CommandFramework-Old/build.gradle.kts

@@ -1,27 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2024  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/>.
- */
-
-plugins {
-    steamwar.java
-}
-
-dependencies {
-    testImplementation(libs.junit)
-    testImplementation(libs.hamcrest)
-}

CommandFramework/CommandFrameworkAnnotationProcessor/build.gradle.kts

@@ -1,32 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2024  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/>.
- */
-
-plugins {
-    steamwar.java
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
-
-dependencies {
-    implementation(project(":CommandFramework:CommandFrameworkBase", "default"))
-    annotationProcessor(project(":CommandFramework:CommandFrameworkBase", "default"))
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/META-INF/services/javax.annotation.processing.Processor

@@ -1,5 +0,0 @@
-de.steamwar.command.annotationprocessor.impl.CachedAnnotationProcessor
-de.steamwar.command.annotationprocessor.impl.MapperAnnotationProcessor
-de.steamwar.command.annotationprocessor.impl.RegisterAnnotationProcessor
-de.steamwar.command.annotationprocessor.impl.SupplierAnnotationProcessor
-de.steamwar.command.annotationprocessor.impl.ValidatorAnnotationProcessor

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/HandlerForAnnotationMirror.java

@@ -1,43 +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.command;
-
-import lombok.Getter;
-
-import javax.lang.model.element.AnnotationMirror;
-import java.lang.annotation.Annotation;
-
-public class HandlerForAnnotationMirror<A extends Annotation> implements Handler.AnnotationWrapper<A> {
-
-    private A annotation;
-
-    @Getter
-    private AnnotationMirror annotationMirror;
-
-    public HandlerForAnnotationMirror(A annotation, AnnotationMirror annotationMirror) {
-        this.annotation = annotation;
-        this.annotationMirror = annotationMirror;
-    }
-
-    @Override
-    public A getAnnotation() {
-        return annotation;
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/HandlerForExecutableElement.java

@@ -1,68 +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.command;
-
-import lombok.Getter;
-
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-import java.util.List;
-
-public class HandlerForExecutableElement implements Handler.MethodWrapper {
-
-    @Getter
-    private final ExecutableElement method;
-    private final Types types;
-    private final Elements elements;
-
-    public HandlerForExecutableElement(ExecutableElement method, Types types, Elements elements) {
-        this.method = method;
-        this.types = types;
-        this.elements = elements;
-    }
-
-    @Override
-    public String getName() {
-        return method.getSimpleName().toString();
-    }
-
-    @Override
-    public int getParameterCount() {
-        return method.getParameters().size();
-    }
-
-    @Override
-    public Handler.TypeWrapper getReturnType() {
-        return new HandlerForTypeMirror(method.getReturnType(), types, elements);
-    }
-
-    @Override
-    public Handler.ParameterWrapper[] getParameters() {
-        Handler.ParameterWrapper[] parameters = new Handler.ParameterWrapper[method.getParameters().size()];
-        List<? extends VariableElement> variableElements = method.getParameters();
-        for (int i = 0; i < parameters.length; i++) {
-            VariableElement variableElement = variableElements.get(i);
-            parameters[i] = new HandlerForVariableElement(variableElement, types, elements, i == parameters.length - 1 && method.isVarArgs());
-        }
-        return parameters;
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/HandlerForTypeMirror.java

@@ -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.command;
-
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-
-public class HandlerForTypeMirror implements Handler.TypeWrapper {
-
-    private final TypeMirror type;
-    private final Types types;
-    private final Elements elements;
-
-    public HandlerForTypeMirror(TypeMirror type, Types types, Elements elements) {
-        this.type = type;
-        this.types = types;
-        this.elements = elements;
-    }
-
-    @Override
-    public boolean isAssignableTo(Class<?> clazz) {
-        return types.isAssignable(types.erasure(type), types.erasure(elements.getTypeElement(clazz.getTypeName()).asType()));
-    }
-
-    @Override
-    public boolean isAssignableTo(Handler.TypeWrapper type) {
-        if (type instanceof ForClass) {
-            return isAssignableTo(((ForClass) type).getClazz());
-        } else if (type instanceof HandlerForTypeMirror) {
-            return types.isAssignable(types.erasure(this.type), types.erasure(((HandlerForTypeMirror) type).type));
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isPrimitive() {
-        return type.getKind().isPrimitive();
-    }
-
-    @Override
-    public boolean isArray() {
-        return type instanceof ArrayType;
-    }
-
-    @Override
-    public boolean isEnum() {
-        if (type.getKind() != TypeKind.DECLARED) {
-            return false;
-        }
-
-        DeclaredType declaredType = (DeclaredType) type;
-        Element element = declaredType.asElement();
-
-        return element.getKind() == ElementKind.ENUM;
-    }
-
-    @Override
-    public boolean is(Class<?> clazz) {
-        if (type.getKind() == TypeKind.VOID && clazz == Void.TYPE) {
-            return true;
-        } else if (type.getKind().isPrimitive() && clazz.isPrimitive()) {
-            return type.toString().equals(clazz.getTypeName());
-        } else if (!type.getKind().isPrimitive() && !clazz.isPrimitive()) {
-            return types.isSameType(types.erasure(type), types.erasure(elements.getTypeElement(clazz.getTypeName()).asType()));
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean is(Handler.TypeWrapper type) {
-        if (type instanceof ForClass) {
-            return is(((ForClass) type).getClazz());
-        } else if (type instanceof HandlerForTypeMirror) {
-            return types.isSameType(types.erasure(this.type),  types.erasure(((HandlerForTypeMirror) type).type));
-        }
-        return false;
-    }
-
-    @Override
-    public Handler.TypeWrapper getComponentType() {
-        if (type instanceof ArrayType) {
-            return new HandlerForTypeMirror(((ArrayType) type).getComponentType(), types, elements);
-        } else {
-            return new HandlerForTypeMirror(null, types, elements);
-        }
-    }
-
-    @Override
-    public String getName() {
-        return type.toString();
-    }
-
-    @Override
-    public String getTypeName() {
-        return type.toString();
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/HandlerForVariableElement.java

@@ -1,151 +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.command;
-
-import de.steamwar.command.utils.Pair;
-import lombok.Getter;
-
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Repeatable;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public class HandlerForVariableElement implements Handler.ParameterWrapper {
-
-    @Getter
-    private final VariableElement parameter;
-    private final Types types;
-    private final Elements elements;
-    private final boolean varArgs;
-
-    public HandlerForVariableElement(VariableElement variableElement, Types types, Elements elements, boolean varArgs) {
-        this.parameter = variableElement;
-        this.types = types;
-        this.elements = elements;
-        this.varArgs = varArgs;
-    }
-
-    @Override
-    public Handler.TypeWrapper getType() {
-        return new HandlerForTypeMirror(parameter.asType(), types, elements);
-    }
-
-    @Override
-    public boolean isVarArgs() {
-        return varArgs;
-    }
-
-    @Override
-    public boolean isAnnotationPresent(Class<? extends Annotation> annotation) {
-        return parameter.getAnnotation(annotation) != null;
-    }
-
-    @Override
-    public <A extends Annotation> Handler.AnnotationWrapper<A> getAnnotation(Class<A> annotation) {
-        A ann = parameter.getAnnotation(annotation);
-        AnnotationMirror annMirror = parameter.getAnnotationMirrors()
-                .stream()
-                .filter(am -> new HandlerForTypeMirror(am.getAnnotationType(), types, elements).is(annotation))
-                .findFirst()
-                .orElse(null);
-        return new HandlerForAnnotationMirror<>(ann, annMirror);
-    }
-
-    @Override
-    public String getName() {
-        return parameter.getSimpleName().toString();
-    }
-
-    @Override
-    public List<Handler.AnnotationWrapper<?>> getAnnotations() {
-        return parameter.getAnnotationMirrors()
-                .stream()
-                .collect(Collectors.toMap(Function.identity(), annotationMirror -> {
-                    Class<?> clazz = getClass(annotationMirror.getAnnotationType().toString());
-                    if (clazz == null) return null;
-                    return parameter.getAnnotation((Class<? extends Annotation>) clazz);
-                }))
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getValue() != null)
-                .collect(Collectors.toMap(Map.Entry::getKey, entry -> {
-                    Annotation annotation = entry.getValue();
-                    try {
-                        Method method = annotation.annotationType().getMethod("value");
-                        Class<?> returnType = method.getReturnType();
-                        if (!returnType.isArray()) {
-                            return List.of(annotation);
-                        }
-                        Class<?> innerReturnType = returnType.getComponentType();
-                        if (!(innerReturnType.isAnnotation() && innerReturnType.isAnnotationPresent(Repeatable.class))) {
-                            return List.of(annotation);
-                        }
-                        Repeatable repeatable = innerReturnType.getAnnotation(Repeatable.class);
-                        Class<? extends Annotation> containerType = repeatable.value();
-                        if (containerType == returnType) {
-                            throw new UnsupportedOperationException("Repeatable annotation must have a container annotation");
-                        }
-                        try {
-                            return Arrays.asList((Annotation[]) method.invoke(annotation));
-                        } catch (Exception e) {
-                            return List.of(annotation);
-                        }
-                    } catch (NoSuchMethodException e) {
-                        return List.of(annotation);
-                    }
-                }))
-                .entrySet()
-                .stream()
-                .flatMap(entry -> {
-                    return entry.getValue()
-                            .stream()
-                            .map(annotation -> new Pair<AnnotationMirror, Annotation>(entry.getKey(), annotation));
-                })
-                .filter(pair -> pair.b.annotationType().isAnnotationPresent(Handler.Implementation.class))
-                .map(pair -> new HandlerForAnnotationMirror<>(pair.b, pair.a))
-                .collect(Collectors.toList());
-    }
-
-    private Class<?> getClass(String name) {
-        try {
-            return Class.forName(name);
-        } catch (ClassNotFoundException e) {
-            // Ignore
-        }
-        if (!name.contains(".")) return null;
-        Class<?> outerClass = getClass(name.substring(0, name.lastIndexOf('.')));
-        if (outerClass == null) return null;
-        name = name.substring(name.lastIndexOf('.') + 1);
-        for (Class<?> declaredClass : outerClass.getDeclaredClasses()) {
-            if (declaredClass.getSimpleName().equals(name)) {
-                return declaredClass;
-            }
-        }
-        return null;
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/annotationprocessor/AbstractAnnotationProcessor.java

@@ -1,156 +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.command.annotationprocessor;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.HandlerForAnnotationMirror;
-import de.steamwar.command.HandlerForExecutableElement;
-import de.steamwar.command.HandlerForVariableElement;
-
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Messager;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.*;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-import javax.tools.Diagnostic;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public abstract class AbstractAnnotationProcessor extends AbstractProcessor {
-
-    private Messager messager;
-    private Types types;
-    private Elements elements;
-
-    public abstract Class<? extends Annotation> getAnnotationClass();
-
-    @Override
-    public synchronized void init(ProcessingEnvironment processingEnv) {
-        super.init(processingEnv);
-        this.messager = processingEnv.getMessager();
-        this.types = processingEnv.getTypeUtils();
-        this.elements = processingEnv.getElementUtils();
-    }
-
-    @Override
-    public Set<String> getSupportedAnnotationTypes() {
-        return Collections.singleton(this.getAnnotationClass().getCanonicalName());
-    }
-
-    @Override
-    public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.latestSupported();
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        List<ExecutableElement> elements = roundEnv.getElementsAnnotatedWith(getAnnotationClass())
-                .stream()
-                .filter(element -> element.getKind() == ElementKind.METHOD)
-                .map(ExecutableElement.class::cast)
-                .collect(Collectors.toList());
-        if (elements.isEmpty()) return false;
-        elements.forEach(element -> {
-            checkMethodAnnotation(element, element.getAnnotation(getAnnotationClass()));
-        });
-        return false;
-    }
-
-    private Handler getHandler(Annotation annotation, Element element) {
-        Handler.Implementation implementation = annotation.annotationType().getAnnotation(Handler.Implementation.class);
-        if (implementation == null) return null;
-        try {
-            return implementation.value().getConstructor().newInstance();
-        } catch (NoSuchMethodException | InstantiationException | IllegalAccessException |
-                 InvocationTargetException e) {
-            messager.printMessage(Diagnostic.Kind.ERROR, "Handler " + implementation.value().getName() + " cannot be used to check the argument validity", element);
-            return null;
-        }
-    }
-
-    private void checkMethodAnnotation(ExecutableElement method, Annotation annotation) {
-        Handler handler = getHandler(annotation, method);
-        if (handler == null) return;
-        if (!(handler instanceof Handler.HandlerMethod)) {
-            messager.printMessage(Diagnostic.Kind.ERROR, "Handler " + handler.getClass().getName() + " is not a HandlerMethod", method);
-            return;
-        }
-        Handler.HandlerMethod handlerMethod = (Handler.HandlerMethod) handler;
-        try {
-            handlerMethod.check(new HandlerForAnnotationMirror(annotation, null), new HandlerForExecutableElement(method, types, elements), DataCheckableImpl.INSTANCE);
-        } catch (Handler.HandlerException e) {
-            Handler.CodePlace codePlace = e.getCodePlace();
-            AnnotationMirror[] annotationMirrors = new AnnotationMirror[0];
-            if (codePlace.getAnnotations().length > 0) {
-                annotationMirrors = Arrays.stream(codePlace.getAnnotations())
-                        .map(annotationWrapper -> (HandlerForAnnotationMirror) annotationWrapper)
-                        .map(HandlerForAnnotationMirror::getAnnotationMirror)
-                        .toArray(AnnotationMirror[]::new);
-            }
-            Element element = null;
-            if (codePlace.getMethod() != null) {
-                element = ((HandlerForExecutableElement) codePlace.getMethod()).getMethod();
-            } else if (codePlace.getParameter() != null) {
-                element = ((HandlerForVariableElement) codePlace.getParameter()).getParameter();
-            }
-
-            if (annotationMirrors.length > 0) {
-                for  (int i = 0; i < annotationMirrors.length; i++) {
-                    messager.printMessage(Diagnostic.Kind.ERROR, e.getMessage(), element, annotationMirrors[i]);
-                }
-            } else {
-                messager.printMessage(Diagnostic.Kind.ERROR, e.getMessage(), element);
-            }
-        }
-    }
-
-    private static final class DataCheckableImpl implements Handler.DataCheckable {
-
-        private static final DataCheckableImpl INSTANCE = new DataCheckableImpl();
-
-        @Override
-        public boolean hasExecutorMapper(Class<?> clazz) {
-            return true;
-        }
-
-        @Override
-        public boolean hasMapper(String key) {
-            return true;
-        }
-
-        @Override
-        public boolean hasValidator(String key) {
-            return true;
-        }
-
-        @Override
-        public boolean hasSupplier(String key) {
-            return true;
-        }
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/annotationprocessor/impl/CachedAnnotationProcessor.java

@@ -1,33 +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.command.annotationprocessor.impl;
-
-import de.steamwar.command.annotationprocessor.AbstractAnnotationProcessor;
-import de.steamwar.command.annotations.Cached;
-
-import java.lang.annotation.Annotation;
-
-public class CachedAnnotationProcessor extends AbstractAnnotationProcessor {
-
-    @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return Cached.class;
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/annotationprocessor/impl/MapperAnnotationProcessor.java

@@ -1,33 +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.command.annotationprocessor.impl;
-
-import de.steamwar.command.annotationprocessor.AbstractAnnotationProcessor;
-import de.steamwar.command.annotations.Mapper;
-
-import java.lang.annotation.Annotation;
-
-public class MapperAnnotationProcessor extends AbstractAnnotationProcessor {
-
-    @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return Mapper.class;
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/annotationprocessor/impl/RegisterAnnotationProcessor.java

@@ -1,33 +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.command.annotationprocessor.impl;
-
-import de.steamwar.command.annotationprocessor.AbstractAnnotationProcessor;
-import de.steamwar.command.annotations.Register;
-
-import java.lang.annotation.Annotation;
-
-public class RegisterAnnotationProcessor extends AbstractAnnotationProcessor {
-
-    @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return Register.class;
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/annotationprocessor/impl/SupplierAnnotationProcessor.java

@@ -1,33 +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.command.annotationprocessor.impl;
-
-import de.steamwar.command.annotationprocessor.AbstractAnnotationProcessor;
-import de.steamwar.command.annotations.Supplier;
-
-import java.lang.annotation.Annotation;
-
-public class SupplierAnnotationProcessor extends AbstractAnnotationProcessor {
-
-    @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return Supplier.class;
-    }
-}

CommandFramework/CommandFrameworkAnnotationProcessor/src/de/steamwar/command/annotationprocessor/impl/ValidatorAnnotationProcessor.java

@@ -1,33 +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.command.annotationprocessor.impl;
-
-import de.steamwar.command.annotationprocessor.AbstractAnnotationProcessor;
-import de.steamwar.command.annotations.Validator;
-
-import java.lang.annotation.Annotation;
-
-public class ValidatorAnnotationProcessor extends AbstractAnnotationProcessor {
-
-    @Override
-    public Class<? extends Annotation> getAnnotationClass() {
-        return Validator.class;
-    }
-}

CommandFramework/CommandFrameworkBase/build.gradle.kts

@@ -1,27 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2024  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/>.
- */
-
-plugins {
-    steamwar.java
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/AbstractCommand.java

@@ -1,216 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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.command;
-
-import de.steamwar.command.graph.NodeData;
-import de.steamwar.command.graph.RootNode;
-import de.steamwar.command.utils.Pair;
-import de.steamwar.command.utils.Triple;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-public abstract class AbstractCommand<T> {
-
-    private static final Map<Class<? extends AbstractCommand<?>>, Map<Class<?>, Function<?, ?>>> EXECUTOR_MAPPER = new HashMap<>();
-
-    public static <E, T> void addExecutorMapper(Class<? extends AbstractCommand<E>> wrapper, Class<T> executorType, Function<E, T> mapper) {
-        EXECUTOR_MAPPER.computeIfAbsent(wrapper, __ -> new HashMap<>())
-                .putIfAbsent(executorType, mapper);
-    }
-
-    protected final String command;
-    protected final String permission;
-    private final Consumer<CommandLoader<T>> initializer;
-    protected final String[] aliases;
-    protected final List<String> descriptions = new ArrayList<>();
-
-    private boolean initialized = false;
-    protected final RootNode<T> rootNode = new RootNode<>();
-
-    private final Map<String, AbstractTypeMapper<T, ?>> localTypeMapper = new HashMap<>();
-    private final Map<String, AbstractTypeValidator<T, ?>> localValidators = new HashMap<>();
-    private final Map<String, AbstractTypeSupplier<T, ?>> localSupplier = new HashMap<>();
-
-    protected AbstractCommand(String command, Consumer<CommandLoader<T>> initializer, String... aliases) {
-        this(command, null, initializer, aliases);
-    }
-
-    protected AbstractCommand(String command, String permission, Consumer<CommandLoader<T>> initializer, String... aliases) {
-        this.command = command;
-        this.permission = permission;
-        this.initializer = initializer;
-        this.aliases = aliases;
-        initCommand();
-        unregister();
-        register();
-    }
-
-    protected synchronized void initCommand() {
-    }
-
-    public abstract void unregister();
-
-    public abstract void register();
-
-    protected void commandSystemError(T sender, CommandFrameworkException e) {
-        Logger.getGlobal().log(Level.WARNING, "An unexpected error occurred", e);
-    }
-
-    protected void sendMessage(T sender, String message, Object[] args) {
-    }
-
-    public final void execute(T sender, String alias, String[] args) {
-        initialize();
-        List<Runnable> errors = new ArrayList<>();
-        try {
-            boolean executed = rootNode.execute(sender, new NodeData(alias, fixArgs(args, true), (s, args1) -> {
-                errors.add(() -> sendMessage(sender, s, args1));
-            }));
-            if (executed) return;
-            if (!errors.isEmpty()) {
-                errors.forEach(Runnable::run);
-                return;
-            }
-            descriptions.forEach(s -> sendMessage(sender, s, new Object[0]));
-        } catch (CommandFrameworkException e) {
-            commandSystemError(sender, e);
-        }
-    }
-
-    public final List<String> tabComplete(T sender, String alias, String[] args) throws IllegalArgumentException {
-        initialize();
-        List<Collection<String>> tabCompletes = new ArrayList<>();
-        rootNode.tabComplete(sender, new NodeData(alias, fixArgs(args, false), (s, args1) -> {}), tabCompletes);
-        return tabCompletes.stream()
-                .filter(Objects::nonNull)
-                .flatMap(Collection::stream)
-                .filter(Objects::nonNull)
-                .filter(s -> !s.isEmpty())
-                .distinct()
-                .collect(Collectors.toList());
-    }
-
-    private String[] fixArgs(String[] args, boolean allowEmpty) {
-        int removedCount = 0;
-        for (int i = 0; i < args.length; i++) {
-            String arg = args[i];
-            if (arg.isEmpty() && i != args.length - 1) {
-                removedCount++;
-                continue;
-            }
-            args[i] = args[i - removedCount];
-        }
-        if (removedCount != 0) {
-            args = Arrays.copyOf(args, args.length - removedCount);
-        }
-        if (args.length == 0 && !allowEmpty) {
-            return new String[]{""};
-        }
-        return args;
-    }
-
-    private synchronized void initialize() {
-        if (initialized) return;
-
-        List<Object> commandObjects = new ArrayList<>();
-        initializer.accept(new CommandLoader<>() {
-            @Override
-            public AbstractCommand<T> get() {
-                return AbstractCommand.this;
-            }
-
-            @Override
-            public void add(Object command) {
-                commandObjects.add(command);
-            }
-        });
-
-        List<Pair<DataImpl, Method>> methods = new ArrayList<>();
-        for (Object commandObject : commandObjects) {
-            DataImpl dataImpl = new DataImpl(this, commandObject, rootNode, EXECUTOR_MAPPER.getOrDefault(this.getClass(), Collections.emptyMap()), (Map) localTypeMapper, CommandUtils.MAPPER_FUNCTIONS, (Map) localValidators, CommandUtils.VALIDATOR_FUNCTIONS, (Map) localSupplier, CommandUtils.SUPPLIER_FUNCTIONS);
-            methods(commandObject).stream()
-                    .filter(method -> Arrays.stream(method.getAnnotations()).anyMatch(anno -> anno.annotationType().isAnnotationPresent(Handler.Implementation.class)))
-                    .forEach(method -> methods.add(new Pair<>(dataImpl, method)));
-        }
-
-        Map<Integer, Map<Triple<DataImpl, Method, Annotation>, List<Handler.HandlerMethod<Annotation>>>> handlerMap = new HashMap<>();
-        for (Pair<DataImpl, Method> commandMethod : methods) {
-            List<Annotation> annotations = CommandUtils.getAnnotations(commandMethod.b);
-            for (Annotation annotation : annotations) {
-                Handler.Implementation handler = annotation.annotationType().getAnnotation(Handler.Implementation.class);
-                Handler handlerObject;
-                try {
-                    handlerObject = handler.value().getConstructor().newInstance();
-                } catch (NoSuchMethodException | InstantiationException | IllegalAccessException |
-                         InvocationTargetException e) {
-                    throw new UnsupportedOperationException("Handler " + handler.value().getName() + " cannot be used to check the argument validity", e);
-                }
-                if (!(handlerObject instanceof Handler.HandlerMethod)) {
-                    throw new UnsupportedOperationException("Handler " + handlerObject.getClass().getName() + " is not a HandlerMethod");
-                }
-                handlerMap.computeIfAbsent(((Handler.HandlerMethod<?>) handlerObject).getRunPriority(), k -> new LinkedHashMap<>())
-                        .computeIfAbsent(new Triple<>(commandMethod.a, commandMethod.b, annotation), k -> new ArrayList<>())
-                        .add((Handler.HandlerMethod<Annotation>) handlerObject);
-            }
-        }
-
-        List<Integer> runPriorities = new ArrayList<>(handlerMap.keySet());
-        runPriorities.sort(Comparator.naturalOrder());
-        for (int runPriority : runPriorities) {
-            handlerMap.get(runPriority).forEach((dataMethodAnnotationTriple, handlerMethods) -> {
-                handlerMethods.forEach(annotationHandlerMethod -> {
-                    try {
-                        annotationHandlerMethod.check(new Handler.AnnotationWrapper.ForAnnotation<>(dataMethodAnnotationTriple.c), new Handler.MethodWrapper.ForMethod(dataMethodAnnotationTriple.b), dataMethodAnnotationTriple.a);
-                    } catch (Exception e) {
-                        throw new UnsupportedOperationException("Method check failed for " + dataMethodAnnotationTriple.b.getName(), e);
-                    }
-                    annotationHandlerMethod.run(dataMethodAnnotationTriple.c, dataMethodAnnotationTriple.b, dataMethodAnnotationTriple.a);
-                });
-            });
-        }
-        rootNode.sort();
-        initialized = true;
-    }
-
-    // TODO: Implement this when Message System is ready
-    /*
-    public void addDefaultHelpMessage(String message) {
-        defaultHelpMessages.add(message);
-    }
-     */
-
-    private List<Method> methods(Object commandObject) {
-        List<Method> methods = new ArrayList<>();
-        Class<?> current = commandObject.getClass();
-        while (current != null) {
-            methods.addAll(Arrays.asList(current.getDeclaredMethods()));
-            current = current.getSuperclass();
-        }
-        return methods;
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/AbstractTypeMapper.java

@@ -1,48 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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.command;
-
-import java.util.Collection;
-
-public interface AbstractTypeMapper<K, T> {
-
-    /**
-     * The CommandSender can be null!
-     */
-    T map(K sender, PreviousArguments previousArguments, String s);
-
-    Collection<String> tabComplete(K sender, PreviousArguments previousArguments, String s);
-
-    /**
-     * @return true if the next element should be appended to the current tab complete.
-     */
-    default boolean appendNextElementTabCompletions() {
-        return false;
-    }
-
-    /**
-     * Normalize the cache key by sender and user provided argument. <br>
-     * Note: The CommandSender can be null if the cache is defined as a global cache!<br>
-     * Returning null and the empty string are equivalent.
-     */
-    default String normalize(K sender, String s) {
-        return null;
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/AbstractTypeSupplier.java

@@ -1,25 +0,0 @@
-/*
- *   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.command;
-
-public interface AbstractTypeSupplier<K, T> {
-
-    T get(K sender, PreviousArguments previousArguments);
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/AbstractTypeValidator.java

@@ -1,62 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2022  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.command;
-
-import java.util.function.BooleanSupplier;
-
-@FunctionalInterface
-public interface AbstractTypeValidator<K, T> {
-
-    /**
-     * Validates the given value.
-     *
-     * @param sender The sender of the command.
-     * @param value The value to validate or null if mapping returned null.
-     * @param messageSender The message sender to send messages to the player. Never send messages directly to the player.
-     * @return The result of the validation.
-     */
-    boolean validate(K sender, T value, MessageSender messageSender);
-
-    default AbstractTypeValidator<K, T> and(AbstractTypeValidator<K, T> other) {
-        return (sender, value, messageSender) -> validate(sender, value, messageSender) && other.validate(sender, value, messageSender);
-    }
-
-    default AbstractTypeValidator<K, T> or(AbstractTypeValidator<K, T> other) {
-        return (sender, value, messageSender) -> validate(sender, value, messageSender) || other.validate(sender, value, messageSender);
-    }
-
-    default AbstractTypeValidator<K, T> not() {
-        return (sender, value, messageSender) -> !validate(sender, value, messageSender);
-    }
-
-    @FunctionalInterface
-    interface MessageSender {
-        void send(String s, Object... args);
-
-        default boolean send(boolean condition, String s, Object... args) {
-            if (condition) send(s, args);
-            return condition;
-        }
-
-        default boolean send(BooleanSupplier condition, String s, Object... args) {
-            return send(condition.getAsBoolean(), s, args);
-        }
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/CommandFrameworkException.java

@@ -1,93 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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.command;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-public class CommandFrameworkException extends RuntimeException {
-
-    private Function causeMessage;
-    private Throwable cause;
-    private Function stackTraceExtractor;
-    private String extraStackTraces;
-
-    private String message;
-
-    public CommandFrameworkException(InvocationTargetException invocationTargetException, String alias, String[] args) {
-        this(e -> {
-            StringBuilder st = new StringBuilder();
-            st.append(e.getCause().getClass().getTypeName());
-            if (e.getCause().getMessage() != null) {
-                st.append(": ").append(e.getCause().getMessage());
-            }
-            if (alias != null && !alias.isEmpty()) {
-                st.append("\n").append("Performed command: " + alias + " " + String.join(" ", args));
-            }
-            return st.toString();
-        }, invocationTargetException, e -> {
-            StackTraceElement[] stackTraceElements = e.getCause().getStackTrace();
-            return Arrays.stream(stackTraceElements).limit(stackTraceElements.length - e.getStackTrace().length);
-        }, null);
-    }
-
-    private <T extends Throwable> CommandFrameworkException(Function<T, String> causeMessage, T cause, Function<T, Stream<StackTraceElement>> stackTraceExtractor, String extraStackTraces) {
-        super(causeMessage.apply(cause), cause);
-        this.causeMessage = causeMessage;
-        this.cause = cause;
-        this.stackTraceExtractor = stackTraceExtractor;
-        this.extraStackTraces = extraStackTraces;
-    }
-
-    public synchronized String getBuildStackTrace() {
-        if (message != null) {
-            return message;
-        }
-        StringBuilder st = new StringBuilder();
-        st.append(causeMessage.apply(cause)).append("\n");
-        ((Stream<StackTraceElement>) stackTraceExtractor.apply(cause)).forEach(stackTraceElement -> {
-            st.append("\tat ").append(stackTraceElement.toString()).append("\n");
-        });
-        if (extraStackTraces != null) {
-            st.append("\tat ").append(extraStackTraces).append("\n");
-        }
-        message = st.toString();
-        return message;
-    }
-
-    @Override
-    public void printStackTrace() {
-        printStackTrace(System.err);
-    }
-
-    @Override
-    public void printStackTrace(PrintStream s) {
-        s.print(getBuildStackTrace());
-    }
-
-    @Override
-    public void printStackTrace(PrintWriter s) {
-        s.print(getBuildStackTrace());
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/CommandLoader.java

@@ -1,26 +0,0 @@
-/*
- *   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.command;
-
-public interface CommandLoader<T> {
-
-    AbstractCommand<T> get();
-    void add(Object command);
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/CommandUtils.java

@@ -1,148 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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.command;
-
-import de.steamwar.command.mapper.BooleanMapper;
-import de.steamwar.command.mapper.NumberMapper;
-import lombok.experimental.UtilityClass;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Repeatable;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.function.ToIntFunction;
-
-@UtilityClass
-public class CommandUtils {
-
-    final Map<String, AbstractTypeMapper<?, ?>> MAPPER_FUNCTIONS = new HashMap<>();
-
-    final Map<String, AbstractTypeValidator<?, ?>> VALIDATOR_FUNCTIONS = new HashMap<>();
-
-    final Map<String, AbstractTypeSupplier<?, ?>> SUPPLIER_FUNCTIONS = new HashMap<>();
-
-    static final AbstractTypeMapper<Object, String> STRING_MAPPER = new AbstractTypeMapper<>() {
-        @Override
-        public String map(Object sender, PreviousArguments previousArguments, String s) {
-            return s;
-        }
-
-        @Override
-        public Collection<String> tabComplete(Object sender, PreviousArguments previousArguments, String s) {
-            return Collections.singletonList(s);
-        }
-    };
-
-    static {
-        addMapper(boolean.class, Boolean.class, new BooleanMapper());
-        addMapper(int.class, Integer.class, new NumberMapper(Integer::parseInt, false));
-        addMapper(long.class, Long.class, new NumberMapper(Long::parseLong, false));
-        addMapper(float.class, Float.class, new NumberMapper(Float::parseFloat, true));
-        addMapper(double.class, Double.class, new NumberMapper(Double::parseDouble, true));
-        MAPPER_FUNCTIONS.put(String.class.getTypeName(), STRING_MAPPER);
-    }
-
-    private static void addMapper(Class<?> clazz, Class<?> alternativeClazz, AbstractTypeMapper<?, ?> mapper) {
-        MAPPER_FUNCTIONS.put(clazz.getTypeName(), mapper);
-        MAPPER_FUNCTIONS.put(alternativeClazz.getTypeName(), mapper);
-    }
-
-    public static <K, T> void addMapper(Class<T> clazz, AbstractTypeMapper<K, T> mapper) {
-        addMapper(clazz.getTypeName(), mapper);
-    }
-
-    public static <T> void addMapper(String name, AbstractTypeMapper<T, ?> mapper) {
-        MAPPER_FUNCTIONS.putIfAbsent(name, mapper);
-    }
-
-    public static <T> void addValidator(Class<T> clazz, AbstractTypeValidator<T, ?> validator) {
-        addValidator(clazz.getTypeName(), validator);
-    }
-
-    public static <T> void addValidator(String name, AbstractTypeValidator<T, ?> validator) {
-        VALIDATOR_FUNCTIONS.putIfAbsent(name, validator);
-    }
-
-    public static <T> void addSupplier(Class<T> clazz, AbstractTypeSupplier<T, ?> supplier) {
-        addSupplier(clazz.getTypeName(), supplier);
-    }
-
-    public static <T> void addSupplier(String name, AbstractTypeSupplier<T, ?> supplier) {
-        SUPPLIER_FUNCTIONS.putIfAbsent(name, supplier);
-    }
-
-    public static List<Annotation> getAnnotations(AnnotatedElement annotatedElement) {
-        List<Annotation> annotationList = new ArrayList<>();
-        for (Annotation annotation : annotatedElement.getAnnotations()) {
-            try {
-                Method method = annotation.annotationType().getMethod("value");
-                Class<?> returnType = method.getReturnType();
-                if (!returnType.isArray()) {
-                    annotationList.add(annotation);
-                    continue;
-                }
-                Class<?> innerReturnType = returnType.getComponentType();
-                if (!(innerReturnType.isAnnotation() && innerReturnType.isAnnotationPresent(Repeatable.class))) {
-                    annotationList.add(annotation);
-                    continue;
-                }
-                Repeatable repeatable = innerReturnType.getAnnotation(Repeatable.class);
-                Class<? extends Annotation> containerType = repeatable.value();
-                if (containerType == returnType) {
-                    throw new UnsupportedOperationException("Repeatable annotation must have a container annotation");
-                }
-                try {
-                    Annotation[] innerAnnotations = (Annotation[]) method.invoke(annotation);
-                    Collections.addAll(annotationList, innerAnnotations);
-                } catch (Exception e) {
-                    annotationList.add(annotation);
-                }
-            } catch (NoSuchMethodException e) {
-                annotationList.add(annotation);
-            }
-        }
-        annotationList.removeIf(anno -> !anno.annotationType().isAnnotationPresent(Handler.Implementation.class));
-        return annotationList;
-    }
-
-    public static <T extends Handler> List<Annotation> getAnnotations(AnnotatedElement annotatedElement, Class<T> type) {
-        List<Annotation> annotations = getAnnotations(annotatedElement);
-        annotations.removeIf(annotation -> {
-            Handler.Implementation implementation = annotation.annotationType().getAnnotation(Handler.Implementation.class);
-            return implementation == null || !type.isAssignableFrom(implementation.value());
-        });
-        return annotations;
-    }
-
-    public static ToIntFunction<Number> createComparator(String type, Handler.TypeWrapper clazz, int iValue, long lValue, float fValue, double dValue) {
-        if (clazz.is(int.class) || clazz.is(Integer.class)) {
-            return number -> Integer.compare(number.intValue(), iValue);
-        } else if (clazz.is(long.class) || clazz.is(Long.class)) {
-            return number -> Long.compare(number.longValue(), lValue);
-        } else if (clazz.is(float.class) || clazz.is(Float.class)) {
-            return number -> Float.compare(number.floatValue(), fValue);
-        } else if (clazz.is(double.class) || clazz.is(Double.class)) {
-            return number -> Double.compare(number.doubleValue(), dValue);
-        } else {
-            throw new IllegalArgumentException(type + " annotation is not supported for " + clazz);
-        }
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/DataImpl.java

@@ -1,186 +0,0 @@
-/*
- * 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.command;
-
-import de.steamwar.command.annotations.Supplier;
-import de.steamwar.command.graph.*;
-import de.steamwar.command.handler.GreedyHandler;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
-class DataImpl implements Handler.DataCheckable, Handler.DataReadable, Handler.DataWritable {
-
-    private final AbstractCommand<?> container;
-    private final Object self;
-    private final RootNode<?> node;
-    private final Map<Class<?>, Function<?, ?>> executorMapper;
-    private final Map<String, AbstractTypeMapper<?, ?>> mapper;
-    private final Map<String, AbstractTypeMapper<?, ?>> globalMapper;
-    private final Map<String, AbstractTypeValidator<?, ?>> validator;
-    private final Map<String, AbstractTypeValidator<?, ?>> globalValidator;
-    private final Map<String, AbstractTypeSupplier<?, ?>> supplier;
-    private final Map<String, AbstractTypeSupplier<?, ?>> globalSupplier;
-
-    private final Map<Method, Object> cache = new HashMap<>();
-
-    DataImpl(AbstractCommand<?> container, Object self, RootNode<?> node, Map<Class<?>, Function<?, ?>> executorMapper, Map<String, AbstractTypeMapper<?, ?>> mapper, Map<String, AbstractTypeMapper<?, ?>> globalMapper, Map<String, AbstractTypeValidator<?, ?>> validator, Map<String, AbstractTypeValidator<?, ?>> globalValidator, Map<String, AbstractTypeSupplier<?, ?>> supplier, Map<String, AbstractTypeSupplier<?, ?>> globalSupplier) {
-        this.container = container;
-        this.self = self;
-        this.node = node;
-        this.executorMapper = executorMapper;
-        this.mapper = mapper;
-        this.globalMapper = globalMapper;
-        this.validator = validator;
-        this.globalValidator = globalValidator;
-        this.supplier = supplier;
-        this.globalSupplier = globalSupplier;
-    }
-
-    @Override
-    public boolean hasExecutorMapper(Class<?> clazz) {
-        return getExecutorMapper(clazz) != null;
-    }
-
-    @Override
-    public Function<?, ?> getExecutorMapper(Class<?> clazz) {
-        for (Map.Entry<Class<?>, Function<?, ?>> entry : executorMapper.entrySet()) {
-            if (entry.getKey().isAssignableFrom(clazz)) {
-                return entry.getValue();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public boolean hasMapper(String key) {
-        return mapper.containsKey(key) || globalMapper.containsKey(key);
-    }
-
-    @Override
-    public <A, B> AbstractTypeMapper<A, B> getMapper(String key) {
-        return (AbstractTypeMapper<A, B>) mapper.getOrDefault(key, globalMapper.get(key));
-    }
-
-    @Override
-    public <A, B> void addMapper(String key, boolean local, AbstractTypeMapper<A, B> mapper) {
-        if (local) {
-            this.mapper.put(key, mapper);
-        } else {
-            this.globalMapper.putIfAbsent(key, mapper);
-        }
-    }
-
-    @Override
-    public boolean hasValidator(String key) {
-        return validator.containsKey(key) || globalValidator.containsKey(key);
-    }
-
-    @Override
-    public <A, B> AbstractTypeValidator<A, B> getValidator(String key) {
-        return (AbstractTypeValidator<A, B>) validator.getOrDefault(key, globalValidator.get(key));
-    }
-
-    @Override
-    public <A, B> void addValidator(String key, boolean local, AbstractTypeValidator<A, B> validator) {
-        if (local) {
-            this.validator.put(key, validator);
-        } else {
-            this.globalValidator.putIfAbsent(key, validator);
-        }
-    }
-
-    @Override
-    public boolean hasSupplier(String key) {
-        return supplier.containsKey(key) || globalSupplier.containsKey(key);
-    }
-
-    @Override
-    public <A, B> AbstractTypeSupplier<A, B> getSupplier(String key) {
-        return (AbstractTypeSupplier<A, B>) supplier.getOrDefault(key, globalSupplier.get(key));
-    }
-
-    @Override
-    public <A, B> void addSupplier(String key, boolean local, AbstractTypeSupplier<A, B> supplier) {
-        if (local) {
-            this.supplier.put(key, supplier);
-        } else {
-            this.globalSupplier.putIfAbsent(key, supplier);
-        }
-    }
-
-    /**
-     * Invoking the same method twice will result in the exact same result.
-     */
-    @Override
-    public <T> T invoke(Method method) {
-        return (T) cache.computeIfAbsent(method, m -> {
-            try {
-                return m.invoke(self);
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                return null;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
-    }
-
-    @Override
-    public void addCommand(Method method, String[] subCommand, String[] description, boolean noTabComplete) {
-        Node<?> temp = node;
-        container.descriptions.addAll(Arrays.asList(description));
-        if (noTabComplete) {
-            temp = temp.addChild(null, new NoTabCompleteNode<>());
-        }
-        for (int i = 0; i < subCommand.length; i++) {
-            temp = temp.addChild(null, new LiteralNode<>(subCommand[i]));
-        }
-        Parameter[] parameters = method.getParameters();
-        for (int i = 0; i < parameters.length; i++) {
-            Parameter parameter = parameters[i];
-            if (i == 0) {
-                temp = temp.addChild(parameter, new ExecutorTypeNode<>(parameter, i, this));
-                continue;
-            }
-            if (parameter.isAnnotationPresent(Supplier.class)) {
-                temp = temp.addChild(parameter, new SupplierNode<>(parameter, this));
-                continue;
-            }
-            Class<?> type = parameter.getType();
-            boolean isArray = parameter.isVarArgs() || type.isArray();
-            if (!isArray) {
-                temp = temp.addChild(parameter, new TypeNode<>(parameter, i, this));
-                continue;
-            }
-            boolean greedy = parameter.isVarArgs() || GreedyHandler.isGreedy(parameter);
-            if (greedy) {
-                temp = temp.addChild(parameter, new GreedyArrayNode<>(parameter, i, this));
-            } else {
-                temp = temp.addChild(parameter, new NonGreedyArrayNode<>(parameter, i, this));
-            }
-        }
-        temp.addChild(null, new ExecuteNode<>(self, method));
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/Handler.java

@@ -1,370 +0,0 @@
-/*
- * 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.command;
-
-import lombok.Getter;
-
-import java.lang.annotation.*;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-public interface Handler {
-
-    default Optional<Class<?>> getGenericTypeOfReturn(Method method) {
-        Type type;
-        try {
-            type = method.getGenericReturnType();
-        } catch (Exception e) {
-            return Optional.empty();
-        }
-        if (!(type instanceof ParameterizedType)) {
-            return Optional.empty();
-        }
-        ParameterizedType parameterizedType = (ParameterizedType) type;
-        Type[] generics = parameterizedType.getActualTypeArguments();
-        if (generics.length != 1 && generics.length != 2) {
-            return Optional.empty();
-        }
-        Type genericType = generics[generics.length - 1];
-        try {
-            return Optional.of(Class.forName(genericType.getTypeName()));
-        } catch (Exception e) {
-            return Optional.empty();
-        }
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.ANNOTATION_TYPE)
-    @interface Implementation {
-        Class<? extends Handler> value();
-    }
-
-    class HandlerException extends Exception {
-        @Getter
-        private final CodePlace codePlace;
-
-        public HandlerException(String message, CodePlace codePlace) {
-            super(message);
-            this.codePlace = codePlace;
-        }
-    }
-
-    interface DataCheckable {
-        boolean hasExecutorMapper(Class<?> clazz);
-
-        boolean hasMapper(String key);
-
-        boolean hasValidator(String key);
-
-        boolean hasSupplier(String key);
-    }
-
-    interface DataReadable {
-        Function<?, ?> getExecutorMapper(Class<?> clazz);
-
-        <A, B> AbstractTypeMapper<A, B> getMapper(String key);
-
-        <A, B> AbstractTypeValidator<A, B> getValidator(String key);
-
-        <A, B> AbstractTypeSupplier<A, B> getSupplier(String key);
-    }
-
-    interface DataWritable {
-        Function<?, ?> getExecutorMapper(Class<?> clazz);
-
-        <A, B> void addMapper(String key, boolean local, AbstractTypeMapper<A, B> mapper);
-
-        <A, B> void addValidator(String key, boolean local, AbstractTypeValidator<A, B> validator);
-
-        <A, B> void addSupplier(String key, boolean local, AbstractTypeSupplier<A, B> supplier);
-
-        /**
-         * Invoking the same method twice will result in the exact same result.
-         */
-        <T> T invoke(Method method);
-
-        void addCommand(Method method, String[] subCommand, String[] description, boolean noTabComplete);
-    }
-
-    interface HandlerMethod<T extends Annotation> extends Handler {
-        void check(AnnotationWrapper<T> annotation, MethodWrapper method, DataCheckable dataCheckable) throws HandlerException;
-
-        int getRunPriority();
-
-        void run(T annotation, Method method, DataWritable dataWritable);
-    }
-
-    interface HandlerParameter<T extends Annotation, A, B> extends Handler {
-        void check(AnnotationWrapper<T> annotation, MethodWrapper methodWrapper, ParameterWrapper parameter, int index, DataCheckable dataCheckable) throws HandlerException;
-
-        default boolean needsParentTypeMapper() {
-            return false;
-        }
-
-        /**
-         * Null values are allowed to be returned.
-         */
-        default AbstractTypeMapper<A, B> getTypeMapper(T annotation, Parameter parameter, int index, DataReadable dataReadable, AbstractTypeMapper<A, B> parentTypeMapper) {
-            return null;
-        }
-
-        default int getValidatorPriority() {
-            return 0;
-        }
-
-        /**
-         * Null values are allowed to be returned.
-         */
-        default AbstractTypeValidator<A, B> getValidator(T annotation, Parameter parameter, int index, DataReadable dataReadable) {
-            return null;
-        }
-    }
-
-    @Getter
-    class CodePlace {
-
-        private final MethodWrapper method;
-        private final ParameterWrapper parameter;
-        private final AnnotationWrapper<?>[] annotations;
-
-        public CodePlace(MethodWrapper method, AnnotationWrapper<?>... annotations) {
-            this.method = method;
-            this.parameter = null;
-            this.annotations = annotations;
-        }
-
-        public CodePlace(ParameterWrapper parameter, AnnotationWrapper<?>... annotations) {
-            this.method = null;
-            this.parameter = parameter;
-            this.annotations = annotations;
-        }
-    }
-
-    interface MethodWrapper {
-        String getName();
-
-        int getParameterCount();
-
-        TypeWrapper getReturnType();
-
-        ParameterWrapper[] getParameters();
-
-        class ForMethod implements MethodWrapper {
-
-            @Getter
-            private final Method method;
-
-            public ForMethod(Method method) {
-                this.method = method;
-            }
-
-            @Override
-            public String getName() {
-                return method.getName();
-            }
-
-            @Override
-            public int getParameterCount() {
-                return method.getParameterCount();
-            }
-
-            @Override
-            public TypeWrapper getReturnType() {
-                return new TypeWrapper.ForClass(method.getReturnType());
-            }
-
-            @Override
-            public ParameterWrapper[] getParameters() {
-                return Arrays.stream(method.getParameters()).map(ParameterWrapper.ForParameter::new).toArray(ParameterWrapper[]::new);
-            }
-        }
-    }
-
-    interface ParameterWrapper {
-        TypeWrapper getType();
-
-        boolean isVarArgs();
-
-        boolean isAnnotationPresent(Class<? extends Annotation> annotation);
-
-        <A extends Annotation> AnnotationWrapper<A> getAnnotation(Class<A> annotation);
-
-        String getName();
-
-        List<AnnotationWrapper<?>> getAnnotations();
-
-        class ForParameter implements ParameterWrapper {
-
-            @Getter
-            private final Parameter parameter;
-
-            public ForParameter(Parameter parameter) {
-                this.parameter = parameter;
-            }
-
-            @Override
-            public TypeWrapper getType() {
-                return new TypeWrapper.ForClass(this.parameter.getType());
-            }
-
-            @Override
-            public boolean isVarArgs() {
-                return parameter.isVarArgs();
-            }
-
-            @Override
-            public boolean isAnnotationPresent(Class<? extends Annotation> annotation) {
-                return parameter.isAnnotationPresent(annotation);
-            }
-
-            @Override
-            public <A extends Annotation> AnnotationWrapper<A> getAnnotation(Class<A> annotation) {
-                return new AnnotationWrapper.ForAnnotation<>(parameter.getAnnotation(annotation));
-            }
-
-            @Override
-            public String getName() {
-                return parameter.getName();
-            }
-
-            @Override
-            public List<AnnotationWrapper<?>> getAnnotations() {
-                return CommandUtils.getAnnotations(parameter)
-                        .stream()
-                        .map(AnnotationWrapper.ForAnnotation::new)
-                        .collect(Collectors.toList());
-            }
-        }
-    }
-
-    interface TypeWrapper {
-
-        boolean isAssignableTo(Class<?> clazz);
-
-        boolean isAssignableTo(TypeWrapper type);
-
-        boolean isPrimitive();
-
-        boolean isArray();
-
-        boolean isEnum();
-
-        boolean is(Class<?> clazz);
-
-        boolean is(TypeWrapper type);
-
-        TypeWrapper getComponentType();
-
-        String getName();
-
-        String getTypeName();
-
-        class ForClass implements TypeWrapper {
-            @Getter
-            private final Class<?> clazz;
-
-            public ForClass(Class<?> clazz) {
-                this.clazz = clazz;
-            }
-
-            @Override
-            public boolean isAssignableTo(Class<?> clazz) {
-                return clazz.isAssignableFrom(this.clazz);
-            }
-
-            @Override
-            public boolean isAssignableTo(TypeWrapper type) {
-                if (type instanceof ForClass) {
-                    return ((ForClass) type).getClazz().isAssignableFrom(clazz);
-                }
-                return false;
-            }
-
-            @Override
-            public boolean isPrimitive() {
-                return clazz.isPrimitive();
-            }
-
-            @Override
-            public boolean isArray() {
-                return clazz.isArray();
-            }
-
-            @Override
-            public boolean isEnum() {
-                return clazz.isEnum();
-            }
-
-            @Override
-            public boolean is(Class<?> clazz) {
-                return this.clazz == clazz;
-            }
-
-            @Override
-            public boolean is(TypeWrapper type) {
-                if (type instanceof ForClass) {
-                    return ((ForClass) type).getClazz() == this.clazz;
-                }
-                return false;
-            }
-
-            @Override
-            public TypeWrapper getComponentType() {
-                return new TypeWrapper.ForClass(this.clazz.getComponentType());
-            }
-
-            @Override
-            public String getName() {
-                return this.clazz.getName();
-            }
-
-            @Override
-            public String getTypeName() {
-                return this.clazz.getTypeName();
-            }
-        }
-    }
-
-    interface AnnotationWrapper<A extends Annotation> {
-
-        A getAnnotation();
-
-        class ForAnnotation<A extends Annotation> implements AnnotationWrapper<A> {
-
-            private A annotation;
-
-            public ForAnnotation(A annotation) {
-                this.annotation = annotation;
-            }
-
-            @Override
-            public A getAnnotation() {
-                return this.annotation;
-            }
-        }
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/OptionEnum.java

@@ -1,30 +0,0 @@
-/*
- * 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.command;
-
-import java.util.Arrays;
-import java.util.List;
-
-public interface OptionEnum<T extends Enum<T> & OptionEnum<T>> {
-    default List<String> getTabCompletes() {
-        return Arrays.asList("-" + ((T) this).name().toLowerCase());
-    }
-    T[] getRemoved();
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/PreviousArguments.java

@@ -1,96 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2022  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.command;
-
-import lombok.NonNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
-
-public class PreviousArguments {
-
-    public final String[] userArgs;
-    public final Object[] mappedArgs;
-    public final boolean hasMoreArguments;
-    private final Function<String, Object> getByNameFunction;
-    private boolean usedOptionalValue = false;
-
-    public PreviousArguments(String[] userArgs, Object[] mappedArgs, boolean hasMoreArguments, Function<String, Object> getByNameFunction) {
-        this.userArgs = userArgs;
-        this.mappedArgs = mappedArgs;
-        this.hasMoreArguments = hasMoreArguments;
-        this.getByNameFunction = getByNameFunction;
-    }
-
-    public boolean hasUsedOptionalValue() {
-        return usedOptionalValue;
-    }
-
-    public void usedOptionalValue() {
-        this.usedOptionalValue = true;
-    }
-
-    public String getUserArg(int index) {
-        return userArgs[userArgs.length - index - 1];
-    }
-
-    public <T> T getMappedArg(int index) {
-        return (T) mappedArgs[mappedArgs.length - index - 1];
-    }
-
-    public <T> Optional<T> getFirst(Class<T> clazz) {
-        for (Object o : mappedArgs) {
-            if (clazz.isInstance(o)) {
-                return Optional.of((T) o);
-            }
-        }
-        return Optional.empty();
-    }
-
-    public <T> List<T> getAll(Class<T> clazz) {
-        List<T> list = new ArrayList<>();
-        for (Object o : mappedArgs) {
-            if (clazz.isInstance(o)) {
-                list.add((T) o);
-            }
-            if (o == null) {
-                continue;
-            }
-            if (o.getClass().isArray()) {
-                Object[] array = (Object[]) o;
-                if (array.length == 0) {
-                    continue;
-                }
-                for (Object o1 : array) {
-                    if (clazz.isInstance(o1)) {
-                        list.add((T) o1);
-                    }
-                }
-            }
-        }
-        return list;
-    }
-
-    public <T> T getByName(@NonNull String name) {
-        return (T) getByNameFunction.apply(name);
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/TabCompletionCache.java

@@ -1,109 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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.command;
-
-import de.steamwar.command.mapper.internal.DelegatingMapper;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.UtilityClass;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-@UtilityClass
-public class TabCompletionCache {
-
-    private final Map<Key, TabCompletions> tabCompletionCache = new ConcurrentHashMap<>();
-
-    Set<AbstractTypeMapper<?, ?>> cached = new HashSet<>();
-    Set<AbstractTypeMapper<?, ?>> global = new HashSet<>();
-    Map<AbstractTypeMapper<?, ?>, Long> cacheDuration = new HashMap<>();
-
-    static {
-        Thread thread = new Thread(() -> {
-            while (true) {
-                Set<Key> toRemove = new HashSet<>();
-                for (Map.Entry<Key, TabCompletions> tabCompletionsEntry : tabCompletionCache.entrySet()) {
-                    if (System.currentTimeMillis() - tabCompletionsEntry.getValue().timestamp > cacheDuration.get(tabCompletionsEntry.getKey().typeMapper)) {
-                        toRemove.add(tabCompletionsEntry.getKey());
-                    }
-                }
-                for (Key key : toRemove) {
-                    tabCompletionCache.remove(key);
-                }
-
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                }
-            }
-        });
-        thread.setName("TabCompletionCache Invalidator");
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    public void add(AbstractTypeMapper<?, ?> typeMapper, boolean global, long cacheDuration, TimeUnit timeUnit) {
-        TabCompletionCache.cached.add(typeMapper);
-        if (global) TabCompletionCache.global.add(typeMapper);
-        TabCompletionCache.cacheDuration.put(typeMapper, timeUnit.toMillis(cacheDuration));
-    }
-
-    public <A, B> AbstractTypeMapper<A, B> cached(AbstractTypeMapper<A, B> dataMapper, AbstractTypeMapper<A, B> toBeCached) {
-        if (!cached.contains(dataMapper)) return toBeCached;
-        boolean global = TabCompletionCache.global.contains(dataMapper);
-        long cacheDuration = TabCompletionCache.cacheDuration.get(dataMapper);
-
-        return new DelegatingMapper<>(toBeCached, null) {
-            @Override
-            public Collection<String> tabComplete(A sender, PreviousArguments previousArguments, String s) {
-                String normalizedArg = dataMapper.normalize(global ? null : sender, s);
-                if (normalizedArg == null) normalizedArg = "";
-                Key key = new Key(global ? null : sender, normalizedArg, dataMapper);
-
-                TabCompletions tabCompletions = tabCompletionCache.computeIfAbsent(key, ignore -> {
-                    return new TabCompletions(System.currentTimeMillis(), toBeCached.tabComplete(sender, previousArguments, s));
-                });
-
-                if (System.currentTimeMillis() - tabCompletions.timestamp > cacheDuration) {
-                    tabCompletions.tabCompletions = toBeCached.tabComplete(sender, previousArguments, s);
-                }
-                tabCompletions.timestamp = System.currentTimeMillis();
-                return tabCompletions.tabCompletions;
-            }
-        };
-    }
-
-    @EqualsAndHashCode
-    @AllArgsConstructor
-    private static class Key {
-        private Object sender;
-        private String arg;
-        private AbstractTypeMapper<?, ?> typeMapper;
-    }
-
-    @AllArgsConstructor
-    private static class TabCompletions {
-        private long timestamp;
-        private Collection<String> tabCompletions;
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/AllowNull.java

@@ -1,37 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.AllowNullHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to allow null values passed to the command.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(AllowNullHandler.Impl.class)
-public @interface AllowNull {
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/ArrayLength.java

@@ -1,53 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.ArrayLengthHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define a minimum and maximum length the supplied array can have.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(ArrayLengthHandler.Impl.class)
-public @interface ArrayLength {
-    /**
-     * Inclusive
-     */
-    int min() default 0;
-
-    /**
-     * Inclusive
-     */
-    int max() default Integer.MAX_VALUE;
-
-    /**
-     * Error message if too few Elements got parsed. There are 2 arguments provided to the message.
-     * The first is the number of elements that got parsed as a number and the second one is how many
-     * should have been parsed, so the min number of elements expected.
-     */
-    String error() default "";
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Cached.java

@@ -1,52 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.AbstractTypeMapper;
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.CachedHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.concurrent.TimeUnit;
-
-/**
- * This annotation is used to register a or {@link Mapper}
- * on registration as being cached. Only TabCompletions are cached for the duration
- * denoted by {@link #timeUnit()} and {@link #cacheDuration()} using
- * {@link TimeUnit#toMillis(long)}. If {@link #global()} is {@code true}, the
- * cache will not be created per player but for everyone. This is useful for
- * commands that are not player specific.
- * <br><br>
- * To calculate the cache key for a {@link AbstractTypeMapper} the
- * {@link AbstractTypeMapper#normalize(Object, String)} method is called.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
-@Handler.Implementation(CachedHandler.Impl.class)
-public @interface Cached {
-    long cacheDuration() default 5;
-
-    TimeUnit timeUnit() default TimeUnit.SECONDS;
-
-    boolean global() default false;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/ClassMapper.java

@@ -1,56 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.AbstractTypeMapper;
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.ClassMapperHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for registering a method as a class mapper.
- * The annotated method will be executed while {@link #initialize()}
- * is evaluated. The result of this method will be cached under the
- * name {@link ClassMapper#value()} converted to a {@link String} using
- * {@link Class#getTypeName()}. {@link AbstractTypeMapper} will be used
- * as the default mapper if the type this mapper is registered for is
- * found as a parameter of any command method annotated with {@link Register}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
-@Handler.Implementation(ClassMapperHandler.Impl.class)
-@Deprecated
-@DeprecationInfo("Use @Mapper instead")
-public @interface ClassMapper {
-
-    /**
-     * The type this mapper is registered for.
-     */
-    Class<?> value();
-
-    /**
-     * If {@code true}, the mapper will only be used in the current command class.
-     */
-    boolean local() default true;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/ClassValidator.java

@@ -1,53 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.ClassValidatorHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for registering a method as a class validator.
- * The annotated method will be executed while {@link #initialize()}
- * is evaluated. The result of this method will be cached under the
- * name {@link ClassValidator#value()} converted to a {@link String} using
- * {@link Class#getTypeName()}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
-@Handler.Implementation(ClassValidatorHandler.Impl.class)
-@Deprecated
-@DeprecationInfo("Use @Validator instead")
-public @interface ClassValidator {
-
-    /**
-     * The type this validator is registered for.
-     */
-    Class<?> value();
-
-    /**
-     * If {@code true}, the validator will only be used in the current command class.
-     */
-    boolean local() default true;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/DeprecationInfo.java

@@ -1,28 +0,0 @@
-/*
- *   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.command.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface DeprecationInfo {
-    String value();
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/EndsWith.java

@@ -1,38 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.EndsWithHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(EndsWithHandler.Impl.class)
-public @interface EndsWith {
-
-    String value();
-
-    String error() default "";
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/ErrorMessage.java

@@ -1,48 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.ErrorMessageHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define an error message for a parameter.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(ErrorMessageHandler.Impl.class)
-public @interface ErrorMessage {
-    /**
-     * Error message to be displayed when the parameter is invalid.
-     */
-    String value();
-
-    /**
-     * This is the short form for 'allowEmptyArrays'.
-     */
-    @Deprecated
-    @DeprecationInfo("Use @ArrayLength instead of this flag")
-    boolean allowEAs() default true;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Greedy.java

@@ -1,46 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.GreedyHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation can have a huge performance impact. Both positive and negative.
- * You can design your command to be more flexible and allow performance improvements if used correctly.
- * <br><br>
- * The more restrictive the underlying array type is, the more performance can be gained.
- * <br><br>
- * Using this annotation on the varargs parameter of a command will not have any effect, since they are already treated as greedy arrays.
- * <br><br>
- * The {@link #backTrackingDepth()} can be used to limit the amount of backtracking that is done. This can be used to improve performance.
- * For varargs parameters, this value is defaulted to 0, since they are at the end of the parameter list.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(GreedyHandler.Impl.class)
-public @interface Greedy {
-    int backTrackingDepth() default Integer.MAX_VALUE;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Length.java

@@ -1,46 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.LengthHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define a minimum and maximum length the supplied string can have.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(LengthHandler.Impl.class)
-public @interface Length {
-    /**
-     * Inclusive
-     */
-    int min() default 0;
-
-    /**
-     * Inclusive
-     */
-    int max() default Integer.MAX_VALUE;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Mapper.java

@@ -1,58 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.AbstractTypeMapper;
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.MapperHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for registering a method as a mapper. The annotated method will
- * be executed while {@link #initialize()} is evaluated. The result of this
- * method will be cached under either {@link Mapper#value()} or {@link Mapper#value()}.
- * If {@link Mapper#type()} is used any parameter using that type will be using
- * this {@link AbstractTypeMapper} implicitly. While using this annotation on
- * a method it can be possible to not supply any type. On a parameter you can
- * only use this annotation using the {@link Mapper#value()} value.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.METHOD})
-@Handler.Implementation(MapperHandler.Impl.class)
-public @interface Mapper {
-    /**
-     * The name this mapper is registered for.
-     */
-    String value() default "";
-
-    /**
-     * The type this mapper is registered for.
-     */
-    Class<?> type() default void.class;
-
-    /**
-     * If {@code true}, the mapper will only be used in the current command class.
-     */
-    boolean local() default true;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Max.java

@@ -1,70 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.MaxHandler;
-import de.steamwar.command.handler.MaxReferenceHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define a maximum number value for a parameter.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(MaxHandler.Impl.class)
-public @interface Max {
-    int intValue() default Integer.MAX_VALUE;
-
-    long longValue() default Long.MAX_VALUE;
-
-    float floatValue() default Float.MAX_VALUE;
-
-    double doubleValue() default Double.MAX_VALUE;
-
-    boolean inclusive() default true;
-
-    /**
-     * Error message to be displayed when the argument supplied is bigger than this allows.
-     * Two arguments are supplied to the error message. The first is the number that got parsed
-     * and the second is the max this annotation allows.
-     */
-    String error() default "";
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target({ElementType.PARAMETER})
-    @Handler.Implementation(MaxReferenceHandler.Impl.class)
-    @interface Reference {
-        String value();
-
-        boolean inclusive() default true;
-
-        /**
-         * Error message to be displayed when the argument supplied is smaller than this allows.
-         * Two arguments are supplied to the error message. The first is the number that got parsed
-         * and the second is the min this annotation allows.
-         */
-        String error() default "";
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Min.java

@@ -1,70 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.MinHandler;
-import de.steamwar.command.handler.MinReferenceHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define a minimum number value for a parameter.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(MinHandler.Impl.class)
-public @interface Min {
-    int intValue() default Integer.MIN_VALUE;
-
-    long longValue() default Long.MIN_VALUE;
-
-    float floatValue() default Float.MIN_VALUE;
-
-    double doubleValue() default Double.MIN_VALUE;
-
-    boolean inclusive() default true;
-
-    /**
-     * Error message to be displayed when the argument supplied is smaller than this allows.
-     * Two arguments are supplied to the error message. The first is the number that got parsed
-     * and the second is the min this annotation allows.
-     */
-    String error() default "";
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target({ElementType.PARAMETER})
-    @Handler.Implementation(MinReferenceHandler.Impl.class)
-    @interface Reference {
-        String value();
-
-        boolean inclusive() default true;
-
-        /**
-         * Error message to be displayed when the argument supplied is smaller than this allows.
-         * Two arguments are supplied to the error message. The first is the number that got parsed
-         * and the second is the min this annotation allows.
-         */
-        String error() default "";
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Name.java

@@ -1,31 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.command.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-public @interface Name {
-    String value();
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/OptionalValue.java

@@ -1,46 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.OptionalValueHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define a default value for a parameter.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(OptionalValueHandler.Impl.class)
-public @interface OptionalValue {
-    /**
-     * Will pe parsed against the TypeMapper specified by the parameter or annotation.
-     */
-    String value();
-
-    /**
-     * The method name stands for 'onlyUseIfNoneIsGiven'.
-     */
-    boolean onlyUINIG() default false;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Regex.java

@@ -1,38 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.RegexHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(RegexHandler.Impl.class)
-public @interface Regex {
-
-    String value();
-
-    String error() default "";
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Register.java

@@ -1,57 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.RegisterHandler;
-
-import java.lang.annotation.*;
-
-/**
- * Annotation for registering a method as a command.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
-@Repeatable(Register.Registers.class)
-@Handler.Implementation(RegisterHandler.Impl.class)
-public @interface Register {
-
-    /**
-     * Identifier of subcommand.
-     */
-    String[] value() default {};
-
-    /**
-     * Description of subcommand.
-     */
-    String[] description() default {};
-
-    /**
-     * If {@code true}, the command will not be tab completed.
-     */
-    boolean noTabComplete() default false;
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target({ElementType.METHOD})
-    @Handler.Implementation(RegisterHandler.Impl.class)
-    @interface Registers {
-        Register[] value();
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/StartsWith.java

@@ -1,38 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.StartsWithHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(StartsWithHandler.Impl.class)
-public @interface StartsWith {
-
-    String value();
-
-    String error() default "";
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/StaticValue.java

@@ -1,58 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.StaticValueHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define static values for a parameter like an enum just without the enum.
- * You can use this annotation on a parameter of type {@link String} or {@link int}, {@link long} and
- * {@link boolean}. While using an int, the value will represent the index into the value array. While
- * using a boolean, the {@link #falseValues()} defines which indices are considered {@code false} or
- * {@code true}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(StaticValueHandler.Impl.class)
-@Deprecated
-@DeprecationInfo("Use @Values instead")
-public @interface StaticValue {
-    String[] value();
-
-    /**
-     * This is the short form for 'allowImplicitSwitchExpressions'
-     * and can be set to true if you want to allow int as well as boolean as annotated parameter types.
-     * The value array needs to be at least 2 long for this flag to be considered.
-     * While using an int, the value will represent the index into the value array.
-     * While using a boolean, the {@link #falseValues()} defines which indices are
-     * considered {@code false} or {@code true}.
-     */
-    @Deprecated
-    @DeprecationInfo("Dont need to set this to true")
-    boolean allowISE() default false;
-
-    int[] falseValues() default {0};
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Supplier.java

@@ -1,48 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.SupplierHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.METHOD})
-@Handler.Implementation(SupplierHandler.Impl.class)
-public @interface Supplier {
-    /**
-     * The name this supplier is registered for.
-     */
-    String value() default "";
-
-    /**
-     * The type this supplier is registered for.
-     */
-    Class<?> type() default void.class;
-
-    /**
-     * If {@code true}, the supplier will only be used in the current command class.
-     */
-    boolean local() default true;
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/TabFilter.java

@@ -1,40 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.TabFilterHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation defines per Parameter how the TabCompletions should be filtered and displayed by the client.
- * There are 3 modes further described by {@link TabFilterType}. If this annotation is not present the default
- * {@link TabFilterType#STARTS_WITH} is used.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(TabFilterHandler.Impl.class)
-public @interface TabFilter {
-    TabFilterType value();
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/TabFilterType.java

@@ -1,41 +0,0 @@
-/*
- *   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.command.annotations;
-
-public enum TabFilterType {
-
-    /**
-     * This value defines that, the starts with tab-completion filter is used.<br>
-     * see: {@link de.steamwar.command.mapper.internal.StartsWithFilter} for more.
-     */
-    STARTS_WITH,
-
-    /**
-     * This value defines that, the contains tab-completions filter is used.
-     * see: {@link de.steamwar.command.mapper.internal.ContainsFilter} for more.
-     */
-    CONTAINS,
-
-    /**
-     * This value disables any tab-completion filters and just returns anything you
-     * specified inside the TypeMapper.
-     */
-    NONE
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Unique.java

@@ -1,37 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.UniqueHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define an array with unique values.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(UniqueHandler.Impl.class)
-public @interface Unique {
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Validator.java

@@ -1,68 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.ValidatorHandler;
-
-import java.lang.annotation.*;
-
-/**
- * Annotation for registering a method as a validator.
- * The annotated method will be executed while {@link #initialize()}
- * is evaluated. The result of this method will be cached under the
- * name {@link ClassValidator#value()} converted to a {@link String} using
- * {@link Class#getTypeName()}.
- * This annotation can also be used on parameters to apply a validator to them.
- * You can leave the {@link #value()} empty here to use the type of the parameter.
- * For registering you should never leave {@link #value()} empty.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.METHOD})
-@Handler.Implementation(ValidatorHandler.Impl.class)
-@Repeatable(Validator.Validators.class)
-public @interface Validator {
-    /**
-     * The name this validator is registered for.
-     */
-    String value() default "";
-
-    /**
-     * The type this validator is registered for.
-     */
-    Class<?> type() default void.class;
-
-    /**
-     * If {@code true}, the validator will only be used in the current command class.
-     */
-    boolean local() default true;
-
-    /**
-     * If {@code true}, the validator will be inverted for parameter usage.
-     */
-    boolean invert() default false;
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target({ElementType.PARAMETER})
-    @Handler.Implementation(ValidatorHandler.Impl.class)
-    @interface Validators {
-        Validator[] value();
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/annotations/Values.java

@@ -1,52 +0,0 @@
-/*
- *   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.command.annotations;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.ValuesHandler;
-import de.steamwar.command.handler.ValuesReferenceHandler;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is used to define static values for a parameter like an enum just without the enum.
- * You can use this annotation on a parameter of type {@link String} or {@link int}, {@link long} and
- * {@link boolean}. While using an int, the value will represent the index into the value array. While
- * using a boolean, the {@link #falseValues()} defines which indices are considered {@code false} or
- * {@code true}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER})
-@Handler.Implementation(ValuesHandler.Impl.class)
-public @interface Values {
-    String[] value();
-
-    int[] falseValues() default {0};
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target({ElementType.PARAMETER})
-    @Handler.Implementation(ValuesReferenceHandler.Impl.class)
-    @interface Reference {
-        String value();
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/AbstractArrayNode.java

@@ -1,110 +0,0 @@
-/*
- * 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.command.graph;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.PreviousArguments;
-import de.steamwar.command.handler.ArrayLengthHandler;
-import de.steamwar.command.handler.UniqueHandler;
-import de.steamwar.command.utils.Triple;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Parameter;
-import java.util.*;
-
-public abstract class AbstractArrayNode<E> extends AbstractTypeNode<E> {
-
-    protected final boolean unique;
-    protected final int minArrayLength;
-    protected final int maxArrayLength;
-    protected final String error;
-
-    protected AbstractArrayNode(Parameter parameter, int index, Handler.DataReadable dataReadable) {
-        super(parameter, index, dataReadable);
-
-        this.unique = UniqueHandler.isPresent(parameter);
-        this.minArrayLength = ArrayLengthHandler.getMin(parameter);
-        this.maxArrayLength = ArrayLengthHandler.getMax(parameter);
-        this.error = ArrayLengthHandler.getError(parameter);
-    }
-
-    @Override
-    public void tabComplete(E executor, NodeData nodeData, List<Collection<String>> completions) {
-        Object array = Array.newInstance(type, Math.min(nodeData.unparsedArgumentsSize(), maxArrayLength));
-
-        int i = 0;
-        while (!nodeData.hasOneLeft()) {
-            if (i >= minArrayLength) {
-                for (Node<E> child : children) {
-                    child.tabComplete(executor, nodeData, completions);
-                }
-            }
-
-            nodeData.add(name, arrayCopy(array, i));
-            Triple<Object, Boolean, Boolean> argument = argument(executor, nodeData);
-            nodeData.remove();
-
-            if (!argument.b) {
-                for (; i > 0; i--) nodeData.unconsume();
-                return;
-            }
-            nodeData.consume();
-            Array.set(array, i, argument.a);
-            i++;
-        }
-        nodeData.add(name, arrayCopy(array, i));
-        if (i < maxArrayLength) {
-            PreviousArguments previousArguments = nodeData.toPreviousArguments();
-            if (unique) {
-                Map<Object, List<String>> mapped = new HashMap<>();
-                for (String s : typeMapper.tabComplete(executor, previousArguments, nodeData.current())) {
-                    mapped.computeIfAbsent(typeMapper.map(executor, previousArguments, s), object -> new ArrayList<>())
-                            .add(s);
-                }
-                for (int j = 0; j < i; j++) {
-                    mapped.remove(Array.get(array, j));
-                }
-                mapped.forEach((object, strings) -> {
-                    completions.add(strings);
-                });
-            } else {
-                completions.add(typeMapper.tabComplete(executor, previousArguments, nodeData.current()));
-            }
-        }
-        if (i >= minArrayLength) {
-            for (Node<E> child : children) {
-                child.tabComplete(executor, nodeData, completions);
-            }
-        }
-        nodeData.remove();
-        for (; i > 0; i--) nodeData.unconsume();
-    }
-
-    protected Object arrayCopy(Object array, int newLength) {
-        Object newArray = Array.newInstance(type, newLength);
-        System.arraycopy(array, 0, newArray, 0, Math.min(Array.getLength(array), newLength));
-        return newArray;
-    }
-
-    @Override
-    public int nodeCost() {
-        return minArrayLength * 2 + super.nodeCost();
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/AbstractTypeNode.java

@@ -1,145 +0,0 @@
-/*
- * 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.command.graph;
-
-import de.steamwar.command.*;
-import de.steamwar.command.annotations.TabFilterType;
-import de.steamwar.command.handler.TabFilterHandler;
-import de.steamwar.command.mapper.EnumMapper;
-import de.steamwar.command.mapper.OptionEnumMapper;
-import de.steamwar.command.mapper.internal.ContainsFilter;
-import de.steamwar.command.mapper.internal.StartsWithFilter;
-import de.steamwar.command.utils.Pair;
-import de.steamwar.command.utils.Triple;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Parameter;
-import java.util.List;
-
-public abstract class AbstractTypeNode<E> extends AbstractValidationNode<E> {
-
-    protected Class<?> type;
-    protected AbstractTypeMapper<E, Object> typeMapper;
-
-    protected AbstractTypeNode(Parameter parameter, int index, Handler.DataReadable dataReadable) {
-        super(parameter, index, dataReadable);
-
-        type = parameter.getType();
-        if (type.isArray()) type = type.getComponentType();
-
-        initializeTypeMapper(handlerParameters, parameter, index, dataReadable);
-    }
-
-    private AbstractTypeMapper<E, Object> getTypeMapper(Handler.DataReadable dataReadable) {
-        AbstractTypeMapper<E, Object> typeMapper = dataReadable.getMapper(type.getTypeName());
-        if (typeMapper == null && type.isEnum()) {
-            if (OptionEnum.class.isAssignableFrom(type)) {
-                typeMapper = (AbstractTypeMapper) new OptionEnumMapper((Class) type);
-            } else {
-                typeMapper = (AbstractTypeMapper) new EnumMapper((Class) type);
-            }
-        }
-        return typeMapper;
-    }
-
-    private void initializeTypeMapper(List<Pair<Annotation, Handler.HandlerParameter>> pairs, Parameter parameter, int index, Handler.DataReadable dataReadable) {
-        AbstractTypeMapper<E, Object> typeMapper = getTypeMapper(dataReadable);
-        boolean isStillDefault = true;
-        for (Pair<Annotation, Handler.HandlerParameter> pair : pairs) {
-            if (pair.b.needsParentTypeMapper()) {
-                continue;
-            }
-            if (!isStillDefault) {
-                throw new UnsupportedOperationException("Only one HandlerParameter can be used without a parent TypeMapper");
-            }
-            AbstractTypeMapper<E, Object> temp = pair.b.getTypeMapper(pair.a, parameter, index, dataReadable, null);
-            if (temp != null) {
-                typeMapper = temp;
-                isStillDefault = false;
-            }
-        }
-
-        AbstractTypeMapper<E, Object> current = typeMapper;
-        for (Pair<Annotation, Handler.HandlerParameter> pair : pairs) {
-            if (!pair.b.needsParentTypeMapper()) {
-                continue;
-            }
-            AbstractTypeMapper<E, Object> temp = pair.b.getTypeMapper(pair.a, parameter, index, dataReadable, typeMapper);
-            if (temp != null) {
-                typeMapper = temp;
-            }
-        }
-
-        current = TabCompletionCache.cached(current, typeMapper);
-
-        TabFilterType tabFilterType = TabFilterHandler.getTabFilterType(parameter);
-        switch (tabFilterType) {
-            case NONE:
-                this.typeMapper = current;
-                break;
-            case STARTS_WITH:
-                this.typeMapper = new StartsWithFilter<>(current);
-                break;
-            case CONTAINS:
-                this.typeMapper = new ContainsFilter<>(current);
-                break;
-        }
-    }
-
-    protected Triple<Object, Boolean, Boolean> argument(E executor, NodeData nodeData) {
-        Object value;
-        boolean usedOptional;
-        try {
-            PreviousArguments previousArguments = nodeData.toPreviousArguments();
-            value = typeMapper.map(executor, previousArguments, nodeData.current());
-            usedOptional = previousArguments.hasUsedOptionalValue();
-        } catch (Exception e) {
-            return new Triple<>(null, false, false);
-        }
-        if (validate(executor, value, nodeData)) {
-            return new Triple<>(value, true, usedOptional);
-        } else {
-            return new Triple<>(null, false, false);
-        }
-    }
-
-    protected boolean validate(E executor, Object value, NodeData nodeData) {
-        for (AbstractTypeValidator<E, Object> validator : validators) {
-            try {
-                if (!validator.validate(executor, value, nodeData)) {
-                    return false;
-                }
-            } catch (ClassCastException e) {
-                // Ignore
-            } catch (Throwable e) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public boolean equals(Parameter parameter, Node<E> children) {
-        if (!(children instanceof AbstractTypeNode)) {
-            return false;
-        }
-        return super.equals(parameter, children);
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/AbstractValidationNode.java

@@ -1,109 +0,0 @@
-/*
- * 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.command.graph;
-
-import de.steamwar.command.AbstractTypeValidator;
-import de.steamwar.command.CommandUtils;
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.AllowNullHandler;
-import de.steamwar.command.utils.Pair;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Parameter;
-import java.util.*;
-
-public abstract class AbstractValidationNode<E> extends Node<E> {
-
-    private static final AbstractTypeValidator<?, ?> NON_NULL_VALIDATOR = (AbstractTypeValidator<Object, Object>) (sender, value, messageSender) -> value != null;
-
-    protected final List<Annotation> annotations;
-    protected final List<Pair<Annotation, Handler.HandlerParameter>> handlerParameters;
-    protected final List<AbstractTypeValidator<E, Object>> validators = new ArrayList<>();
-
-    protected AbstractValidationNode(Parameter parameter, int index, Handler.DataReadable dataReadable) {
-        super(parameter);
-        annotations = CommandUtils.getAnnotations(parameter, Handler.HandlerParameter.class);
-        List<Pair<Annotation, Handler.HandlerParameter>> pairs = new ArrayList<>();
-        for (Annotation annotation : annotations) {
-            Handler.Implementation implementation = annotation.annotationType().getAnnotation(Handler.Implementation.class);
-            try {
-                pairs.add(new Pair<>(annotation, (Handler.HandlerParameter) implementation.value().getConstructor().newInstance()));
-            } catch (Exception e) {
-                throw new SecurityException(e);
-            }
-        }
-        handlerParameters = pairs;
-
-        initializeValidators(handlerParameters, parameter, index, dataReadable);
-    }
-
-    private void initializeValidators(List<Pair<Annotation, Handler.HandlerParameter>> pairs, Parameter parameter, int index, Handler.DataReadable dataReadable) {
-        pairs.sort(Comparator.comparingInt(p -> p.b.getValidatorPriority()));
-        for (Pair<Annotation, Handler.HandlerParameter> pair : pairs) {
-            AbstractTypeValidator<E, Object> validator = pair.b.getValidator(pair.a, parameter, index, dataReadable);
-            if (validator != null) {
-                validators.add(validator);
-            }
-        }
-
-        if (!AllowNullHandler.isPresent(parameter)) {
-            validators.add((AbstractTypeValidator<E, Object>) NON_NULL_VALIDATOR);
-        }
-    }
-
-    @Override
-    public boolean equals(Parameter parameter, Node<E> children) {
-        if (this.parameter.getType() != parameter.getType()) {
-            return false;
-        }
-
-        Annotation[] annotations = this.parameter.getAnnotations();
-        Annotation[] currentAnnotations = parameter.getAnnotations();
-
-        if (annotations.length == 0 && currentAnnotations.length == 0) {
-            return true;
-        }
-
-        if (annotations.length != currentAnnotations.length) {
-            return false;
-        }
-
-        Map<Class<?>, Annotation> annotationMap = new HashMap<>();
-        boolean duplicate = false;
-        for (Annotation annotation : annotations) {
-            if (annotationMap.put(annotation.annotationType(), annotation) != null) {
-                duplicate = true;
-                break;
-            }
-        }
-        if (duplicate) {
-            return false;
-        }
-
-        for (Annotation annotation : currentAnnotations) {
-            Annotation other = annotationMap.get(annotation.annotationType());
-            if (!annotation.equals(other)) {
-                continue;
-            }
-            annotationMap.remove(annotation.annotationType());
-        }
-        return annotationMap.isEmpty();
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/ExecuteNode.java

@@ -1,89 +0,0 @@
-/*
- * 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.command.graph;
-
-import de.steamwar.command.CommandFrameworkException;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class ExecuteNode<E> extends Node<E> {
-
-    private final Object self;
-    private final Method method;
-
-    public ExecuteNode(Object self, Method method) {
-        super(null);
-        this.self = self;
-        this.method = method;
-    }
-
-    @Override
-    public boolean execute(E executor, NodeData nodeData) {
-        for (Node<E> child : children) {
-            if (child.execute(executor, nodeData)) {
-                return true;
-            }
-        }
-
-        if (nodeData.hasMore()) {
-            return false;
-        }
-
-        try {
-            method.invoke(self, nodeData.mapped());
-            return true;
-        } catch (InvocationTargetException e) {
-            throw new CommandFrameworkException(e, nodeData.alias(), nodeData.args());
-        } catch (IllegalAccessException | RuntimeException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public void tabComplete(E executor, NodeData nodeData, List<Collection<String>> completions) {
-        for (Node<E> child : children) {
-            child.tabComplete(executor, nodeData, completions);
-        }
-    }
-
-    @Override
-    public boolean equals(Parameter parameter, Node<E> children) {
-        if (children instanceof ExecuteNode) {
-            String parameters = Arrays.stream(method.getParameters()).map(par -> {
-                String annotations = Arrays.stream(par.getAnnotations())
-                        .map(annotation -> "@" + annotation.getClass().getSimpleName())
-                        .collect(Collectors.joining(" "));
-                if (par.isVarArgs()) {
-                    return annotations + (annotations.isEmpty() ? "" : " ") + par.getType().componentType().getSimpleName() + "...";
-                } else {
-                    return annotations + (annotations.isEmpty() ? "" : " ") + par.getType().getSimpleName();
-                }
-            }).collect(Collectors.joining(", "));
-            throw new UnsupportedOperationException("Command with parameters " + parameters + " is already defined in " + self.getClass().getName());
-        }
-        return children instanceof ExecuteNode;
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/ExecutorTypeNode.java

@@ -1,95 +0,0 @@
-/*
- * 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.command.graph;
-
-import de.steamwar.command.AbstractTypeValidator;
-import de.steamwar.command.Handler;
-
-import java.lang.reflect.Parameter;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Function;
-
-public class ExecutorTypeNode<E> extends AbstractValidationNode<E> {
-
-    protected final Function<E, ?> executorMapper;
-
-    public ExecutorTypeNode(Parameter parameter, int index, Handler.DataReadable dataReadable) {
-        super(parameter, index, dataReadable);
-        this.executorMapper = (Function<E, ?>) dataReadable.getExecutorMapper(parameter.getType());
-    }
-
-    @Override
-    public boolean execute(E executor, NodeData nodeData) {
-        Object mappedExecutor = executorMapper.apply(executor);
-        if (mappedExecutor == null) return false;
-        for (AbstractTypeValidator<E, Object> validator : validators) {
-            try {
-                if (!validator.validate(executor, executor, nodeData)) {
-                    return false;
-                }
-            } catch (ClassCastException e) {
-                // Ignore
-            } catch (Throwable e) {
-                return false;
-            }
-        }
-        nodeData.add(name, mappedExecutor);
-        for (Node<E> child : children) {
-            if (child.execute(executor, nodeData)) return true;
-        }
-        nodeData.remove();
-        return false;
-    }
-
-    @Override
-    public void tabComplete(E executor, NodeData nodeData, List<Collection<String>> completions) {
-        Object mappedExecutor = executorMapper.apply(executor);
-        if (mappedExecutor == null) return;
-        for (AbstractTypeValidator<E, Object> validator : validators) {
-            try {
-                if (!validator.validate(executor, executor, nodeData)) {
-                    return;
-                }
-            } catch (ClassCastException e) {
-                // Ignore
-            } catch (Throwable e) {
-                return;
-            }
-        }
-        nodeData.add(name, mappedExecutor);
-        for (Node<E> child : children) {
-            child.tabComplete(executor, nodeData, completions);
-        }
-        nodeData.remove();
-    }
-
-    @Override
-    public boolean equals(Parameter parameter, Node<E> children) {
-        if (!(children instanceof ExecutorTypeNode)) {
-            return false;
-        }
-        ExecutorTypeNode other = (ExecutorTypeNode) children;
-        if (executorMapper != other.executorMapper) {
-            return false;
-        }
-        return super.equals(parameter, children);
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/GreedyArrayNode.java

@@ -1,98 +0,0 @@
-/*
- * 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.command.graph;
-
-import de.steamwar.command.Handler;
-import de.steamwar.command.handler.GreedyHandler;
-import de.steamwar.command.utils.Triple;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Parameter;
-import java.util.HashSet;
-import java.util.Set;
-
-public class GreedyArrayNode<E> extends AbstractArrayNode<E> {
-
-    protected final int backTrackingDepth;
-
-    public GreedyArrayNode(Parameter parameter, int index, Handler.DataReadable dataReadable) {
-        super(parameter, index, dataReadable);
-        this.backTrackingDepth = GreedyHandler.getBackTrackingDepth(parameter);
-    }
-
-    @Override
-    public boolean execute(E executor, NodeData nodeData) {
-        int min = Math.min(nodeData.unparsedArgumentsSize(), minArrayLength);
-        int max = Math.min(nodeData.unparsedArgumentsSize(), maxArrayLength);
-        if (max < minArrayLength) {
-            nodeData.send(error, 0, minArrayLength);
-            return false;
-        }
-
-        Object array = Array.newInstance(type, max);
-        Set<Object> seen = new HashSet<>();
-
-        int i = 0;
-        for (; i < max; i++) {
-            nodeData.add(name, arrayCopy(array, i));
-            Triple<Object, Boolean, Boolean> argument = argument(executor, nodeData);
-            nodeData.remove();
-
-            if (!argument.b || (unique && !seen.add(argument.a))) {
-                if (i < minArrayLength) {
-                    nodeData.send(error, i, minArrayLength);
-                    for (; i > 0; i--) nodeData.unconsume();
-                    return false;
-                }
-                break;
-            }
-            Array.set(array, i, argument.a);
-            nodeData.consume();
-        }
-
-        int backTrackingDepth = i - this.backTrackingDepth;
-        for (; i >= min; i--) {
-            Object copiedArray = arrayCopy(array, i);
-            nodeData.add(name, copiedArray);
-            if (validate(executor, copiedArray, nodeData)) {
-                for (Node<E> child : children) {
-                    if (child.execute(executor, nodeData)) {
-                        return true;
-                    }
-                }
-            }
-            nodeData.remove();
-            if (i <= backTrackingDepth) {
-                break;
-            }
-            if (i > 0) {
-                nodeData.unconsume();
-            }
-        }
-        if (i < minArrayLength) nodeData.send(error, i, minArrayLength);
-        for (; i > 0; i--) nodeData.unconsume();
-        return false;
-    }
-
-    @Override
-    public int nodeCost() {
-        return -1;
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/LiteralNode.java

@@ -1,75 +0,0 @@
-/*
- * 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.command.graph;
-
-import java.lang.reflect.Parameter;
-import java.util.Collection;
-import java.util.List;
-
-public class LiteralNode<E> extends Node<E> {
-
-    protected final String literal;
-
-    public LiteralNode(String literal) {
-        super(null);
-        this.literal = literal;
-    }
-
-    @Override
-    public boolean execute(E executor, NodeData nodeData) {
-        if (!nodeData.hasMore()) return false;
-        if (nodeData.current().equalsIgnoreCase(literal)) {
-            nodeData.consume();
-            for (Node<E> child : children) {
-                if (child.execute(executor, nodeData)) {
-                    return true;
-                }
-            }
-            nodeData.unconsume();
-        }
-        return false;
-    }
-
-    @Override
-    public void tabComplete(E executor, NodeData nodeData, List<Collection<String>> completions) {
-        if (nodeData.hasOneLeft()) {
-            if (literal.startsWith(nodeData.current())) {
-                completions.add(List.of(literal));
-            }
-            return;
-        }
-
-        if (nodeData.current().equalsIgnoreCase(literal)) {
-            nodeData.consume();
-            for (Node<E> child : children) {
-                child.tabComplete(executor, nodeData, completions);
-            }
-            nodeData.unconsume();
-        }
-    }
-
-    @Override
-    public boolean equals(Parameter parameter, Node<E> children) {
-        if (!(children instanceof LiteralNode)) {
-            return false;
-        }
-        return literal.equalsIgnoreCase(((LiteralNode) children).literal);
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/NoTabCompleteNode.java

@@ -1,49 +0,0 @@
-/*
- * 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.command.graph;
-
-import java.lang.reflect.Parameter;
-import java.util.Collection;
-import java.util.List;
-
-public class NoTabCompleteNode<E> extends Node<E> {
-
-    public NoTabCompleteNode() {
-        super(null);
-    }
-
-    @Override
-    public boolean execute(E executor, NodeData nodeData) {
-        for (Node<E> child : children) {
-            if (child.execute(executor, nodeData)) return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void tabComplete(E executor, NodeData nodeData, List<Collection<String>> completions) {
-        // Do nothing
-    }
-
-    @Override
-    public boolean equals(Parameter parameter, Node<E> children) {
-        return children instanceof NoTabCompleteNode;
-    }
-}

CommandFramework/CommandFrameworkBase/src/de/steamwar/command/graph/Node.java

@@ -1,83 +0,0 @@
-/*
- * 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.command.graph;
-
-import de.steamwar.command.annotations.Name;
-
-import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public abstract class Node<E> {
-
-    protected final Parameter parameter;
-    protected final String name;
-    protected final List<Node<E>> children = new ArrayList<>();
-
-    protected Node(Parameter parameter) {
-        this.parameter = parameter;
-        if (parameter == null) {
-            this.name = null;
-            return;
-        }
-
-        Name name = parameter.getAnnotation(Name.class);
-        if (name == null) {
-            this.name = parameter.getName();
-        } else {
-            this.name = name.value();
-        }
-    }
-
-    public abstract boolean execute(E executor, NodeData nodeData);
-    public abstract void tabComplete(E executor, NodeData nodeData, List<Collection<String>> completions);
-
-    public final Node<E> addChild(Parameter parameter, Node<E> child) {
-        for (Node<E> currentChild : children) {
-            if (currentChild.equals(parameter, child)) {
-                return currentChild;
-            }
-        }
-        children.add(child);
-        return child;
-    }
-
-    public abstract boolean equals(Parameter parameter, Node<E> children);
-
-    public int nodeCost() {
-        return 2;
-    }
-
-    public final int sort() {
-        AtomicInteger max = new AtomicInteger(0);
-        if (children.size() == 1) {
-            return children.get(0).sort() + nodeCost();
-        }
-        children.sort(Comparator.comparingInt(value -> {
-            int sort = value.sort();
-            if (sort > max.get()) max.set(sort);
-            return -sort;
-        }));
-        return max.get() + nodeCost();
-    }
-}