include cubesideutilscore

Brokkonaut · Sep 20, 2023 · d539aa2 · d539aa2
1 parent 0685058
commit d539aa2
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 166 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.cubeside</groupId>
     <artifactId>globalconnectionserver</artifactId>
@@ -62,6 +64,17 @@
             <artifactId>mariadb-java-client</artifactId>
             <version>3.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>de.iani.cubeside</groupId>
+            <artifactId>CubesideUtilsCore</artifactId>
+            <version>1.16-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -92,13 +105,16 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>de.cubeside.globalserver.GlobalServer</mainClass>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>
+                                        de.cubeside.globalserver.GlobalServer</mainClass>
                                     <manifestEntries>
                                         <Multi-Release>true</Multi-Release>
                                     </manifestEntries>
                                 </transformer>
-                                <transformer implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"></transformer>
+                                <transformer
+                                    implementation="io.github.edwgiz.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"></transformer>
                             </transformers>
                         </configuration>
                     </execution>

diff --git a/src/main/java/de/cubeside/globalserver/ArgsParser.java b/src/main/java/de/cubeside/globalserver/ArgsParser.java
diff --git a/src/main/java/de/cubeside/globalserver/GlobalServer.java b/src/main/java/de/cubeside/globalserver/GlobalServer.java
@@ -25,6 +25,7 @@
 import de.cubeside.globalserver.plugin.PluginLoadException;
 import de.cubeside.globalserver.plugin.PluginManager;
 import de.cubeside.globalserver.plugin.PluginManagerWrapper;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;

diff --git a/src/main/java/de/cubeside/globalserver/JLineConsole.java b/src/main/java/de/cubeside/globalserver/JLineConsole.java
@@ -1,5 +1,6 @@
 package de.cubeside.globalserver;
 
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;

diff --git a/src/main/java/de/cubeside/globalserver/ServerCommand.java b/src/main/java/de/cubeside/globalserver/ServerCommand.java
@@ -1,5 +1,6 @@
 package de.cubeside.globalserver;
 
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.Collection;
 
 public abstract class ServerCommand {

diff --git a/src/main/java/de/cubeside/globalserver/command/AccountAddAllowedChannelCommand.java b/src/main/java/de/cubeside/globalserver/command/AccountAddAllowedChannelCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConfig;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 import java.util.Collection;
 

diff --git a/src/main/java/de/cubeside/globalserver/command/AccountInfoCommand.java b/src/main/java/de/cubeside/globalserver/command/AccountInfoCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConfig;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 import java.util.Collection;
 

diff --git a/src/main/java/de/cubeside/globalserver/command/AccountRemoveAllowedChannelCommand.java b/src/main/java/de/cubeside/globalserver/command/AccountRemoveAllowedChannelCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConfig;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 import java.util.Collection;
 

diff --git a/src/main/java/de/cubeside/globalserver/command/AccountSetPasswordCommand.java b/src/main/java/de/cubeside/globalserver/command/AccountSetPasswordCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConfig;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 import java.util.Collection;
 

diff --git a/src/main/java/de/cubeside/globalserver/command/AccountSetRestrictedCommand.java b/src/main/java/de/cubeside/globalserver/command/AccountSetRestrictedCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConfig;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/src/main/java/de/cubeside/globalserver/command/AccountsCommand.java b/src/main/java/de/cubeside/globalserver/command/AccountsCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConfig;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 
 public class AccountsCommand extends ServerCommand {

diff --git a/src/main/java/de/cubeside/globalserver/command/CreateAccountCommand.java b/src/main/java/de/cubeside/globalserver/command/CreateAccountCommand.java
@@ -1,8 +1,8 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.security.SecureRandom;
 
 public class CreateAccountCommand extends ServerCommand {

diff --git a/src/main/java/de/cubeside/globalserver/command/HelpCommand.java b/src/main/java/de/cubeside/globalserver/command/HelpCommand.java
@@ -1,8 +1,8 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.Collection;
 
 public class HelpCommand extends ServerCommand {

diff --git a/src/main/java/de/cubeside/globalserver/command/ListCommand.java b/src/main/java/de/cubeside/globalserver/command/ListCommand.java
@@ -1,10 +1,10 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConnection;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.OnlinePlayer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.List;
 
 public class ListCommand extends ServerCommand {

diff --git a/src/main/java/de/cubeside/globalserver/command/PluginsCommand.java b/src/main/java/de/cubeside/globalserver/command/PluginsCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
 import de.cubeside.globalserver.plugin.Plugin;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 
 public class PluginsCommand extends ServerCommand {

diff --git a/src/main/java/de/cubeside/globalserver/command/ServersCommand.java b/src/main/java/de/cubeside/globalserver/command/ServersCommand.java
@@ -1,9 +1,9 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.ClientConnection;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/main/java/de/cubeside/globalserver/command/StopCommand.java b/src/main/java/de/cubeside/globalserver/command/StopCommand.java
@@ -1,8 +1,8 @@
 package de.cubeside.globalserver.command;
 
-import de.cubeside.globalserver.ArgsParser;
 import de.cubeside.globalserver.GlobalServer;
 import de.cubeside.globalserver.ServerCommand;
+import de.iani.cubesideutils.commands.ArgsParser;
 
 public class StopCommand extends ServerCommand {
     public StopCommand() {