Improve bungee mode

caoli5288 · Nov 7, 2021 · 9e63550 · 9e63550
1 parent b4ea5a7
commit 9e63550
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 387 deletions.
diff --git a/bungee/src/main/java/com/github/caoli5288/playersql/bungee/Constants.java b/bungee/src/main/java/com/github/caoli5288/playersql/bungee/Constants.java
@@ -5,4 +5,5 @@ public class Constants {
     public static final boolean DEBUG = Boolean.getBoolean("psql.debug");
     public static final String PLUGIN_CHANNEL = "psql:psql";
     public static final String MAGIC_KICK = "psql:done";
+    public static final byte[] EMPTY_ARRAY = new byte[0];
 }
diff --git a/bungee/src/main/java/com/github/caoli5288/playersql/bungee/protocol/ProtocolId.java b/bungee/src/main/java/com/github/caoli5288/playersql/bungee/protocol/ProtocolId.java
@@ -1,14 +1,15 @@
 package com.github.caoli5288.playersql.bungee.protocol;
 
-import java.util.Objects;
+import org.jetbrains.annotations.NotNull;
 
 public enum ProtocolId {
 
     READY,
     CONTENTS,
     REQUEST;
 
-    public static AbstractSqlPacket ofPacket(ProtocolId id) {
+    @NotNull
+    public static AbstractSqlPacket ofPacket(@NotNull ProtocolId id) {
         switch (id) {
             case READY:
                 return new PeerReady();
@@ -17,6 +18,6 @@ public static AbstractSqlPacket ofPacket(ProtocolId id) {
             case REQUEST:
                 return new DataRequest();
         }
-        throw new IllegalStateException("unknown ProtocolId " + id);
+        throw new EnumConstantNotPresentException(ProtocolId.class, "Unknown " + id);
     }
 }
diff --git a/bungee/src/main/resources/bungee.yml b/bungee/src/main/resources/bungee.yml
@@ -1,5 +1,5 @@
-main: com.mengcraft.playersql.bungee.PlayerSqlBungee
-name: PlayerSQLPeerSupport
+main: com.github.caoli5288.playersql.bungee.PlayerSqlBungee
+name: PlayerSqlBungee
 version: ${project.version}
 website: http://www.spigotmc.org/resources/playersql.552/
 author: [email protected]
diff --git a/playersql/pom.xml b/playersql/pom.xml
@@ -39,12 +39,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>22.0.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>

diff --git a/playersql/src/main/java/com/mengcraft/playersql/Commands.java b/playersql/src/main/java/com/mengcraft/playersql/Commands.java
diff --git a/playersql/src/main/java/com/mengcraft/playersql/Config.java b/playersql/src/main/java/com/mengcraft/playersql/Config.java
@@ -14,7 +14,6 @@ public class Config {
     public static final boolean SYN_HEALTH;
     public static final boolean SYN_INVENTORY;
     public static final boolean KICK_LOAD_FAILED;
-    public static final boolean TRANSFER_ORIGIN;
     public static final boolean OMIT_PLAYER_DEATH;
     public static final boolean FORCE_PROTOCOLLIB;
 
@@ -33,7 +32,6 @@ public class Config {
         DEBUG = CONF.getBoolean("plugin.debug", false);
         OMIT_PLAYER_DEATH = CONF.getBoolean("plugin.omit-player-death", false);
         KICK_LOAD_FAILED = CONF.getBoolean("kick-load-failed", true);
-        TRANSFER_ORIGIN = CONF.getBoolean("transfer-origin", false);
         FORCE_PROTOCOLLIB = CONF.getBoolean("plugin.use-protocollib-default", false);
     }
 

diff --git a/playersql/src/main/java/com/mengcraft/playersql/DataSerializer.java b/playersql/src/main/java/com/mengcraft/playersql/DataSerializer.java
@@ -34,7 +34,7 @@ public class DataSerializer {
                     break;
             }
         }
-        System.out.println(String.format("PACKET_DATA_SERIALIZER_FACTORY = %s", PACKET_DATA_SERIALIZER_FACTORY));
+        Bukkit.getLogger().info(String.format("PACKET_DATA_SERIALIZER_FACTORY = %s", PACKET_DATA_SERIALIZER_FACTORY));
     }
 
     @SneakyThrows