Merge branch 'KotlinCore/message-update' into TNTLeague/finish

BauSystem/BauSystem_15/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.nms15)
     compileOnly(libs.worldedit15)

BauSystem/BauSystem_18/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.nms18)

BauSystem/BauSystem_19/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.paperapi)

BauSystem/BauSystem_20/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
 

BauSystem/BauSystem_Main/build.gradle.kts

@@ -33,7 +33,7 @@ java {
 dependencies {
     compileOnly(libs.classindex)
     annotationProcessor(libs.classindex)
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.axiom)

FightSystem/FightSystem_10/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
 
     compileOnly(libs.nms10)
 }

FightSystem/FightSystem_12/build.gradle.kts

@@ -22,9 +22,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_8"))
+    compileOnly(project(":FightSystem:FightSystem_8", "default"))
 
     compileOnly(libs.nms12)
     compileOnly(libs.worldedit12)

FightSystem/FightSystem_14/build.gradle.kts

@@ -22,10 +22,10 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_8"))
+    compileOnly(project(":FightSystem:FightSystem_8", "default"))
-    compileOnly(project(":FightSystem:FightSystem_9"))
+    compileOnly(project(":FightSystem:FightSystem_9", "default"))
 
     compileOnly(libs.nms14)
     compileOnly(libs.worldedit15)

FightSystem/FightSystem_15/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
 
     compileOnly(libs.nms15)
     compileOnly(libs.worldedit15)

FightSystem/FightSystem_18/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
 
     compileOnly(libs.spigotapi)
 

FightSystem/FightSystem_19/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_18"))
+    compileOnly(project(":FightSystem:FightSystem_18", "default"))
 
     compileOnly(libs.spigotapi)
 

FightSystem/FightSystem_20/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_18"))
+    compileOnly(project(":FightSystem:FightSystem_18", "default"))
 
     compileOnly(libs.spigotapi)
 

FightSystem/FightSystem_8/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
 
     compileOnly(libs.nms8)
     compileOnly(libs.worldedit12)

FightSystem/FightSystem_9/build.gradle.kts

@@ -22,9 +22,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_8"))
+    compileOnly(project(":FightSystem:FightSystem_8", "default"))
 
     compileOnly(libs.nms9)
 }

FightSystem/FightSystem_Core/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties

@@ -83,6 +83,8 @@ SCHEM_PRIVATE=§ePrivate {0}
 SCHEM_NO_PRIVATE=§7No private {0} present
 SCHEM_PRIVATE_FORBIDDEN=§7No private {0} allowed
 
+ADD_AI_TITLE=Add AI
+
 
 # Countdowns
 COUNTDOWN_MINUTES=§e{0} §7Minutes {1}
@@ -114,6 +116,7 @@ RESPAWN=§eRespawn
 REMOVE_PLAYERS=§cKick player
 CHOOSE_SCHEMATIC=§eChoose {0}
 SCHEMATIC_REQUIRED=§cChoose a schematic first
+ADD_AI=§eAdd AI
 
 KIT_PREVIEW_EDIT=§7Edit kit
 KIT_PREVIEW_CHOOSE=§aSelect kit

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties

@@ -77,6 +77,8 @@ SCHEM_PRIVATE=§ePrivates {0}
 SCHEM_NO_PRIVATE=§7Kein privates {0} vorhanden
 SCHEM_PRIVATE_FORBIDDEN=§7Kein privates {0} erlaubt
 
+ADD_AI_TITLE=KI hinzufügen
+
 
 # Countdowns
 COUNTDOWN_MINUTES=§e{0} §7Minuten {1}
@@ -107,6 +109,7 @@ RESPAWN=§eRespawn
 REMOVE_PLAYERS=§cSpieler rauswerfen
 CHOOSE_SCHEMATIC=§e{0} wählen
 SCHEMATIC_REQUIRED=§cZuerst muss eine Schematic gewählt sein
+ADD_AI=§eKI hinzufügen
 
 KIT_PREVIEW_EDIT=§7Kit bearbeiten
 KIT_PREVIEW_CHOOSE=§aKit wählen

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java

@@ -19,32 +19,38 @@
 
 package de.steamwar.fightsystem.ai;
 
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.fight.JoinRequest;
 import de.steamwar.fightsystem.listener.Chat;
+import de.steamwar.fightsystem.record.GlobalRecorder;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Note;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.Lectern;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.FaceAttachable;
 import org.bukkit.block.data.Openable;
 import org.bukkit.block.data.Powerable;
 import org.bukkit.block.data.type.Comparator;
 import org.bukkit.block.data.type.NoteBlock;
 import org.bukkit.block.data.type.Repeater;
+import org.bukkit.block.data.type.Switch;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.entity.Villager;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.scheduler.BukkitTask;
@@ -55,10 +61,16 @@ import java.util.logging.Level;
 
 public abstract class AI {
 
+    public static final int MOVEMENT_DELAY = 4;
+    public static final double INTERACTION_RANGE = 5.0;
+
     private static final Map<UUID, AI> ais = new HashMap<>();
+    public static void printPos() {
+        ais.values().forEach(ai -> ai.chat(ai.entity.isValid() + " " + ai.entity.isDead() + " " + ai.entity.getLocation()));
+    }
 
     static {
-        new OneShotStateDependent(ArenaMode.All, FightState.Spectate, () -> {
+        new OneShotStateDependent(ArenaMode.AntiReplay, FightState.Spectate, () -> {
             ais.values().forEach(AI::stop);
             ais.clear();
         });
@@ -68,7 +80,9 @@ public abstract class AI {
         return ais.get(uuid);
     }
 
-    private final FightTeam team;
+    @Getter
+    protected final FightTeam team;
+    @Getter
     private final LivingEntity entity;
     private final BukkitTask task;
     private final Queue<Action> queue = new ArrayDeque<>();
@@ -83,11 +97,15 @@ public abstract class AI {
         task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::run, 1, 1);
         ais.put(entity.getUniqueId(), this);
         team.addMember(entity, user);
+
+        if(FightState.Schem.contains(FightState.getFightState()))
+            Bukkit.getScheduler().runTask(FightSystem.getPlugin(), () -> schematic(team.getClipboard()));
     }
 
     public abstract SchematicNode chooseSchematic();
+    public abstract void schematic(Clipboard clipboard);
 
-    public boolean acceptJoinRequest(Player player, FightTeam team) {
+    public boolean acceptJoinRequest(JoinRequest.Enquirer enquirer, FightTeam team) {
         return true;
     }
 
@@ -101,11 +119,7 @@ public abstract class AI {
             task.cancel();
     }
 
-    public LivingEntity getEntity() {
+    public void setReady() {
-        return entity;
-    }
-
-    protected void setReady() {
         if(FightState.getFightState() != FightState.POST_SCHEM_SETUP)
             return;
 
@@ -115,12 +129,12 @@ public abstract class AI {
         team.setReady(true);
     }
 
-    protected void chat(String message) {
+    public void chat(String message) {
         FightSystem.getPlugin().getLogger().log(Level.INFO, () -> entity.getName() + "» " + message);
         Chat.broadcastChat("PARTICIPANT_CHAT", team.getColoredName(), entity.getName(), message);
     }
 
-    protected Vector getPosition() {
+    public Vector getPosition() {
         Location location = entity.getLocation();
         Region extend = team.getExtendRegion();
         if(Fight.getUnrotated() == team)
@@ -137,26 +151,28 @@ public abstract class AI {
             );
     }
 
-    protected Material getBlock(Vector pos) {
+    public Material getBlock(Vector pos) {
         queue.add(new Action(1));
-        return translate(pos, true).getBlock().getType();
+        return translate(pos).getBlock().getType();
     }
 
-    protected boolean isPowered(Vector pos) {
+    public BlockData getBlockData(Vector pos) {
         queue.add(new Action(1));
-        return translate(pos, true).getBlock().isBlockPowered();
+        return translate(pos).getBlock().getBlockData();
     }
 
-    protected void setTNT(Vector pos) {
+    public void setTNT(Vector pos) {
         queue.add(new Action(1) {
             @Override
             public void run() {
                 if(FightState.getFightState() != FightState.RUNNING)
                     return;
 
-                Location location = translate(pos, true);
+                Location location = translate(pos);
-                if(interactionDistanceViolation(location))
+                if(interactionDistanceViolation(location)) {
+                    chat("InteractionDistanceViolation: setTNT");
                     return;
+                }
 
                 Block block = location.getBlock();
                 if(block.getType() == Material.AIR)
@@ -165,24 +181,26 @@ public abstract class AI {
         });
     }
 
-    protected void interact(Vector pos) {
+    public void interact(Vector pos) {
         queue.add(new Action(1) {
             @Override
             public void run() {
-                Location location = translate(pos, true);
+                Location location = translate(pos);
-                if(interactionDistanceViolation(location))
+                if(interactionDistanceViolation(location)) {
+                    chat("InteractionDistanceViolation: interact");
                     return;
+                }
 
                 interact(location.getBlock());
             }
         });
     }
 
-    protected void interact(Vector pos, int n) {
+    public void interact(Vector pos, int n) {
         queue.add(new Action(1) {
            @Override
            public void run() {
-               Location location = translate(pos, true);
+               Location location = translate(pos);
                if (interactionDistanceViolation(location))
                    return;
                Block block = location.getBlock();
@@ -199,13 +217,18 @@ public abstract class AI {
         });
     }
 
-    protected void move(Vector pos) {
+    public void move(Vector pos) {
-        queue.add(new Action(2) {
+        queue.add(new Action(MOVEMENT_DELAY) {
             @Override
             public void run() {
                 Location location = entity.getLocation();
-                Location target = translate(pos, false);
+                if(!entity.isOnGround() && location.getBlock().getType() != Material.LADDER) {
-                if(Math.abs(location.getX() - target.getX()) > 1 || Math.abs(location.getY() - target.getY()) > 1.2 || Math.abs(location.getZ() - target.getZ()) > 1) {
+                    FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity falling");
+                    return;
+                }
+
+                Location target = translate(pos);
+                if(Math.abs(location.getX() - target.getX()) > 1.0 || Math.abs(location.getY() - target.getY()) > 1.5 || Math.abs(location.getZ() - target.getZ()) > 1.0) {
                     FightSystem.getPlugin().getLogger().log(Level.INFO, () -> entity.getName() + ": Overdistance movement " + location.toVector() + " " + target.toVector());
                     return;
                 }
@@ -213,13 +236,16 @@ public abstract class AI {
                 if(!team.getFightPlayer(entity).canEntern() && !team.getExtendRegion().inRegion(target))
                     return;
 
-                entity.teleport(target, PlayerTeleportEvent.TeleportCause.COMMAND);
+                if(!entity.teleport(target, PlayerTeleportEvent.TeleportCause.PLUGIN))
+                    FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity not teleported: " + entity.isValid());
+
+                GlobalRecorder.getInstance().entityMoves(entity);
             }
         });
     }
 
     private boolean interactionDistanceViolation(Location location) {
-        return location.distance(entity.getEyeLocation()) > 5;
+        return location.distance(entity.getEyeLocation()) > INTERACTION_RANGE;
     }
 
     private void interact(Block block) {
@@ -249,23 +275,51 @@ public abstract class AI {
 
                     powerable.setPowered(false);
                     block.setBlockData(powerable);
+                    updateButton(block);
                 }, type.name().endsWith("STONE_BUTTON") ? 20 : 30);
             }
 
             powerable.setPowered(!isPowered);
         }
         block.setBlockData(data);
+        if(data instanceof Switch) {
+            updateButton(block);
+        }
+    }
+
+    private void updateButton(Block block) {
+        Switch sw = (Switch) block.getBlockData();
+        FaceAttachable.AttachedFace face = sw.getAttachedFace();
+        if (face == FaceAttachable.AttachedFace.FLOOR) {
+            update(block.getRelative(BlockFace.DOWN));
+        } else if (face == FaceAttachable.AttachedFace.CEILING) {
+            update(block.getRelative(BlockFace.UP));
+        } else {
+            update(block.getRelative(sw.getFacing().getOppositeFace()));
+        }
+    }
+
+    private void update(Block block) {
+        BlockData data = block.getBlockData();
+        block.setType(Material.BARRIER);
+        block.setBlockData(data);
     }
 
     private void run() {
-        if(queue.isEmpty())
+        if(queue.isEmpty()) {
-            plan();
+            try {
+                plan();
+            } catch (Throwable t) {
+                stop();
+                throw t;
+            }
+        }
 
         if(!queue.isEmpty() && --queue.peek().delay == 0)
             queue.poll().run();
     }
 
-    private Location translate(Vector pos, boolean blockPos) {
+    public Location translate(Vector pos) {
         Region extend = team.getExtendRegion();
         if(Fight.getUnrotated() == team)
             return new Location(
@@ -277,9 +331,9 @@ public abstract class AI {
         else
             return new Location(
                     Config.world,
-                    extend.getMaxX() - pos.getX() - (blockPos ? 1 : 0),
+                    extend.getMaxX() - pos.getX(),
                     pos.getY() + team.getSchemRegion().getMinY(),
-                    extend.getMaxZ() - pos.getZ() - (blockPos ? 1 : 0)
+                    extend.getMaxZ() - pos.getZ()
             );
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AIManager.java

@@ -0,0 +1,57 @@
+/*
+ *   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.fightsystem.ai;
+
+import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.fight.FightTeam;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.bukkit.Material;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.BooleanSupplier;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+public class AIManager {
+    private static final List<AIManager> AIs = Arrays.asList(
+            new AIManager(DummyAI.class, Material.STONE, () -> ArenaMode.Test.contains(Config.mode))
+    );
+
+    public static List<AIManager> availableAIs() {
+        return AIs.stream().filter(manager -> manager.available.getAsBoolean()).collect(Collectors.toList());
+    }
+
+    private final Class<? extends AI> aiClass;
+    @Getter
+    private final Material icon;
+    private final BooleanSupplier available;
+
+    public String name() {
+        return aiClass.getSimpleName();
+    }
+
+    public void join(FightTeam team) {
+        Reflection.getConstructor(aiClass, FightTeam.class).invoke(team);
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java

@@ -19,42 +19,42 @@
 
 package de.steamwar.fightsystem.ai;
 
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.utils.FightStatistics;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
-import org.bukkit.util.Vector;
 
 import java.util.List;
 import java.util.Random;
 
-public class LixfelAI extends AI {
+public class DummyAI extends AI {
 
-    private final Random random = new Random();
+    private static final Random random = new Random();
-    private LixfelPathplanner pathplanner;
 
-    public LixfelAI(FightTeam team, String user) {
+    public DummyAI(FightTeam team) {
-        super(team, SteamwarUser.get(user));
+        super(team, SteamwarUser.get("public"));
+
+        FightStatistics.unrank();
+        getEntity().setInvulnerable(true);
     }
 
-
     @Override
     public SchematicNode chooseSchematic() {
         List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.SchematicType.toDB());
-        SchematicNode schem = publics.get(new Random().nextInt(publics.size()));
+        return publics.get(random.nextInt(publics.size()));
-        pathplanner = new LixfelPathplanner(schem);
+    }
-        return schem;
+
+    @Override
+    public void schematic(Clipboard clipboard) {
+        //does nothing
     }
 
     @Override
     protected void plan() {
-        setReady();
+        if(FightState.getFightState() == FightState.POST_SCHEM_SETUP)
-        Vector destination = pathplanner.getWalkable().get(random.nextInt(pathplanner.getWalkable().size()));
+            setReady();
-        List<Vector> path = pathplanner.plan(getPosition(), destination);
-        if(!path.isEmpty())
-            chat("Path size: " + path.size());
-        for(Vector p : path) {
-            move(p);
-        }
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/LixfelPathplanner.java

@@ -1,141 +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.fightsystem.ai;
-
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.world.block.BlockType;
-import de.steamwar.fightsystem.Config;
-import de.steamwar.sql.SchematicData;
-import de.steamwar.sql.SchematicNode;
-import org.bukkit.util.Vector;
-
-import java.io.IOException;
-import java.util.*;
-
-public class LixfelPathplanner {
-
-    private static BlockType getBlockType(Clipboard clipboard, BlockVector3 vector) {
-        return clipboard.getBlock(vector).getBlockType();
-    }
-
-    private static boolean nonsolid(Clipboard clipboard, BlockVector3 vector) {
-        return !getBlockType(clipboard, vector).getMaterial().isSolid();
-    }
-
-    private static Vector toBukkit(BlockVector3 vector) {
-        return new Vector(vector.getX() + 0.5, vector.getY(), vector.getZ() + 0.5);
-    }
-
-    private final List<Vector> walkable = new ArrayList<>();
-    private final Map<Vector, Vector[]> neighbours = new HashMap<>();
-
-    public LixfelPathplanner(SchematicNode schem) {
-        try {
-            fillWalkable(new SchematicData(schem).load());
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    public List<Vector> getWalkable() {
-        return walkable;
-    }
-
-    private void fillWalkable(Clipboard clipboard) {
-        BlockVector3 min = clipboard.getRegion().getMinimumPoint().subtract(Config.PreperationArea, 0, Config.PreperationArea); //TODO assumes nonextended Schematic with maximal size
-        Region region = clipboard.getRegion();
-        clipboard.getRegion().forEach(vector -> {
-            BlockVector3 below = vector.subtract(0, 1, 0);
-            if(!region.contains(below))
-                return;
-
-            BlockType belowMaterial = getBlockType(clipboard, below);
-            BlockVector3 above = vector.add(0, 1, 0);
-            if(nonsolid(clipboard, vector)) {
-                if(
-                        (belowMaterial.getMaterial().isSolid() || belowMaterial.getId().equals("minecraft:ladder")) &&
-                                (!region.contains(above) || nonsolid(clipboard, above))
-                )
-                    walkable.add(toBukkit(vector.subtract(min)));
-            } else {
-                if(!region.contains(above))
-                    walkable.add(toBukkit(above.subtract(min)));
-            }
-        });
-
-        for(Vector vector : walkable) {
-            neighbours.put(vector, walkable.stream().filter(neighbour -> neighbouring(neighbour, vector)).filter(neighbour -> neighbour != vector).toArray(Vector[]::new));
-        }
-    }
-
-    public List<Vector> planToAnywhere(Vector start, Vector destination) {
-        Vector intermediate = walkable.stream().filter(vector -> neighbouring(vector, destination)).findAny().orElse(null);
-
-        if(intermediate == null)
-            return Collections.emptyList();
-
-        List<Vector> plan = plan(start, intermediate);
-        plan.add(destination);
-
-        return plan;
-    }
-
-    public List<Vector> plan(Vector start, Vector destination) {
-        if(neighbouring(start, destination))
-            return Collections.singletonList(destination);
-
-        Map<Vector, Vector> approach = new HashMap<>();
-        Set<Vector> checking = Collections.singleton(destination);
-
-        while(!checking.isEmpty()) {
-            Set<Vector> toCheck = new HashSet<>();
-            for(Vector current : checking) {
-                Vector firstStep = Arrays.stream(neighbours.get(current))
-                        .filter(vector -> !approach.containsKey(vector))
-                        .filter(next -> {
-                            approach.put(next, current);
-                            toCheck.add(next);
-                            return neighbouring(next, start);
-                        })
-                        .findAny().orElse(null);
-
-                if(firstStep != null) {
-                    List<Vector> path = new ArrayList<>();
-                    path.add(firstStep);
-
-                    while(path.get(path.size()-1) != destination) {
-                        path.add(approach.get(path.get(path.size()-1)));
-                    }
-
-                    return path;
-                }
-            }
-            checking = toCheck;
-        }
-
-        return Collections.emptyList();
-    }
-
-    private boolean neighbouring(Vector a, Vector b) {
-        return Math.abs(a.getX() - b.getX()) <= 1 && Math.abs(a.getY() - b.getY()) <= 1 && Math.abs(a.getZ() - b.getZ()) <= 1;
-    }
-}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java

@@ -22,6 +22,7 @@ package de.steamwar.fightsystem.commands;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.fightsystem.ai.AIManager;
 import de.steamwar.fightsystem.fight.*;
 import de.steamwar.fightsystem.listener.PersonalKitCreator;
 import de.steamwar.fightsystem.states.FightState;
@@ -38,9 +39,8 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
-import java.util.UUID;
 
 public class GUI {
     private GUI(){}
@@ -53,7 +53,7 @@ public class GUI {
         String name = team.getLeader() != null ? team.getLeader().getEntity().getName() : team.getName();
         inv.setItem(pos, SWItem.getDye(colorCode), colorCode, msg.parse("JOIN_REQUEST_TEAM", p, team.getColor() + name), click -> {
             p.closeInventory();
-            new JoinRequest(p, team);
+            JoinRequest.forPlayer(p, team);
         });
     }
 
@@ -89,11 +89,29 @@ public class GUI {
         inv.open();
     }
 
+    public static void addAI(Player p) {
+        SWListInv<AIManager> inv = new SWListInv<>(
+                p, msg.parse("ADD_AI_TITLE", p),
+                AIManager.availableAIs().stream().map(manager -> new SWListInv.SWListEntry<>(new SWItem(manager.getIcon(), manager.name()), manager)).collect(Collectors.toList()),
+                (click, manager) -> {
+                    FightTeam team = Fight.getPlayerTeam(p);
+                    if(FightState.PreLeaderSetup.contains(FightState.getFightState())) {
+                        manager.join(Fight.getOpposite(team));
+                    } else {
+                        JoinRequest.forAI(manager, team);
+                    }
+                    p.closeInventory();
+                }
+        );
+        inv.setCallback(-999, (ClickType click) -> p.closeInventory());
+        inv.open();
+    }
+
     public static void chooseJoinRequests(Player p){
-        List<SWListInv.SWListEntry<Player>> players = JoinRequest.openRequests(p, Fight.getPlayerTeam(p));
+        List<SWListInv.SWListEntry<JoinRequest>> players = JoinRequest.openRequests(p, Fight.getPlayerTeam(p));
-        SWListInv<Player> inv = new SWListInv<>(p, msg.parse("REQUESTS_TITLE", p), players, (ClickType click, Player player) -> {
+        SWListInv<JoinRequest> inv = new SWListInv<>(p, msg.parse("REQUESTS_TITLE", p), players, (ClickType click, JoinRequest request) -> {
             p.closeInventory();
-            RequestsCommand.onJoinRequest(p, player, click.isLeftClick() ? JoinRequest::accept : JoinRequest::decline);
+            RequestsCommand.onJoinRequest(p, request, click.isLeftClick() ? JoinRequest::accept : JoinRequest::decline);
         });
         inv.setCallback(-999, (ClickType click) -> p.closeInventory());
         inv.open();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java

@@ -59,13 +59,7 @@ public class RequestsCommand implements CommandExecutor {
         return false;
     }
 
-    public static void onJoinRequest(Player player, Player target, BiConsumer<JoinRequest, FightTeam> handleJoinRequest) {
+    public static void onJoinRequest(Player player, JoinRequest request, BiConsumer<JoinRequest, FightTeam> handleJoinRequest) {
-        JoinRequest request = JoinRequest.get(target);
-        if(request == null) {
-            FightSystem.getMessage().send("NO_JOIN_REQUEST", player);
-            return;
-        }
-
         FightTeam team = Fight.getPlayerTeam(player);
         if(!request.required(team)) {
             FightSystem.getMessage().send("NO_CONFIRMATION", player);

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

@@ -34,6 +34,7 @@ import de.steamwar.fightsystem.utils.WorldeditWrapper;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
@@ -52,6 +53,7 @@ public class FightSchematic extends StateDependent {
     private final Region region;
     private final boolean rotate;
 
+    @Getter
     private Clipboard clipboard = null;
     private int schematic = 0;
 
@@ -137,6 +139,7 @@ public class FightSchematic extends StateDependent {
     private void paste(){
         FreezeWorld freezer = new FreezeWorld();
 
+        team.teleportToSpawn();
         Vector dims = WorldeditWrapper.impl.getDimensions(clipboard);
         WorldeditWrapper.impl.pasteClipboard(
                 clipboard,
@@ -149,11 +152,11 @@ public class FightSchematic extends StateDependent {
                 new AffineTransform().rotateY(rotate ? 180 : 0)
         );
         FightSystem.getHullHider().initialize(team);
+        team.getPlayers().forEach(fightPlayer -> fightPlayer.ifAI(ai -> ai.schematic(clipboard)));
         if(ArenaMode.Check.contains(Config.mode) && !team.isBlue())
-            replaceSync(Material.TNT, Material.OBSIDIAN);
+            replaceSync(Material.TNT, Material.RED_WOOL);
 
         Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), freezer::disable, 3);
-        Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), team::teleportToSpawn, 40);
     }
 
     @Override

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

@@ -23,6 +23,7 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.fightsystem.ai.AIManager;
 import de.steamwar.fightsystem.commands.GUI;
 import de.steamwar.fightsystem.countdown.Countdown;
 import de.steamwar.fightsystem.events.TeamLeaveEvent;
@@ -70,9 +71,11 @@ public class FightTeam {
     static {
         setKitButton(notReadyKit, true);
 
-        if(!ArenaMode.RankedEvent.contains(Config.mode)){
+        if(ArenaMode.VariableTeams.contains(Config.mode)){
             notReadyKit.setItem(2, "REQUESTS", new ItemBuilder(Material.PAPER).build(), GUI::chooseJoinRequests);
             notReadyKit.setItem(3, "REMOVE_PLAYERS", new ItemBuilder(SWItem.getMaterial("FIREWORK_CHARGE")).build(), GUI::chooseRemove);
+            if(!AIManager.availableAIs().isEmpty())
+                notReadyKit.setItem(6, "ADD_AI", new ItemBuilder(Material.REDSTONE).build(), GUI::addAI);
         }
 
         if(Config.test())
@@ -452,6 +455,10 @@ public class FightTeam {
         return schematic.getId();
     }
 
+    public Clipboard getClipboard() {
+        return schematic.getClipboard();
+    }
+
     public double getCurrentHearts() {
         return players.values().stream().filter(FightPlayer::isLiving).mapToDouble(fp -> fp.getEntity().getHealth()).sum();
     }

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

@@ -20,6 +20,7 @@
 package de.steamwar.fightsystem.fight;
 
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.fightsystem.ai.AIManager;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
@@ -28,44 +29,66 @@ import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.entity.Player;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 public class JoinRequest {
 
-    private static final Map<Player, JoinRequest> activeRequests = new HashMap<>();
+    private static final Map<Player, JoinRequest> playerRequests = new HashMap<>();
+    private static final List<JoinRequest> activeRequests = new ArrayList<>();
+    public static JoinRequest get(Player player) {
+        return playerRequests.get(player);
+    }
 
-    public static List<SWListInv.SWListEntry<Player>> openRequests(Player p, FightTeam team) {
+    public static List<SWListInv.SWListEntry<JoinRequest>> openRequests(Player p, FightTeam team) {
-        return activeRequests.values().stream().filter(
+        return activeRequests.stream().filter(
                 request -> request.waitOnApproval.contains(team)
         ).map(request -> {
-            SWItem item = SWItem.getPlayerSkull(request.player);
+            AtomicReference<SWItem> item = new AtomicReference<>();
-            item.setLore(Arrays.asList(
+            request.enquirer.ifPlayer(player -> item.set(SWItem.getPlayerSkull(player)));
+            request.enquirer.ifAI(manager -> item.set(new SWItem(manager.getIcon(), manager.name())));
+            item.get().setLore(Arrays.asList(
                     FightSystem.getMessage().parse("REQUESTS_LEFT_CLICK", p),
                     FightSystem.getMessage().parse("REQUESTS_RIGHT_CLICK", p)
             ));
-            return new SWListInv.SWListEntry<>(item, request.player);
+            return new SWListInv.SWListEntry<>(item.get(), request);
         }).collect(Collectors.toList());
     }
 
     public static void clearRequests() {
+        playerRequests.clear();
         activeRequests.clear();
     }
 
-    public static JoinRequest get(Player player) {
+    public static void forPlayer(Player player, FightTeam team) {
-        return activeRequests.get(player);
+        new JoinRequest(new Enquirer() {
+            @Override public String name() { return player.getName(); }
+            @Override public void ifPlayer(Consumer<Player> function) { function.accept(player); }
+            @Override public void ifAI(Consumer<AIManager> function) {}
+        }, team, FightState.ingame() ? Fight.teams() : Collections.singleton(team));
     }
 
-    private final Player player;
+    public static void forAI(AIManager manager, FightTeam team) {
+        new JoinRequest(new Enquirer() {
+            @Override public String name() { return manager.name(); }
+            @Override public void ifPlayer(Consumer<Player> function) {}
+            @Override public void ifAI(Consumer<AIManager> function) { function.accept(manager); }
+        }, team, Collections.singleton(Fight.getOpposite(team)));
+    }
+
+    private final Enquirer enquirer;
     private final FightTeam team;
     private final Set<FightTeam> waitOnApproval;
 
-    public JoinRequest(Player player, FightTeam team) {
+    private JoinRequest(Enquirer enquirer, FightTeam team, Collection<FightTeam> waitOnApproval) {
-        this.player = player;
+        this.enquirer = enquirer;
         this.team = team;
-        this.waitOnApproval = new HashSet<>(FightState.ingame() ? Fight.teams() : Collections.singleton(team));
+        this.waitOnApproval = new HashSet<>(waitOnApproval);
         Set<FightTeam> alreadyAccepted = new HashSet<>();
 
-        activeRequests.put(player, this);
+        enquirer.ifPlayer(player -> playerRequests.put(player, this));
+        activeRequests.add(this);
         for(FightTeam t : waitOnApproval) {
             FightPlayer leader = t.getLeader();
             if(leader == null)
@@ -74,14 +97,14 @@ public class JoinRequest {
             if(leader.getEntity() == null)
                 continue;
 
-            leader.ifPlayer(leaderPlayer -> FightSystem.getMessage().sendPrefixless("JOIN_REQUEST_NOTIFICATION", leaderPlayer, "REQUESTS", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/requests"), player.getName(), team.getColoredName()));
+            leader.ifPlayer(leaderPlayer -> FightSystem.getMessage().sendPrefixless("JOIN_REQUEST_NOTIFICATION", leaderPlayer, "REQUESTS", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/requests"), enquirer.name(), team.getColoredName()));
             leader.ifAI(ai -> {
-                if(ai.acceptJoinRequest(player, team))
+                if(ai.acceptJoinRequest(enquirer, team))
                     alreadyAccepted.add(t);
             });
         }
 
-        FightSystem.getMessage().sendPrefixless("JOIN_REQUEST_CONFIRMATION", player, ChatMessageType.ACTION_BAR);
+        enquirer.ifPlayer(player -> FightSystem.getMessage().sendPrefixless("JOIN_REQUEST_CONFIRMATION", player, ChatMessageType.ACTION_BAR));
         alreadyAccepted.forEach(this::accept);
     }
 
@@ -93,18 +116,26 @@ public class JoinRequest {
         waitOnApproval.remove(acceptor);
 
         if(waitOnApproval.isEmpty()) {
-            team.addMember(player);
+            enquirer.ifPlayer(team::addMember);
-            activeRequests.remove(player);
+            enquirer.ifAI(manager -> manager.join(team));
+            close();
         }
     }
 
     public void decline(FightTeam declinor) {
-        FightSystem.getMessage().sendPrefixless("REQUEST_YOUR_DECLINED", player, ChatMessageType.ACTION_BAR);
+        enquirer.ifPlayer(player -> FightSystem.getMessage().sendPrefixless("REQUEST_YOUR_DECLINED", player, ChatMessageType.ACTION_BAR));
-        waitOnApproval.forEach(t -> t.broadcast("REQUEST_DECLINED", player.getName()));
+        waitOnApproval.forEach(t -> t.broadcast("REQUEST_DECLINED", enquirer.name()));
-        silentDecline();
+        close();
     }
 
-    public void silentDecline() {
+    public void close() {
-        activeRequests.remove(player);
+        enquirer.ifPlayer(playerRequests::remove);
+        activeRequests.remove(this);
+    }
+
+    public interface Enquirer {
+        String name();
+        void ifPlayer(Consumer<Player> function);
+        void ifAI(Consumer<AIManager> function);
     }
 }

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

@@ -69,6 +69,6 @@ public class JoinRequestListener implements Listener {
     public void onLeave(PlayerQuitEvent event) {
         JoinRequest request = JoinRequest.get(event.getPlayer());
         if(request != null)
-            request.silentDecline();
+            request.close();
     }
 }

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

@@ -43,6 +43,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -70,7 +71,7 @@ public class Recording implements Listener {
         return stack;
     }
 
-    public static boolean isNotSent(Player p){
+    public static boolean isNotSent(LivingEntity p){
         FightPlayer fp = Fight.getFightPlayer(p);
         return fp == null || !fp.isLiving() || FightState.getFightState() == FightState.SPECTATE;
     }
@@ -193,10 +194,10 @@ public class Recording implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onEntityDamage(EntityDamageEvent e) {
-        if(e.getEntityType() != EntityType.PLAYER)
+        if(!e.getEntityType().isAlive())
             return;
 
-        Player p = (Player) e.getEntity();
+        LivingEntity p = (LivingEntity) e.getEntity();
         if(isNotSent(p))
             return;
 
@@ -208,10 +209,10 @@ public class Recording implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onEntityCombust(EntityCombustEvent e) {
-        if(e.getEntityType() != EntityType.PLAYER)
+        if(!e.getEntityType().isAlive())
             return;
 
-        Player p = (Player) e.getEntity();
+        LivingEntity p = (LivingEntity) e.getEntity();
         if(isNotSent(p))
             return;
 

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

@@ -204,7 +204,7 @@ public interface Recorder {
         write(0x0a, e.getEntityId(), start, offHand);
     }
 
-    default void damageAnimation(Player p) {
+    default void damageAnimation(LivingEntity p) {
         write(0x0b, p.getEntityId());
     }
 

KotlinCore/build.gradle.kts

@@ -32,4 +32,6 @@ tasks.shadowJar {
 
 dependencies {
     compileOnly(libs.paperapi21)
+    compileOnly(libs.nms21)
+    compileOnly(project(":SpigotCore"))
 }

KotlinCore/src/de/steamwar/kotlin/KotlinCore.kt

@@ -19,6 +19,7 @@
 
 package de.steamwar.kotlin
 
+import de.steamwar.kotlin.message.LanguageListener
 import org.bukkit.plugin.java.JavaPlugin
 
 class KotlinCore : JavaPlugin() {
@@ -32,6 +33,7 @@ class KotlinCore : JavaPlugin() {
     }
 
     override fun onEnable() {
+        server.pluginManager.registerEvents(LanguageListener, this)
     }
 
     override fun onDisable() {

KotlinCore/src/de/steamwar/kotlin/message/ComponentMessage.kt

@@ -0,0 +1,36 @@
+/*
+ *   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.kotlin.message
+
+import net.kyori.adventure.key.Key
+import net.kyori.adventure.translation.GlobalTranslator
+import net.kyori.adventure.translation.Translator
+import java.text.MessageFormat
+import java.util.*
+
+class ComponentMessage(private val resourceBundleName: String, private val classLoader: ClassLoader) : Translator {
+    init {
+        GlobalTranslator.translator().addSource(this)
+    }
+
+    override fun name(): Key = Key.key("steamwar", resourceBundleName)
+
+    override fun translate(key: String, locale: Locale): MessageFormat = MessageFormat(ResourceBundle.getBundle(resourceBundleName, locale, classLoader).getString(key), locale)
+}

KotlinCore/src/de/steamwar/kotlin/message/LanguageListener.kt

@@ -0,0 +1,49 @@
+/*
+ *   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.kotlin.message
+
+import de.steamwar.kotlin.KotlinCore
+import de.steamwar.sql.SteamwarUser
+import org.bukkit.Bukkit
+import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer
+import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
+import org.bukkit.event.Listener
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerLocaleChangeEvent
+
+object LanguageListener: Listener {
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+    fun onPlayerJoin(event: PlayerJoinEvent) {
+        val user = SteamwarUser.get(event.player.uniqueId)
+        val player = event.player as CraftPlayer
+        player.handle.`adventure$locale` = user.locale
+    }
+
+    @EventHandler
+    fun onPlayerConfig(event: PlayerLocaleChangeEvent) {
+        Bukkit.getScheduler().runTask(KotlinCore.plugin, Runnable {
+            val user = SteamwarUser.get(event.player.uniqueId)
+            val player = event.player as CraftPlayer
+            player.handle.`adventure$locale` = user.locale
+        })
+    }
+}

LobbySystem/build.gradle.kts

@@ -27,7 +27,7 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
 

LobbySystem/src/de/steamwar/lobby/LobbySystem.properties

@@ -4,8 +4,12 @@ DATE=........
 COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===---
 
 # ServerTeamNPC's
-NPC_CHAT_1 = §fHello, I''m {0} and I''m a(n) {1}§f.
+NPC_CHAT_0 = §fHello, I''m {0} and I''m a(n) {1}§f.
-NPC_CHAT_2 = §fWelcome on §eSteam§8War§f, have fun.
+NPC_CHAT_1 = §fWelcome on §eSteam§8War§f, have fun.
+NPC_CHAT_2 = §eSteam§8War§f was established in 2019.
+NPC_CHAT_3 = &fBecome a part of our team by applying via our Discord server (https://steamwar.de/discord).
+NPC_CHAT_4 = &fYou can develop your own buildserver features with our Lua script system.
+NPC_CHAT_5 = &fThere are many secrets to discover in this lobby.
 
 # Portal Command
 PORTAL_COMMAND_LIST_HELP = §8/§7portal §elist §8- §7Lists all portals

LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties

@@ -4,8 +4,12 @@ DATE=........
 COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===---
 
 # ServerTeamNPC's
-NPC_CHAT_1 = §fHallo, ich bin {0} und bin ein {1}§f.
+NPC_CHAT_0 = §fHallo, ich bin {0} und bin ein {1}§f.
-NPC_CHAT_2 = §fWillkommen auf §eSteam§8War§f, viel Spaß dir.
+NPC_CHAT_1 = §fWillkommen auf §eSteam§8War§f, viel Spaß dir.
+NPC_CHAT_2 = §eSteam§8War§f gibt es seit 2019.
+NPC_CHAT_3 = &fBewerbe dich gerne für unser Team über unseren Discord-Server (https://steamwar.de/discord).
+NPC_CHAT_4 = &fDu kannst mit unserm Lua Script-System deine eigenen Bau Features programmieren.
+NPC_CHAT_5 = &fAuf dieser Lobby sind so einige secrets versteckt.
 
 # Portal Command
 PORTAL_COMMAND_LIST_HELP = §8/§7portal §elist §8- §7Listet alle Portale auf

LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java

@@ -222,11 +222,13 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
             case "PRE_SCHEM_SETUP":
                 return "Schemauswahl";
             case "POST_SCHEM_SETUP":
+            case "generating_tower":
                 return "Vorbereitung";
             case "PRE_RUNNING":
                 return "Kampfbeginn in";
             case "fighting":
             case "RUNNING":
+            case "running":
                 return "Kampf läuft";
             case "end":
             case "SPECTATE":

LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java

@@ -60,11 +60,6 @@ public class TeamPlayer extends BasicListener {
     private Set<Player> players = new HashSet<>();
 
     private Random random = new Random();
-    private List<String> strings = new ArrayList<>();
-    {
-        strings.add("NPC_CHAT_1");
-        strings.add("NPC_CHAT_2");
-    }
 
     public static void spawnTeamPlayer(World world, SteamwarUser steamwarUser) {
         Location location = new Location(world, 2790.5, 69, 1311.5);
@@ -149,8 +144,9 @@ public class TeamPlayer extends BasicListener {
             players.remove(event.getPlayer());
             return;
         }
+
+        String message = "NPC_Chat_" + random.nextInt(6);
         SteamwarUser user = SteamwarUser.get(event.getRightClicked().getName());
-        String message = strings.get(random.nextInt(strings.size()));
         UserPerm.Prefix prefix = user.prefix();
         LobbySystem.getMessage().send(message, event.getPlayer(), event.getRightClicked().getName(), prefix.getColorCode() + prefix.getChatPrefix());
     }

MissileWars/build.gradle.kts

@@ -27,7 +27,7 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
 

SchematicSystem/SchematicSystem_15/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":SchematicSystem:SchematicSystem_Core"))
+    compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default"))
 
     compileOnly(libs.nms15)
     compileOnly(libs.worldedit15)

SchematicSystem/SchematicSystem_8/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":SchematicSystem:SchematicSystem_Core"))
+    compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default"))
 
     compileOnly(libs.nms8)
     compileOnly(libs.worldedit12)

SchematicSystem/SchematicSystem_Core/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.worldedit15)

SpigotCore/SpigotCore_10/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
 
     compileOnly(libs.nms10)
 }

SpigotCore/SpigotCore_12/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":CommonCore"))
+    compileOnly(project(":CommonCore", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
 
     compileOnly(libs.nms12)
 }

SpigotCore/SpigotCore_14/build.gradle.kts

@@ -22,10 +22,10 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":CommonCore"))
+    compileOnly(project(":CommonCore", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_8"))
+    compileOnly(project(":SpigotCore:SpigotCore_8", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_9"))
+    compileOnly(project(":SpigotCore:SpigotCore_9", "default"))
 
     compileOnly(libs.nms14)
     compileOnly(libs.worldedit15)

SpigotCore/SpigotCore_15/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
 
     compileOnly(libs.nms15)
 }

SpigotCore/SpigotCore_18/build.gradle.kts

@@ -26,9 +26,9 @@ tasks.compileJava {
 }
 
 dependencies {
-    compileOnly(project(":CommonCore"))
+    compileOnly(project(":CommonCore", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_14"))
+    compileOnly(project(":SpigotCore:SpigotCore_14", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.nms18)

SpigotCore/SpigotCore_19/build.gradle.kts

@@ -22,9 +22,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_14"))
+    compileOnly(project(":SpigotCore:SpigotCore_14", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_18"))
+    compileOnly(project(":SpigotCore:SpigotCore_18", "default"))
 
     compileOnly(libs.worldedit15)
     compileOnly(libs.nms19)

SpigotCore/SpigotCore_20/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
 
     compileOnly(libs.spigotapi)
 

SpigotCore/SpigotCore_8/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":CommonCore"))
+    compileOnly(project(":CommonCore", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
 
     compileOnly(libs.nms8)
     compileOnly(libs.worldedit12)

SpigotCore/SpigotCore_9/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore:SpigotCore_Main"))
+    compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
-    compileOnly(project(":SpigotCore:SpigotCore_8"))
+    compileOnly(project(":SpigotCore:SpigotCore_8", "default"))
 
     compileOnly(libs.nms9)
 

SpigotCore/SpigotCore_Main/build.gradle.kts

@@ -26,9 +26,9 @@ tasks.compileJava {
 }
 
 dependencies {
-    compileOnly(project(":CommonCore"))
+    compileOnly(project(":CommonCore", "default"))
-    compileOnly(project(":CommandFramework"))
+    compileOnly(project(":CommandFramework", "default"))
-    compileOnly(project(":SpigotCore:CRIUDummy"))
+    compileOnly(project(":SpigotCore:CRIUDummy", "default"))
 
     compileOnly(libs.worldedit12)
 

SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java

@@ -36,6 +36,7 @@ import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.plugin.Plugin;
 
 import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiFunction;
 import java.util.logging.Level;
 
@@ -102,7 +103,7 @@ public class TinyProtocol implements Listener {
 	}
 
 	public void addFilter(Class<?> packetType, BiFunction<Player, Object, Object> filter) {
-		packetFilters.computeIfAbsent(packetType, c -> Collections.synchronizedList(new ArrayList<>(1))).add(filter);
+		packetFilters.computeIfAbsent(packetType, c -> new CopyOnWriteArrayList<>()).add(filter);
 	}
 
 	public void removeFilter(Class<?> packetType, BiFunction<Player, Object, Object> filter) {

TNTLeague/build.gradle.kts

@@ -4,6 +4,6 @@ plugins {
 
 dependencies {
     compileOnly(libs.paperapi21)
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":KotlinCore"))
+    compileOnly(project(":KotlinCore", "default"))
 }

Teamserver/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
 

TowerRun/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     annotationProcessor(libs.spigotannotations)
     compileOnly(libs.spigotannotations)
 
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.nms19)
     compileOnly(libs.worldedit15)

TowerRun/src/de/steamwar/towerrun/FightInfoPacketSender.java

@@ -0,0 +1,66 @@
+/*
+ *
+ *     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.towerrun;
+
+import de.steamwar.network.NetworkSender;
+import de.steamwar.network.packets.common.FightInfoPacket;
+import de.steamwar.sql.SteamwarUser;
+import de.steamwar.towerrun.config.Config;
+import de.steamwar.towerrun.game.TowerRunGame;
+import de.steamwar.towerrun.state.GameState;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class FightInfoPacketSender implements Runnable {
+
+    private final World world = Bukkit.getWorlds().get(0);
+
+    private final String serverName = Bukkit.getServer().getName();
+    private final String gameMode = "towerrun";
+    private final String worldName = world.getName();
+    private final String blueName = "§3Escaped";
+    private final String redName = "§cAlive";
+
+    @Override
+    public void run() {
+        if (Config.test()) {
+            return;
+        }
+
+        List<Integer> alivePlayers = TowerRunGame.PLAYERS_ALIVE.stream().map(player -> SteamwarUser.get(player.player().getUniqueId()).getId()).collect(Collectors.toList());
+        List<Integer> escapedPlayers = TowerRunGame.PLAYERS_ESCAPED.stream().map(player -> SteamwarUser.get(player.player().getUniqueId()).getId()).collect(Collectors.toList());
+        List<Integer> spectatorPlayers = new ArrayList<>();
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            int id = SteamwarUser.get(player.getUniqueId()).getId();
+            if (!alivePlayers.contains(id) && !escapedPlayers.contains(id)) {
+                spectatorPlayers.add(id);
+            }
+        }
+
+        NetworkSender.send(new FightInfoPacket(serverName, gameMode, worldName, blueName, redName, GameState.getCurrentState().name().toLowerCase(), TowerRun.getGameCountdown().getPlayTimeInSeconds(), 0, 0, 0, 0, escapedPlayers, alivePlayers, spectatorPlayers));
+    }
+}

TowerRun/src/de/steamwar/towerrun/TowerRun.java

@@ -32,6 +32,7 @@ import de.steamwar.towerrun.listener.IngameListener;
 import de.steamwar.towerrun.listener.LobbyListener;
 import de.steamwar.towerrun.listener.NotLobbyListener;
 import lombok.Getter;
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.annotation.dependency.Dependency;
 import org.bukkit.plugin.java.annotation.plugin.ApiVersion;
@@ -79,6 +80,8 @@ public class TowerRun extends JavaPlugin {
         new StartCommand(lobbyCountdown);
         gameCountdown = new GameCountdown();
 
+        Bukkit.getScheduler().runTaskTimer(this, new FightInfoPacketSender(), 20, 20);
+
         TowerRunGame.reset();
     }
 }

TowerRun/src/de/steamwar/towerrun/config/Config.java

@@ -39,6 +39,8 @@ public class Config {
     public static final int GAME_TIMER;
     public static final int GAME_ESCAPE_TIMER;
 
+    private static final int EVENT_KAMPF_ID;
+
     static {
         File configFile = new File(TowerRun.getInstance().getDataFolder(), "config.yml");
         if (!configFile.exists()) {
@@ -53,6 +55,11 @@ public class Config {
         GAME_TIMER = config.getInt("gameTimer", 20 * 60);
         GAME_ESCAPE_TIMER = config.getInt("gameEscapeTimer", 60);
         DESTROYABLE_BLOCKS = EnumSet.copyOf(config.getStringList("destroyable").stream().map(Material::valueOf).collect(Collectors.toSet()));
+
+        EVENT_KAMPF_ID = Integer.parseInt(System.getProperty("fightID", "0"));
     }
 
+    public static boolean test() {
+        return EVENT_KAMPF_ID == -1;
+    }
 }

TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java

@@ -35,7 +35,7 @@ public class EndCountdown extends Countdown {
     private static final boolean RESETS = Objects.requireNonNull(Bukkit.getWorlds().get(0).getWorldFolder().list((dir, name) -> name.equals("backup"))).length > 0;
 
     public EndCountdown(LobbyCountdown lobbyCountdown) {
-        super(EnumSet.of(GameStates.ENDING));
+        super(EnumSet.of(GameStates.END));
         this.lobbyCountdown = lobbyCountdown;
     }
 

TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java

@@ -28,8 +28,10 @@ import java.util.EnumSet;
 
 public class GameCountdown extends Countdown {
 
+    private long startTime = 0;
+
     public GameCountdown() {
-        super(EnumSet.of(GameStates.INGAME));
+        super(EnumSet.of(GameStates.RUNNING));
     }
 
     @Override
@@ -59,9 +61,21 @@ public class GameCountdown extends Countdown {
         TowerRun.getMessage().broadcastActionbar("GAME_TIME", String.format("%02d", timeMinutes), String.format("%02d", timeSeconds));
     }
 
+    @Override
+    public void enable() {
+        super.enable();
+        startTime = System.currentTimeMillis();
+    }
+
     @Override
     public void disable() {
         super.disable();
         setTime(defaultTime());
+        startTime = 0;
+    }
+
+    public int getPlayTimeInSeconds() {
+        if (startTime == 0) return 0;
+        return (int) ((System.currentTimeMillis() - startTime) / 1000);
     }
 }

TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java

@@ -37,7 +37,7 @@ public class LobbyCountdown extends Countdown {
     private boolean override = false;
 
     public LobbyCountdown() {
-        super(EnumSet.of(GameStates.LOBBY));
+        super(EnumSet.of(GameStates.WAITING));
     }
 
     @Override

TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java

@@ -49,7 +49,7 @@ public class TowerRunGame {
     }
 
     public static void prepareTowerOrStart() {
-        if (GameState.getCurrentState() == GameStates.LOBBY) {
+        if (GameState.getCurrentState() == GameStates.WAITING) {
             GameState.nextState();
             if (TowerRun.getTowerGenerator() == null) {
                 start();

TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java

@@ -52,7 +52,7 @@ public class IngameListener extends GameStateBukkitListener {
     private BukkitRunnable antiCampRunnable;
 
     public IngameListener() {
-        super(EnumSet.of(GameStates.INGAME));
+        super(EnumSet.of(GameStates.RUNNING));
     }
 
     @Override

TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java

@@ -37,7 +37,7 @@ import java.util.EnumSet;
 
 public class LobbyListener extends GameStateBukkitListener {
     public LobbyListener() {
-        super(EnumSet.of(GameStates.LOBBY));
+        super(EnumSet.of(GameStates.WAITING));
     }
 
     @EventHandler

TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java

@@ -31,7 +31,7 @@ import java.util.EnumSet;
 
 public class NotLobbyListener extends GameStateBukkitListener {
     public NotLobbyListener() {
-        super(EnumSet.complementOf(EnumSet.of(GameStates.LOBBY)));
+        super(EnumSet.complementOf(EnumSet.of(GameStates.WAITING)));
     }
 
     @EventHandler

TowerRun/src/de/steamwar/towerrun/state/GameState.java

@@ -28,7 +28,7 @@ import java.util.List;
 @UtilityClass
 public class GameState {
     @Getter
-    private static GameStates currentState = GameStates.LOBBY;
+    private static GameStates currentState = GameStates.WAITING;
     private static final List<GameStateListener> gameStateListeners = new ArrayList<>();
 
     public static void addGameStateListener(GameStateListener gameStateListener) {
@@ -49,7 +49,7 @@ public class GameState {
 
     public static void reset() {
         final GameStates oldState = currentState;
-        currentState = GameStates.LOBBY;
+        currentState = GameStates.WAITING;
         gameStateChanges(oldState, currentState);
     }
 

TowerRun/src/de/steamwar/towerrun/state/GameStates.java

@@ -25,10 +25,10 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public enum GameStates {
-    ENDING(null),
+    END(null),
-    INGAME(ENDING),
+    RUNNING(END),
-    GENERATING_TOWER(INGAME),
+    GENERATING_TOWER(RUNNING),
-    LOBBY(GENERATING_TOWER);
+    WAITING(GENERATING_TOWER);
 
     private final GameStates nextState;
 }

TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java

@@ -34,7 +34,7 @@ public abstract class WinCondition extends GameStateBukkitListener {
     private boolean active = false;
 
     protected WinCondition(String name) {
-        super(EnumSet.of(GameStates.INGAME));
+        super(EnumSet.of(GameStates.RUNNING));
         this.name = name;
     }
 

TutorialSystem/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.nms15)
 }

VelocityCore/build.gradle.kts

@@ -48,7 +48,7 @@ dependencies {
     annotationProcessor(libs.velocityapi)
     compileOnly(libs.velocity)
 
-    compileOnly(project(":VelocityCore:Persistent"))
+    compileOnly(project(":VelocityCore:Persistent", "default"))
 
     implementation(project(":CommonCore"))
     implementation(project(":CommandFramework"))

VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java

@@ -48,6 +48,7 @@ import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
@@ -99,6 +100,7 @@ public class DiscordBot {
                 .createDefault(config.getToken())
                 .setStatus(OnlineStatus.ONLINE)
                 .setMemberCachePolicy(MemberCachePolicy.ONLINE)
+                .enableIntents(GatewayIntent.MESSAGE_CONTENT)
                 .build();
 
         instance = this;

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

@@ -76,9 +76,9 @@ public class ModUtils {
         String message;
 
         if(mods.size() == 1) {
-            message = sender.parseToLegacy(max == ModType.RED ? "MOD_RED_SING" : "MOD_YELLOW_SING", locale, modList);
+            message = sender.parseToLegacy(max == ModType.RED ? "MOD_RED_SING" : "MOD_YELLOW_SING", modList);
         } else {
-            message = sender.parseToLegacy(max == ModType.RED ? "MOD_RED_PLUR" : "MOD_YELLOW_PLUR", locale, modList);
+            message = sender.parseToLegacy(max == ModType.RED ? "MOD_RED_PLUR" : "MOD_YELLOW_PLUR", modList);
         }
 
         if(max == ModType.RED) {

settings.gradle.kts

@@ -107,7 +107,7 @@ dependencyResolutionManagement {
             library("netty", "io.netty:netty-all:4.1.68.Final")
             library("junit", "junit:junit:4.13.2")
             library("hamcrest", "org.hamcrest:hamcrest:2.2")
-            library("jda", "net.dv8tion:JDA:5.0.2")
+            library("jda", "net.dv8tion:JDA:5.2.0")
             library("msgpack", "org.msgpack:msgpack-core:0.9.8")
             library("classindex", "org.atteo.classindex:classindex:3.13")
 
@@ -130,6 +130,7 @@ dependencyResolutionManagement {
             library("nms18", "de.steamwar:spigot:1.18")
             library("nms19", "de.steamwar:spigot:1.19")
             library("nms20", "de.steamwar:spigot:1.20")
+            library("nms21", "de.steamwar:spigot:1.21")
 
             library("axiom", "de.steamwar:axiompaper:RELEASE")
             library("worldedit12", "de.steamwar:worldedit:1.12")