Persistent/build.gradle

@@ -44,15 +44,6 @@ sourceSets {
     }
 }
 
-repositories {
-    maven {
-        url = 'https://repo.fvdh.dev/releases'
-        content {
-            includeGroup 'net.frankheijden.serverutils'
-        }
-    }
-}
-
 dependencies {
     compileOnly 'org.projectlombok:lombok:1.18.32'
     testCompileOnly 'org.projectlombok:lombok:1.18.32'
@@ -61,6 +52,4 @@ dependencies {
 
     compileOnly 'de.steamwar:velocity:RELEASE'
     annotationProcessor 'com.velocitypowered:velocity-api:3.3.0-SNAPSHOT'
-
-    compileOnly 'net.frankheijden.serverutils:ServerUtils:3.5.4'
 }

Persistent/src/de/steamwar/bungeecore/Arenaserver.java

@@ -1,18 +0,0 @@
-package de.steamwar.bungeecore;
-
-import lombok.Getter;
-
-@Getter
-public class Arenaserver extends Subserver {
-
-    private final String mode;
-    private final String map;
-    private final boolean allowMerge;
-
-    public Arenaserver(String serverName, String mode, String map, boolean allowMerge, int port, ProcessBuilder processBuilder, Runnable shutdownCallback) {
-        super(Servertype.ARENA, serverName, port, processBuilder, shutdownCallback, null);
-        this.mode = mode;
-        this.map = map;
-        this.allowMerge = allowMerge;
-    }
-}

Persistent/src/de/steamwar/bungeecore/Persistent.java

@@ -1,81 +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.bungeecore;
-
-import com.google.inject.Inject;
-import com.velocitypowered.api.command.BrigadierCommand;
-import com.velocitypowered.api.event.Subscribe;
-import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
-import com.velocitypowered.api.plugin.Dependency;
-import com.velocitypowered.api.plugin.Plugin;
-import com.velocitypowered.api.plugin.annotation.DataDirectory;
-import com.velocitypowered.api.proxy.ProxyServer;
-import lombok.Getter;
-import net.frankheijden.serverutils.velocity.ServerUtils;
-
-import java.nio.file.Path;
-import java.util.logging.Logger;
-
-@Plugin(
-        id = "persistentvelocitycore",
-        name = "PersistentVelocityCore",
-        dependencies = { @Dependency(id = "serverutils") }
-)
-public class Persistent {
-
-    @Getter
-    private static Persistent instance;
-
-    @Inject
-    public Persistent(ProxyServer proxyServer, Logger logger, @DataDirectory Path dataDirectory) {
-        instance = this;
-        this.proxyServer = proxyServer;
-        this.logger = logger;
-    }
-
-    @Getter
-    private final ProxyServer proxyServer;
-
-    @Getter
-    private final Logger logger;
-
-    @Subscribe
-    public void onEnable(ProxyInitializeEvent event) {
-        proxyServer.getCommandManager().register(
-                new BrigadierCommand(
-                        BrigadierCommand.literalArgumentBuilder("softreload")
-                                .requires(commandSource -> commandSource.hasPermission("bungeecore.softreload"))
-                                .executes(commandContext -> softreload())
-                                .build()
-                )
-        );
-    }
-
-    @Subscribe
-    public void onDisable(ProxyShutdownEvent event) {
-        Subserver.shutdown();
-    }
-
-    public int softreload() {
-        ServerUtils.getInstance().getPlugin().getPluginManager().reloadPlugin("VelocityCore");
-        return 1;
-    }
-}

Persistent/src/de/steamwar/bungeecore/Servertype.java

@@ -1,26 +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.bungeecore;
-
-public enum Servertype {
-    BAUSERVER,
-    ARENA,
-    BUILDER
-}

Persistent/src/de/steamwar/persistent/Arenaserver.java

@@ -0,0 +1,37 @@
+/*
+ *   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.persistent;
+
+import lombok.Getter;
+
+@Getter
+public class Arenaserver extends Subserver {
+
+    private final String mode;
+    private final String map;
+    private final boolean allowMerge;
+
+    public Arenaserver(String serverName, String mode, String map, boolean allowMerge, int port, ProcessBuilder processBuilder, Runnable shutdownCallback) {
+        super(Servertype.ARENA, serverName, port, processBuilder, shutdownCallback, null);
+        this.mode = mode;
+        this.map = map;
+        this.allowMerge = allowMerge;
+    }
+}

Persistent/src/de/steamwar/persistent/Bauserver.java

@@ -1,23 +1,23 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  SteamWar.de-Serverteam
+/*
+ *   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/>.
+ */
 
-    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.bungeecore;
+package de.steamwar.persistent;
 
 import lombok.Getter;
 

Persistent/src/de/steamwar/persistent/Builderserver.java

@@ -1,23 +1,23 @@
 /*
-    This file is a part of the SteamWar software.
+ *   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/>.
+ */
 
-    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.bungeecore;
+package de.steamwar.persistent;
 
 import lombok.Getter;
 

Persistent/src/de/steamwar/persistent/Persistent.java

@@ -0,0 +1,203 @@
+/*
+ *   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.persistent;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Module;
+import com.google.inject.name.Names;
+import com.mojang.brigadier.Command;
+import com.velocitypowered.api.command.BrigadierCommand;
+import com.velocitypowered.api.command.CommandManager;
+import com.velocitypowered.api.command.CommandMeta;
+import com.velocitypowered.api.event.EventManager;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
+import com.velocitypowered.api.plugin.Plugin;
+import com.velocitypowered.api.plugin.PluginContainer;
+import com.velocitypowered.api.plugin.PluginDescription;
+import com.velocitypowered.api.plugin.PluginManager;
+import com.velocitypowered.api.plugin.annotation.DataDirectory;
+import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.scheduler.ScheduledTask;
+import com.velocitypowered.proxy.plugin.PluginClassLoader;
+import com.velocitypowered.proxy.plugin.VelocityPluginManager;
+import com.velocitypowered.proxy.plugin.loader.VelocityPluginContainer;
+import com.velocitypowered.proxy.plugin.loader.java.JavaPluginLoader;
+import lombok.Getter;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.NoSuchElementException;
+import java.util.ResourceBundle;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Plugin(
+        id = "persistentvelocitycore",
+        name = "PersistentVelocityCore"
+)
+public class Persistent {
+
+    private static final Reflection.Method<VelocityPluginManager> registerPlugin = new Reflection.Method<>(VelocityPluginManager.class, "registerPlugin", PluginContainer.class);
+
+    @Getter
+    private static Persistent instance;
+
+    @Getter
+    private final ProxyServer proxy;
+    @Getter
+    private final Logger logger;
+    private final Path directory;
+
+    @Inject
+    public Persistent(ProxyServer proxy, Logger logger, @DataDirectory Path dataDirectory) {
+        instance = this;
+        this.proxy = proxy;
+        this.logger = logger;
+        this.directory = dataDirectory;
+    }
+
+    @Subscribe
+    public void onEnable(ProxyInitializeEvent event) {
+        proxy.getCommandManager().register(
+                new BrigadierCommand(
+                        BrigadierCommand.literalArgumentBuilder("softreload")
+                                .requires(commandSource -> commandSource.hasPermission("bungeecore.softreload"))
+                                .executes(commandContext -> softreload())
+                                .build()
+                )
+        );
+    }
+
+    @Subscribe
+    public void onDisable(ProxyShutdownEvent event) {
+        Subserver.shutdown();
+    }
+
+    public int softreload() {
+        PluginContainer container = null;
+        ReloadablePlugin plugin = null;
+        try {
+            container = proxy.getPluginManager().getPlugin("velocitycore").orElseThrow();
+            plugin = (ReloadablePlugin) container.getInstance().orElseThrow();
+        } catch (NoSuchElementException e) {
+            logger.log(Level.WARNING, "Could not find loaded VelocityCore, continuing without unloading.");
+        }
+
+        PluginContainer newContainer;
+        try {
+            newContainer = prepareLoad();
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Could not instantiate new VelocityCore, aborting softreload.", e);
+            return Command.SINGLE_SUCCESS;
+        }
+
+        broadcast("§eNetwork update is starting§8.");
+        try {
+            if(container != null && plugin != null) {
+                plugin.onProxyShutdown(new ProxyShutdownEvent());
+                unload(container, plugin);
+            }
+
+            registerPlugin.invoke((VelocityPluginManager) proxy.getPluginManager(), newContainer);
+            ((ReloadablePlugin) newContainer.getInstance().orElseThrow()).onProxyInitialization(new ProxyInitializeEvent());
+        } catch (Throwable t) {
+            logger.log(Level.SEVERE, "Error during softreload", t);
+            broadcast("§cNetwork update failed§8, §cexpect network restart soon§8.");
+            return Command.SINGLE_SUCCESS;
+        }
+
+        broadcast("§eNetwork update complete§8.");
+        return Command.SINGLE_SUCCESS;
+    }
+
+    private void broadcast(String message) {
+        Component component = LegacyComponentSerializer.legacySection().deserialize("§eSteam§8War» " + message);
+        proxy.getAllPlayers().forEach(player -> player.sendMessage(component));
+        proxy.getConsoleCommandSource().sendMessage(component);
+    }
+
+    private PluginContainer prepareLoad() throws Exception {
+        Path plugins = directory.getParent();
+        JavaPluginLoader loader = new JavaPluginLoader(proxy, plugins);
+        PluginDescription description = loader.createPluginFromCandidate(loader.loadCandidate(plugins.resolve("velocitycore.jar")));
+        PluginContainer container = new VelocityPluginContainer(description);
+
+        AbstractModule commonModule = new AbstractModule() {
+            @Override
+            protected void configure() {
+                this.bind(ProxyServer.class).toInstance(proxy);
+                this.bind(PluginManager.class).toInstance(proxy.getPluginManager());
+                this.bind(EventManager.class).toInstance(proxy.getEventManager());
+                this.bind(CommandManager.class).toInstance(proxy.getCommandManager());
+                this.bind(PluginContainer.class).annotatedWith(Names.named(container.getDescription().getId())).toInstance(container);
+            }
+        };
+
+        Module module = loader.createModule(container);
+        loader.createPlugin(container, module, commonModule);
+
+        return container;
+    }
+
+    private void unload(PluginContainer container, Object plugin) throws InterruptedException, IOException {
+        PluginClassLoader classLoader = ((PluginClassLoader) plugin.getClass().getClassLoader());
+
+        CommandManager commandManager = proxy.getCommandManager();
+        for(String alias : commandManager.getAliases()) {
+            CommandMeta meta = commandManager.getCommandMeta(alias);
+            if(meta != null && meta.getPlugin() == plugin)
+                commandManager.unregister(meta);
+        }
+
+        proxy.getEventManager().unregisterListeners(plugin);
+        proxy.getScheduler().tasksByPlugin(plugin).forEach(ScheduledTask::cancel);
+
+        container.getExecutorService().shutdown();
+        if(!container.getExecutorService().awaitTermination(100, TimeUnit.MILLISECONDS))
+            logger.log(Level.WARNING, "ExecutorService termination took longer than 100ms, continuing.");
+
+        for(Thread thread : Thread.getAllStackTraces().keySet()) {
+            if(thread.getClass().getClassLoader() != classLoader)
+                continue;
+
+            thread.interrupt();
+            thread.join(100);
+
+            if (thread.isAlive())
+                logger.log(Level.WARNING, "Could not stop thread %s of plugin %s. Still running".formatted(thread.getName(), container.getDescription().getId()));
+        }
+
+        //TODO close all log handlers
+        /*for (Handler handler : plugin.getLogger().getHandlers()) {
+            handler.close();
+        }*/
+
+
+        //Clear resource bundle cache
+        ResourceBundle.clearCache(classLoader);
+        classLoader.close();
+    }
+}

Persistent/src/de/steamwar/persistent/Reflection.java

@@ -0,0 +1,75 @@
+/*
+ *   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.persistent;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class Reflection {
+    public static class Field<C, T> {
+        private final java.lang.reflect.Field f;
+
+        public Field(Class<C> target, String name) {
+            try {
+                f = target.getDeclaredField(name);
+                f.setAccessible(true);
+            } catch (NoSuchFieldException e) {
+                throw new IllegalArgumentException("Cannot find field with name " + name, e);
+            }
+        }
+
+        public T get(C target) {
+            try {
+                return (T) f.get(target);
+            } catch (IllegalAccessException e) {
+                throw new IllegalArgumentException("Cannot access reflection.", e);
+            }
+        }
+
+        public void set(C target, T value) {
+            try {
+                f.set(target, value);
+            } catch (IllegalAccessException e) {
+                throw new IllegalArgumentException("Cannot access reflection.", e);
+            }
+        }
+    }
+
+    public static class Method<C> {
+        private final java.lang.reflect.Method m;
+
+        public Method(Class<C> clazz, String methodName, Class<?>... params) {
+            try {
+                m = clazz.getDeclaredMethod(methodName, params);
+                m.setAccessible(true);
+            } catch (NoSuchMethodException e) {
+                throw new IllegalArgumentException("Cannot find method with name " + methodName, e);
+            }
+        }
+
+        public Object invoke(C target, Object... arguments) {
+            try {
+                return m.invoke(target, arguments);
+            } catch (Exception e) {
+                throw new IllegalArgumentException("Cannot invoke method " + m, e);
+            }
+        }
+    }
+}

Persistent/src/de/steamwar/persistent/ReloadablePlugin.java

@@ -0,0 +1,28 @@
+/*
+ *   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.persistent;
+
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
+
+public interface ReloadablePlugin {
+    void onProxyInitialization(ProxyInitializeEvent event);
+    default void onProxyShutdown(ProxyShutdownEvent event) {}
+}

Persistent/src/de/steamwar/persistent/Servertype.java

@@ -0,0 +1,26 @@
+/*
+ *   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.persistent;
+
+public enum Servertype {
+    BAUSERVER,
+    ARENA,
+    BUILDER
+}

Persistent/src/de/steamwar/persistent/Storage.java

@@ -1,23 +1,23 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  SteamWar.de-Serverteam
+/*
+ *   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/>.
+ */
 
-    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.bungeecore;
+package de.steamwar.persistent;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.ServerInfo;

Persistent/src/de/steamwar/persistent/Subserver.java

@@ -1,23 +1,23 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  SteamWar.de-Serverteam
+/*
+ *   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/>.
+ */
 
-    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.bungeecore;
+package de.steamwar.persistent;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
@@ -181,7 +181,7 @@ public class Subserver {
     }
 
     protected void register() {
-        if (Persistent.getInstance().getProxyServer().getServer(serverName).isPresent()) {
+        if (Persistent.getInstance().getProxy().getServer(serverName).isPresent()) {
             SecurityException e = new SecurityException("Server already registered: " + serverName);
             stop();
             failureCallback.accept(e);
@@ -189,7 +189,7 @@ public class Subserver {
         }
 
         synchronized (serverList) {
-            registeredServer = Persistent.getInstance().getProxyServer().registerServer(server);
+            registeredServer = Persistent.getInstance().getProxy().registerServer(server);
             serverList.add(this);
             infoToServer.put(server, this);
         }
@@ -199,7 +199,7 @@ public class Subserver {
         synchronized (serverList) {
             infoToServer.remove(server);
             serverList.remove(this);
-            Persistent.getInstance().getProxyServer().unregisterServer(server);
+            Persistent.getInstance().getProxy().unregisterServer(server);
             registeredServer = null;
         }
     }

src/de/steamwar/bungeecore/Reflection.java

@@ -1,115 +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.bungeecore;
-
-import lombok.AllArgsConstructor;
-import lombok.experimental.UtilityClass;
-
-import java.lang.reflect.*;
-import java.util.Arrays;
-
-@UtilityClass
-public class Reflection {
-
-    public interface ConstructorInvoker {
-        Object invoke(Object... arguments);
-    }
-
-    public interface MethodInvoker {
-        Object invoke(Object target, Object... arguments);
-    }
-
-    @AllArgsConstructor
-    public static class Field<C, T> {
-        private final java.lang.reflect.Field f;
-
-        public T get(C target) {
-            try {
-                return (T) f.get(target);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException("Cannot access reflection.", e);
-            }
-        }
-
-        public void set(C target, T value) {
-            try {
-                f.set(target, value);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException("Cannot access reflection.", e);
-            }
-        }
-    }
-
-    public static <C, T> Field<C, T> getField(Class<C> target, String name) {
-        try {
-            java.lang.reflect.Field field = target.getDeclaredField(name);
-            field.setAccessible(true);
-            return new Field<>(field);
-        } catch (NoSuchFieldException e) {
-            throw new IllegalArgumentException("Cannot find field with name " + name, e);
-        }
-    }
-
-    public static MethodInvoker getMethod(Class<?> clazz, String methodName, Class<?>... params) {
-        return getTypedMethod(clazz, methodName, null, params);
-    }
-
-    public static MethodInvoker getTypedMethod(Class<?> clazz, String methodName, Class<?> returnType, Class<?>... params) {
-        for (final Method method : clazz.getDeclaredMethods()) {
-            if ((methodName == null || method.getName().equals(methodName))
-                    && (returnType == null || method.getReturnType().equals(returnType))
-                    && Arrays.equals(method.getParameterTypes(), params)) {
-                method.setAccessible(true);
-
-                return (target, arguments) -> {
-                    try {
-                        return method.invoke(target, arguments);
-                    } catch (Exception e) {
-                        throw new IllegalArgumentException("Cannot invoke method " + method, e);
-                    }
-                };
-            }
-        }
-
-        // Search in every superclass
-        if (clazz.getSuperclass() != null)
-            return getTypedMethod(clazz.getSuperclass(), methodName, returnType, params);
-
-        throw new IllegalStateException(String.format("Unable to find method %s (%s).", methodName, Arrays.asList(params)));
-    }
-
-    public static ConstructorInvoker getConstructor(Class<?> clazz, Class<?>... params) {
-        for (final Constructor<?> constructor : clazz.getDeclaredConstructors()) {
-            if (Arrays.equals(constructor.getParameterTypes(), params)) {
-                constructor.setAccessible(true);
-
-                return arguments -> {
-                    try {
-                        return constructor.newInstance(arguments);
-                    } catch (Exception e) {
-                        throw new IllegalArgumentException("Cannot invoke constructor " + constructor, e);
-                    }
-                };
-            }
-        }
-
-        throw new IllegalStateException(String.format("Unable to find constructor for %s (%s).", clazz, Arrays.asList(params)));
-    }
-}

src/de/steamwar/bungeecore/util/Chat19.java

@@ -1,41 +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.bungeecore.util;
-
-import com.velocitypowered.api.proxy.Player;
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class Chat19 {
-
-    public static void chat(Player p, String message) {
-        p.spoofChatInput(message);
-
-        /*if(p.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_18_2)) {
-            if(message.startsWith("/")) {
-                ((ServerConnection) p.getServer()).getCh().write(new ClientCommand(message.substring(1), System.currentTimeMillis(), 0, Collections.emptyMap(), false, new ChatChain(Collections.emptyList(), null), new SeenMessages(0, new BitSet(0))));
-            } else {
-                ((ServerConnection) p.getServer()).getCh().write(new ClientChat(message, System.currentTimeMillis(), 0, version < ProtocolConstants.MINECRAFT_1_19_3 ? new byte[0] : null, false, new ChatChain(Collections.emptyList(), null), new SeenMessages(0, new BitSet(0))));
-            }
-        } else {
-            p.spoofChatInput(message);
-        }*/
-    }
-}

src/de/steamwar/command/SWCommand.java

@@ -20,8 +20,8 @@
 package de.steamwar.command;
 
 import com.velocitypowered.api.command.SimpleCommand;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.DiscordBot;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.sql.UserPerm;
@@ -113,7 +113,7 @@ public class SWCommand extends AbstractSWCommand<Chatter> {
         if (command == null)
             return;
 
-        VelocityCore.getProxy().getCommandManager().register(name, command, aliases);
+        VelocityCore.getProxy().getCommandManager().register(VelocityCore.getProxy().getCommandManager().metaBuilder(name).aliases(aliases).plugin(VelocityCore.get()).build(), command);
         DiscordBot.getCommands().put(name, this);
         for(String alias : aliases)
             DiscordBot.getCommands().put(alias, this);

src/de/steamwar/command/TypeUtils.java

@@ -21,9 +21,9 @@ package de.steamwar.command;
 
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.ServerVersion;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.commands.TypeMappers;
+import de.steamwar.velocitycore.ServerVersion;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.commands.TypeMappers;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;

src/de/steamwar/messages/Chatter.java

@@ -23,9 +23,9 @@ import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.ResultedEvent;
 import com.velocitypowered.api.event.connection.LoginEvent;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.Servertype;
-import de.steamwar.bungeecore.Subserver;
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import net.kyori.adventure.text.Component;

src/de/steamwar/sql/SQLConfigImpl.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.sql;
 
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.sql.internal.SQLConfig;
 
 import java.util.logging.Logger;

src/de/steamwar/sql/SQLWrapperImpl.java

@@ -21,9 +21,9 @@ package de.steamwar.sql;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.bungeecore.GameModeConfig;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.commands.CheckCommand;
+import de.steamwar.velocitycore.GameModeConfig;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.commands.CheckCommand;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/de/steamwar/velocitycore/ArenaMode.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import de.steamwar.sql.SchematicType;
 import lombok.Getter;

src/de/steamwar/velocitycore/Broadcaster.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import de.steamwar.messages.Chatter;
 

src/de/steamwar/velocitycore/Config.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import lombok.Getter;

src/de/steamwar/velocitycore/ErrorLogger.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import de.steamwar.sql.SWException;
 
@@ -27,16 +27,17 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.*;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 
-public class ErrorLogger extends Handler {
+public class ErrorLogger extends Handler /*AbstractAppender*/ {
 
     ErrorLogger(){
-        Logger logger = VelocityCore.getLogger();
-        while(logger.getParent() != null)
-            logger = logger.getParent();
-
-        logger.addHandler(this);
+        //super("SW ErrorLogger", filter, layout, false, null);
+        //((LoggerContext) org.apache.logging.log4j.LogManager.getContext(false)).getConfiguration().addAppender(this);
+        VelocityCore.getLogger().addHandler(this);
     }
 
     void unregister(){
@@ -81,4 +82,9 @@ public class ErrorLogger extends Handler {
         List<String> contains = new ArrayList<>();
         ignoreContains = Collections.unmodifiableList(contains);
     }
+
+    /*@Override
+    public void append(LogEvent event) {
+
+    }*/
 }

src/de/steamwar/velocitycore/EventStarter.java

@@ -17,9 +17,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import de.steamwar.messages.Chatter;
+import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.EventFight;
 import de.steamwar.sql.Team;
 import net.kyori.adventure.text.event.ClickEvent;
@@ -30,7 +31,7 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
-import static de.steamwar.bungeecore.Storage.eventServer;
+import static de.steamwar.persistent.Storage.eventServer;
 
 public class EventStarter {
 

src/de/steamwar/velocitycore/GameModeConfig.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import lombok.Getter;
 import lombok.Setter;

src/de/steamwar/velocitycore/Node.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import java.io.BufferedReader;
 import java.io.File;

src/de/steamwar/velocitycore/ServerStarter.java

@@ -17,10 +17,14 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.messages.Chatter;
+import de.steamwar.persistent.Arenaserver;
+import de.steamwar.persistent.Bauserver;
+import de.steamwar.persistent.Builderserver;
+import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.*;
 
 import java.io.DataOutputStream;

src/de/steamwar/velocitycore/ServerVersion.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import lombok.Getter;
 

src/de/steamwar/velocitycore/SubserverSystem.java

@@ -17,14 +17,15 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.network.NetworkSender;
-import de.steamwar.bungeecore.network.handlers.FightInfoHandler;
+import de.steamwar.velocitycore.network.NetworkSender;
+import de.steamwar.velocitycore.network.handlers.FightInfoHandler;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.network.packets.server.StartingServerPacket;
+import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.IgnoreSystem;
 import de.steamwar.sql.SteamwarUser;
 import net.kyori.adventure.text.event.ClickEvent;

src/de/steamwar/velocitycore/VelocityCore.java

@@ -17,9 +17,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore;
+package de.steamwar.velocitycore;
 
 import com.google.inject.Inject;
+import com.mysql.cj.jdbc.Driver;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
@@ -28,21 +29,22 @@ import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.scheduler.Scheduler;
-import de.steamwar.bungeecore.commands.*;
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.discord.DiscordConfig;
-import de.steamwar.bungeecore.listeners.*;
-import de.steamwar.bungeecore.mods.*;
-import de.steamwar.bungeecore.network.handlers.*;
-import de.steamwar.bungeecore.tablist.TablistManager;
 import de.steamwar.command.*;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.PacketHandler;
+import de.steamwar.persistent.ReloadablePlugin;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;
 import de.steamwar.sql.UserElo;
 import de.steamwar.sql.internal.Statement;
+import de.steamwar.velocitycore.commands.*;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.DiscordConfig;
+import de.steamwar.velocitycore.listeners.*;
+import de.steamwar.velocitycore.mods.*;
+import de.steamwar.velocitycore.network.handlers.*;
+import de.steamwar.velocitycore.tablist.TablistManager;
 import lombok.Getter;
 
 import java.nio.file.Path;
@@ -60,7 +62,7 @@ import java.util.logging.Logger;
         name = "VelocityCore",
         dependencies = { @Dependency(id = "persistentvelocitycore") }
 )
-public class VelocityCore {
+public class VelocityCore implements ReloadablePlugin {
 
     public static boolean MAIN_SERVER;
 
@@ -87,9 +89,10 @@ public class VelocityCore {
     private final Logger logger;
     @Getter
     private final Path dataDirectory;
-    @Getter
-    Config config;
 
+    private Driver mysqlDriver;
+    @Getter
+    private Config config;
     private ErrorLogger errorLogger;
     private TablistManager tablistManager;
 
@@ -102,17 +105,20 @@ public class VelocityCore {
         this.logger = logger;
         this.dataDirectory = dataDirectory;
 
-        instance = this;
-
-        try {
-            DriverManager.registerDriver(new com.mysql.cj.jdbc.Driver());
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @Subscribe
+    @Override
     public void onProxyInitialization(ProxyInitializeEvent event) {
+        instance = this;
+
+        try {
+            mysqlDriver = new com.mysql.cj.jdbc.Driver();
+            DriverManager.registerDriver(mysqlDriver);
+        } catch (SQLException e) {
+            throw new SecurityException(e);
+        }
+
         config = Config.load();
         MAIN_SERVER = proxyServer.getBoundAddress().getPort() == 25565;
 
@@ -243,6 +249,7 @@ public class VelocityCore {
     }
 
     @Subscribe
+    @Override
     public void onProxyShutdown(ProxyShutdownEvent event) {
         try {
             DiscordBot.withBot(bot -> bot.getJda().shutdown());
@@ -254,6 +261,12 @@ public class VelocityCore {
             tablistManager.disable();
         errorLogger.unregister();
         Statement.closeAll();
+
+        try {
+            DriverManager.deregisterDriver(mysqlDriver);
+        } catch (SQLException e) {
+            throw new SecurityException(e);
+        }
     }
 
     private void initStaticServers() {

src/de/steamwar/velocitycore/commands/AlertCommand.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;

src/de/steamwar/velocitycore/commands/ArenaCommand.java

@@ -17,12 +17,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.bungeecore.Servertype;
-import de.steamwar.bungeecore.Subserver;
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -31,7 +31,6 @@ import de.steamwar.messages.PlayerChatter;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class ArenaCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/BauCommand.java

@@ -17,15 +17,14 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.*;
-import de.steamwar.bungeecore.inventory.SWInventory;
-import de.steamwar.bungeecore.inventory.SWItem;
-import de.steamwar.bungeecore.network.NetworkSender;
-import de.steamwar.bungeecore.util.BauLock;
-import de.steamwar.bungeecore.util.BauLockState;
-import de.steamwar.bungeecore.util.Chat19;
+import de.steamwar.velocitycore.*;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.inventory.SWItem;
+import de.steamwar.velocitycore.network.NetworkSender;
+import de.steamwar.velocitycore.util.BauLock;
+import de.steamwar.velocitycore.util.BauLockState;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -34,12 +33,12 @@ import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.network.packets.server.BaumemberUpdatePacket;
+import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 
 import java.util.Collection;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 public class BauCommand extends SWCommand {
 
@@ -110,7 +109,7 @@ public class BauCommand extends SWCommand {
 
     @Register("info")
     public void info(PlayerChatter sender) {
-        Chat19.chat(sender.getPlayer(), "/bauinfo");
+        sender.getPlayer().spoofChatInput("/bauinfo");
     }
 
     @Register("setspectator")

src/de/steamwar/velocitycore/commands/BugCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.sql.SWException;
 import de.steamwar.command.SWCommand;

src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java

@@ -17,12 +17,12 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.ArenaMode;
-import de.steamwar.bungeecore.ServerStarter;
-import de.steamwar.bungeecore.ServerVersion;
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.velocitycore.ServerStarter;
+import de.steamwar.velocitycore.ServerVersion;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -36,7 +36,6 @@ import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.stream.Collectors;
 
 public class BuilderCloudCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/ChallengeCommand.java

@@ -17,13 +17,13 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.ArenaMode;
-import de.steamwar.bungeecore.ServerStarter;
-import de.steamwar.bungeecore.Servertype;
-import de.steamwar.bungeecore.Subserver;
+import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.velocitycore.ServerStarter;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.messages.Chatter;
@@ -34,7 +34,7 @@ import net.kyori.adventure.text.event.ClickEvent;
 
 import java.util.LinkedList;
 
-import static de.steamwar.bungeecore.Storage.challenges;
+import static de.steamwar.persistent.Storage.challenges;
 
 public class ChallengeCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/CheckCommand.java

@@ -17,14 +17,14 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.ArenaMode;
-import de.steamwar.bungeecore.Bauserver;
-import de.steamwar.bungeecore.ServerStarter;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.util.DiscordAlert;
+import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.persistent.Bauserver;
+import de.steamwar.velocitycore.ServerStarter;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.util.DiscordAlert;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;

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

@@ -17,11 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerInfo;
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;

src/de/steamwar/velocitycore/commands/EventCommand.java

@@ -17,11 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.EventStarter;
-import de.steamwar.bungeecore.Subserver;
-import de.steamwar.bungeecore.SubserverSystem;
+import de.steamwar.velocitycore.EventStarter;
+import de.steamwar.persistent.Subserver;
+import de.steamwar.velocitycore.SubserverSystem;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/EventreloadCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/FightCommand.java

@@ -17,16 +17,19 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.*;
-import de.steamwar.bungeecore.inventory.SWInventory;
-import de.steamwar.bungeecore.inventory.SWItem;
+import de.steamwar.velocitycore.*;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
+import de.steamwar.persistent.Arenaserver;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;

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

@@ -17,9 +17,9 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;

src/de/steamwar/velocitycore/commands/HelpCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/HistoricCommand.java

@@ -17,10 +17,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.ArenaMode;
-import de.steamwar.bungeecore.ServerStarter;
+import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;

src/de/steamwar/velocitycore/commands/IgnoreCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/JoinmeCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/KickCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;

src/de/steamwar/velocitycore/commands/ListCommand.java

@@ -17,13 +17,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
-import de.steamwar.bungeecore.Servertype;
-import de.steamwar.bungeecore.Subserver;
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 

src/de/steamwar/velocitycore/commands/LocalCommand.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.listeners.ChatListener;
+import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;
 

src/de/steamwar/velocitycore/commands/ModCommand.java

@@ -17,12 +17,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.inventory.SWInventory;
-import de.steamwar.bungeecore.inventory.SWItem;
-import de.steamwar.bungeecore.inventory.SWListInv;
-import de.steamwar.bungeecore.inventory.SWStreamInv;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.inventory.SWItem;
+import de.steamwar.velocitycore.inventory.SWListInv;
+import de.steamwar.velocitycore.inventory.SWStreamInv;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
@@ -34,7 +34,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 public class ModCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/MsgCommand.java

@@ -17,17 +17,17 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.listeners.ChatListener;
+import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.IgnoreSystem;
 
-import static de.steamwar.bungeecore.Storage.lastChats;
+import static de.steamwar.persistent.Storage.lastChats;
 
 public class MsgCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/PingCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;

src/de/steamwar/velocitycore/commands/PlaytimeCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/PollCommand.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.listeners.PollSystem;
+import de.steamwar.velocitycore.listeners.PollSystem;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/PollresultCommand.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.listeners.PollSystem;
+import de.steamwar.velocitycore.listeners.PollSystem;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/PunishmentCommand.java

@@ -17,12 +17,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.google.gson.JsonParser;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.listeners.IPSanitizer;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.listeners.IPSanitizer;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;

src/de/steamwar/velocitycore/commands/RCommand.java

@@ -17,12 +17,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;
 
-import static de.steamwar.bungeecore.Storage.lastChats;
+import static de.steamwar.persistent.Storage.lastChats;
 
 public class RCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/RankCommand.java

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.ArenaMode;
+import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.messages.Message;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/ReplayCommand.java

@@ -17,21 +17,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.ArenaMode;
+import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.messages.Message;
-import de.steamwar.bungeecore.ServerStarter;
-import de.steamwar.bungeecore.inventory.SWItem;
-import de.steamwar.bungeecore.inventory.SWListInv;
-import de.steamwar.bungeecore.inventory.SWStreamInv;
+import de.steamwar.velocitycore.ServerStarter;
+import de.steamwar.velocitycore.inventory.SWItem;
+import de.steamwar.velocitycore.inventory.SWListInv;
+import de.steamwar.velocitycore.inventory.SWStreamInv;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.*;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class ReplayCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/RulesCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java

@@ -17,10 +17,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;
 

src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.listeners.ChatListener;
+import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;

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

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.network.NetworkSender;
+import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.server.LocaleInvalidationPacket;

src/de/steamwar/velocitycore/commands/StatCommand.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.Node;
+import de.steamwar.velocitycore.Node;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;

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

@@ -17,15 +17,15 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.ConnectionRequestBuilder;
 import com.velocitypowered.api.proxy.server.ServerInfo;
-import de.steamwar.bungeecore.Storage;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.inventory.SWItem;
-import de.steamwar.bungeecore.inventory.SWListInv;
+import de.steamwar.persistent.Storage;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.inventory.SWItem;
+import de.steamwar.velocitycore.inventory.SWListInv;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -46,7 +46,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static de.steamwar.bungeecore.Storage.teamInvitations;
+import static de.steamwar.persistent.Storage.teamInvitations;
 
 public class TeamCommand extends SWCommand {
 

src/de/steamwar/velocitycore/commands/TeamchatCommand.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.listeners.ChatListener;
+import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;

src/de/steamwar/velocitycore/commands/TpCommand.java

@@ -17,19 +17,21 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.bungeecore.*;
-import de.steamwar.bungeecore.util.BauLock;
-import de.steamwar.bungeecore.util.Chat19;
+import de.steamwar.velocitycore.*;
+import de.steamwar.velocitycore.util.BauLock;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
+import de.steamwar.persistent.Bauserver;
+import de.steamwar.persistent.Storage;
+import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.*;
 
 import java.util.ArrayList;
@@ -56,9 +58,9 @@ public class TpCommand extends SWCommand {
         Player p = sender.getPlayer();
         if (server == null || server.getPlayersConnected().contains(p)) {
             if (rest.length == 0) {
-                Chat19.chat(p, "/tp " + to);
+                p.spoofChatInput("/tp " + to);
             } else {
-                Chat19.chat(p, "/tp " + to + " " + String.join(" ", rest));
+                p.spoofChatInput("/tp " + to + " " + String.join(" ", rest));
             }
             return;
         }

src/de/steamwar/velocitycore/commands/TutorialCommand.java

@@ -17,19 +17,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.*;
-import de.steamwar.bungeecore.inventory.SWInventory;
-import de.steamwar.bungeecore.inventory.SWItem;
-import de.steamwar.bungeecore.inventory.SWListInv;
-import de.steamwar.bungeecore.inventory.SWStreamInv;
-import de.steamwar.bungeecore.util.Chat19;
+import de.steamwar.velocitycore.*;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.inventory.SWItem;
+import de.steamwar.velocitycore.inventory.SWListInv;
+import de.steamwar.velocitycore.inventory.SWStreamInv;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Tutorial;
 import de.steamwar.sql.UserPerm;
@@ -37,7 +38,6 @@ import de.steamwar.sql.UserPerm;
 import java.io.File;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 public class TutorialCommand extends SWCommand {
 
@@ -52,14 +52,14 @@ public class TutorialCommand extends SWCommand {
 
     @Register("rate")
     public void rate(PlayerChatter sender) {
-        Chat19.chat(sender.getPlayer(), "/tutorial rate");
+        sender.getPlayer().spoofChatInput("/tutorial rate");
     }
 
     @Register("rate")
     public void rate(PlayerChatter sender, int id) {
         Tutorial tutorial = Tutorial.get(id);
         if(tutorial == null) {
-            Chat19.chat(sender.getPlayer(), "/tutorial rate");  // Catch players manually entering numbers
+            sender.getPlayer().spoofChatInput("/tutorial rate");  // Catch players manually entering numbers
             return;
         }
 

src/de/steamwar/velocitycore/commands/TypeMappers.java

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.ArenaMode;
+import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;

src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/VerifyCommand.java

@@ -17,10 +17,10 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.util.AuthManager;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.util.AuthManager;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import net.dv8tion.jda.api.entities.User;

src/de/steamwar/velocitycore/commands/WebpasswordCommand.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;

src/de/steamwar/velocitycore/commands/WhoisCommand.java

@@ -17,12 +17,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.commands;
+package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.Storage;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.mods.ModUtils;
+import de.steamwar.persistent.Storage;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.mods.ModUtils;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;

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

@@ -17,15 +17,15 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord;
+package de.steamwar.velocitycore.discord;
 
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.channels.*;
-import de.steamwar.bungeecore.discord.listeners.ChannelListener;
-import de.steamwar.bungeecore.discord.listeners.DiscordSchemUpload;
-import de.steamwar.bungeecore.discord.listeners.DiscordTeamEvent;
-import de.steamwar.bungeecore.discord.listeners.DiscordTicketHandler;
-import de.steamwar.bungeecore.discord.util.AuthManager;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.channels.*;
+import de.steamwar.velocitycore.discord.listeners.ChannelListener;
+import de.steamwar.velocitycore.discord.listeners.DiscordSchemUpload;
+import de.steamwar.velocitycore.discord.listeners.DiscordTeamEvent;
+import de.steamwar.velocitycore.discord.listeners.DiscordTicketHandler;
+import de.steamwar.velocitycore.discord.util.AuthManager;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.Event;

src/de/steamwar/velocitycore/discord/DiscordConfig.java

@@ -17,10 +17,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord;
+package de.steamwar.velocitycore.discord;
 
-import de.steamwar.bungeecore.Config;
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.velocitycore.Config;
+import de.steamwar.velocitycore.VelocityCore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;

src/de/steamwar/velocitycore/discord/DiscordTicketType.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord;
+package de.steamwar.velocitycore.discord;
 
 import lombok.AllArgsConstructor;
 import net.dv8tion.jda.api.entities.Emoji;

src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.channels;
+package de.steamwar.velocitycore.discord.channels;
 
-import de.steamwar.bungeecore.commands.CheckCommand;
+import de.steamwar.velocitycore.commands.CheckCommand;
 import de.steamwar.sql.SteamwarUser;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.EmbedBuilder;

src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java

@@ -17,10 +17,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.channels;
+package de.steamwar.velocitycore.discord.channels;
 
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.discord.listeners.ChannelListener;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.listeners.ChannelListener;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.sql.SteamwarUser;

src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java

@@ -17,9 +17,9 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.channels;
+package de.steamwar.velocitycore.discord.channels;
 
-import de.steamwar.bungeecore.listeners.ChatListener;
+import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.sql.Punishment;

src/de/steamwar/velocitycore/discord/channels/EventChannel.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.channels;
+package de.steamwar.velocitycore.discord.channels;
 
 import de.steamwar.sql.Event;
 import de.steamwar.sql.EventFight;

src/de/steamwar/velocitycore/discord/channels/InteractionReply.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.channels;
+package de.steamwar.velocitycore.discord.channels;
 
 import net.dv8tion.jda.api.interactions.Interaction;
 import net.kyori.adventure.text.Component;

src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.channels;
+package de.steamwar.velocitycore.discord.channels;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;

src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java

@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.listeners;
+package de.steamwar.velocitycore.discord.listeners;
 
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.discord.channels.DiscordChannel;
-import de.steamwar.bungeecore.discord.channels.InteractionReply;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.channels.DiscordChannel;
+import de.steamwar.velocitycore.discord.channels.InteractionReply;
 import de.steamwar.command.SWCommand;
 import de.steamwar.sql.UserPerm;
 import lombok.Getter;

src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java

@@ -17,10 +17,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.listeners;
+package de.steamwar.velocitycore.discord.listeners;
 
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.channels.DiscordChannel;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.channels.DiscordChannel;
 import de.steamwar.sql.NodeData;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;

src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java

@@ -17,11 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.listeners;
+package de.steamwar.velocitycore.discord.listeners;
 
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.discord.channels.InteractionReply;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.channels.InteractionReply;
 import de.steamwar.sql.Event;
 import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;

src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java

@@ -17,12 +17,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.listeners;
+package de.steamwar.velocitycore.discord.listeners;
 
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.discord.DiscordTicketType;
-import de.steamwar.bungeecore.discord.channels.DiscordChannel;
-import de.steamwar.bungeecore.discord.channels.InteractionReply;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.DiscordTicketType;
+import de.steamwar.velocitycore.discord.channels.DiscordChannel;
+import de.steamwar.velocitycore.discord.channels.InteractionReply;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.messages.Message;

src/de/steamwar/velocitycore/discord/util/AuthManager.java

@@ -17,10 +17,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.util;
+package de.steamwar.velocitycore.discord.util;
 
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.discord.channels.DiscordChannel;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.discord.channels.DiscordChannel;
 import de.steamwar.sql.SteamwarUser;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.MessageBuilder;

src/de/steamwar/velocitycore/discord/util/DiscordAlert.java

@@ -17,11 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.util;
+package de.steamwar.velocitycore.discord.util;
 
 import de.steamwar.messages.Message;
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.discord.channels.DiscordChannel;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.channels.DiscordChannel;
 import de.steamwar.messages.Chatter;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.EmbedBuilder;

src/de/steamwar/velocitycore/discord/util/DiscordRanks.java

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.discord.util;
+package de.steamwar.velocitycore.discord.util;
 
-import de.steamwar.bungeecore.discord.DiscordBot;
+import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import lombok.experimental.UtilityClass;

src/de/steamwar/velocitycore/inventory/InvCallback.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.inventory;
+package de.steamwar.velocitycore.inventory;
 
 public interface InvCallback {
 

src/de/steamwar/velocitycore/inventory/SWInventory.java

@@ -17,11 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.inventory;
+package de.steamwar.velocitycore.inventory;
 
 import de.steamwar.messages.Message;
-import de.steamwar.bungeecore.network.NetworkSender;
-import de.steamwar.bungeecore.network.handlers.InventoryCallbackHandler;
+import de.steamwar.velocitycore.network.NetworkSender;
+import de.steamwar.velocitycore.network.handlers.InventoryCallbackHandler;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.network.packets.server.CloseInventoryPacket;

src/de/steamwar/velocitycore/inventory/SWItem.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.inventory;
+package de.steamwar.velocitycore.inventory;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;

src/de/steamwar/velocitycore/inventory/SWListInv.java

@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.inventory;
+package de.steamwar.velocitycore.inventory;
 
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;

src/de/steamwar/velocitycore/inventory/SWStreamInv.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bungeecore.inventory;
+package de.steamwar.velocitycore.inventory;
 
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;

src/de/steamwar/velocitycore/listeners/BanListener.java

@@ -17,13 +17,13 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.listeners;
+package de.steamwar.velocitycore.listeners;
 
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.LoginEvent;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.commands.PunishmentCommand;
-import de.steamwar.bungeecore.commands.WebpasswordCommand;
+import de.steamwar.velocitycore.commands.PunishmentCommand;
+import de.steamwar.velocitycore.commands.WebpasswordCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.sql.BannedUserIPs;

src/de/steamwar/velocitycore/listeners/BasicListener.java

@@ -17,9 +17,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.listeners;
+package de.steamwar.velocitycore.listeners;
 
-import de.steamwar.bungeecore.VelocityCore;
+import de.steamwar.velocitycore.VelocityCore;
 
 public abstract class BasicListener {
 

src/de/steamwar/velocitycore/listeners/ChatListener.java

@@ -17,20 +17,19 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.listeners;
+package de.steamwar.velocitycore.listeners;
 
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.player.PlayerChatEvent;
 import com.velocitypowered.api.event.player.TabCompleteEvent;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.ArenaMode;
-import de.steamwar.bungeecore.VelocityCore;
-import de.steamwar.bungeecore.Servertype;
-import de.steamwar.bungeecore.Subserver;
-import de.steamwar.bungeecore.commands.PunishmentCommand;
-import de.steamwar.bungeecore.discord.DiscordBot;
-import de.steamwar.bungeecore.network.NetworkSender;
-import de.steamwar.bungeecore.util.Chat19;
+import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.commands.PunishmentCommand;
+import de.steamwar.velocitycore.discord.DiscordBot;
+import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.messages.Message;
@@ -86,7 +85,7 @@ public class ChatListener extends BasicListener {
             if(filteredCommand(Chatter.of(player), message))
                 return true;
 
-            Chat19.chat(player, message);
+            player.spoofChatInput(message);
         }
 
         return isCommand;
@@ -108,8 +107,6 @@ public class ChatListener extends BasicListener {
 
         }
 
-        chatToReciever(Chatter.console(), msgReceiver, user, format, coloredMessage);
-
         if(format.equals("CHAT_GLOBAL")) {
             DiscordBot.withBot(bot -> chatToReciever(bot.getIngameChat(), msgReceiver, user, format, coloredMessage));
         } else if (format.equals("CHAT_SERVERTEAM")) {
@@ -131,7 +128,7 @@ public class ChatListener extends BasicListener {
         if(!message.startsWith("/") && chatFilter(sender, message))
             return;
 
-        Chat19.chat(sender.getPlayer(), message);
+        sender.getPlayer().spoofChatInput(message);
     }
 
     private static boolean chatFilter(Chatter sender, String message) {

src/de/steamwar/velocitycore/listeners/CheckListener.java

@@ -17,17 +17,17 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package de.steamwar.bungeecore.listeners;
+package de.steamwar.velocitycore.listeners;
 
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.bungeecore.Bauserver;
-import de.steamwar.bungeecore.Servertype;
-import de.steamwar.bungeecore.Subserver;
-import de.steamwar.bungeecore.commands.CheckCommand;
+import de.steamwar.persistent.Bauserver;
+import de.steamwar.persistent.Servertype;
+import de.steamwar.persistent.Subserver;
+import de.steamwar.velocitycore.commands.CheckCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;