From c25d223e329cd3fae946d9e3fea72d7714514b67 Mon Sep 17 00:00:00 2001 From: Finn Date: Sat, 13 Dec 2025 16:48:28 +0100 Subject: [PATCH] Bug fixes --- dependency-reduced-pom.xml | 121 ++++++++++++++++++ pom.xml | 2 +- .../insserver/DatabaseINSServer.java | 2 - .../insserver/Main.java | 9 +- 4 files changed, 128 insertions(+), 6 deletions(-) create mode 100644 dependency-reduced-pom.xml diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000..9a61201 --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + org.openautonomousconnection + INSServer + 1.0-BETA + The default INS-Server + https://open-autonomous-connection.org/ + + Issue Tracker + https://repo.open-autonomous-connection.org/open-autonomous-connection/INSServer/issues + + + + UnlegitDqrk + https://unlegitdqrk.dev/ + Open Autonomous Connection + https://open-autonomous-connection.org/ + + Owner + Head Developer + + + + Maple + https://niumaple.carrd.co/ + Open Autonomous Connection + https://open-autonomous-connection.org/ + + Owner + Head Developer + + + + + + Open Autonomous Public License (OAPL) + https://open-autonomous-connection.org/license.html + + + GNU General Public License v3.0 + https://www.gnu.org/licenses/gpl-3.0.html + Default license: Applies to all users and projects unless an explicit alternative license has been granted. + + + LPGL 3 + https://www.gnu.org/licenses/lgpl-3.0.html#license-text + + + LPGL 2.1 + https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.en#SEC1 + + + WTPL License + https://github.com/ronmamo/reflections/tree/master?tab=WTFPL-1-ov-file + + + Apache License 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + MIT License + https://opensource.org/license/mit + + + javassist + https://github.com/jboss-javassist/javassist/blob/master/License.html + + + projectlombok + https://github.com/projectlombok/lombok?tab=License-1-ov-file + + + + Open Autonomous Connection + https://open-autonomous-connection.org/ + + + + + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + org.openautonomousconnection.insserver.Main + + + + + + + + + + + + oac + https://repo.open-autonomous-connection.org/api/packages/open-autonomous-connection/maven + + + + + org.projectlombok + lombok + 1.18.38 + provided + + + + UTF-8 + 23 + 23 + + diff --git a/pom.xml b/pom.xml index ac83057..7656440 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ org.openautonomousconnection protocol - 1.0.0-BETA.5 + 1.0.0-BETA.5.1 org.projectlombok diff --git a/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java b/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java index 8b33eb9..f607f9b 100644 --- a/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java +++ b/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java @@ -56,8 +56,6 @@ public final class DatabaseINSServer extends ProtocolINSServer { configurationManager.saveProperties(); } - Main.getProtocolBridge().getProtocolSettings().port = configurationManager.getInt("db.port"); - jdbcUrl = configurationManager.getString("db.url"); jdbcUser = configurationManager.getString("db.user"); jdbcPassword = configurationManager.getString("db.password"); diff --git a/src/main/java/org/openautonomousconnection/insserver/Main.java b/src/main/java/org/openautonomousconnection/insserver/Main.java index a429d2a..037eca7 100644 --- a/src/main/java/org/openautonomousconnection/insserver/Main.java +++ b/src/main/java/org/openautonomousconnection/insserver/Main.java @@ -15,14 +15,17 @@ import java.util.Scanner; public class Main { private static final CommandPermission PERMISSION_ALL = new CommandPermission("all", 1); - private static final CommandExecutor commandExecutor = new CommandExecutor("DNS", PERMISSION_ALL) {}; + private static final CommandExecutor commandExecutor = new CommandExecutor("INS", PERMISSION_ALL) {}; private static CommandManager commandManager; @Getter private static ProtocolBridge protocolBridge; + @Getter + private static ProtocolSettings settings; + public static void main(String[] args) throws Exception { - ProtocolSettings settings = new ProtocolSettings(); + settings = new ProtocolSettings(); settings.packetHandler = new PacketHandler(); settings.eventManager = new EventManager(); settings.eventManager.registerListener(Listener.class); @@ -34,7 +37,7 @@ public class Main { while (true) { System.out.println(commandExecutor.getName() + "> "); - String line = scanner.nextLine(); + String line = scanner.next(); commandManager.execute(commandExecutor, line); }