checkpoint before isolation

bundabrg · Sep 17, 2020 · 46ccf28 · 46ccf28
1 parent c3bae9a
commit 46ccf28
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 139 deletions.
diff --git a/geyser-reversion/pom.xml b/geyser-reversion/pom.xml
@@ -105,19 +105,9 @@
                             </artifactSet>
                             <relocations>
                                 <relocation>
-                                    <pattern>com.nukkitx.protocol.bedrock</pattern>
-                                    <shadedPattern>au.com.grieve.geyser.reversion.shaded.nukkitx.protocol.bedrock
+                                    <pattern>com.nukkitx.protocol</pattern>
+                                    <shadedPattern>au.com.grieve.geyser.reversion.shaded.nukkitx.protocol
                                     </shadedPattern>
-                                    <excludes>
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockServer</exclude>-->
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockServerSession</exclude>-->
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockServerEventHandler</exclude>-->
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockPong</exclude>-->
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockWrapperSerializer</exclude>-->
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockPacketCodec$1</exclude>-->
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockPacketCodec$Builder</exclude>-->
-                                        <!--                                        <exclude>com.nukkitx.protocol.bedrock.BedrockPacketHelper</exclude>-->
-                                    </excludes>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/GeyserReversionExtension.java b/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/GeyserReversionExtension.java
@@ -67,6 +67,8 @@ public class GeyserReversionExtension extends GeyserExtension {
     private final Map<String, Edition> registeredEditions = new HashMap<>();
     private final List<RegisteredTranslator> registeredTranslators = new ArrayList<>();
 
+    private ReversionServer server;
+
     private Configuration config;
 
     public GeyserReversionExtension(ExtensionManager extensionManager, ExtensionClassLoader extensionClassLoader) {
@@ -137,7 +139,7 @@ private void loadConfig() {
     /**
      * Replace Geyser BedrockServer with one provided by an edition
      */
-    @GeyserEventHandler(priority = EventHandler.PRIORITY.HIGH)
+    @GeyserEventHandler(priority = EventHandler.PRIORITY.LOW)
     public void onGeyserStart(GeyserStartEvent event) {
         Edition edition = registeredEditions.get(config.getEdition());
 
@@ -148,22 +150,23 @@ public void onGeyserStart(GeyserStartEvent event) {
 
         InetSocketAddress address = GeyserConnector.getInstance().getBedrockServer().getBindAddress();
 
+        // Create a new server on the same address/port as the default server
+        server = edition.createReversionServer(GeyserConnector.getInstance().getBedrockServer().getBindAddress());
+
         try {
             Field bedrockServer = GeyserConnector.class.getDeclaredField("bedrockServer");
             bedrockServer.setAccessible(true);
 
-            ReversionServer server = edition.createReversionServer(GeyserConnector.getInstance().getBedrockServer().getBindAddress());
-
             GeyserConnector.getInstance().getBedrockServer().close();
-            bedrockServer.set(GeyserConnector.getInstance(), server);
+//            bedrockServer.set(GeyserConnector.getInstance(), server);
 
-        } catch (NoSuchFieldException | IllegalAccessException e) {
+        } catch (NoSuchFieldException e) {
             getLogger().error(String.format("Unable to set Edition '%s'. Extension disabled.", config.getEdition()), e);
         }
 
-        // Give the old BedrockServer time to close down
+        // Give the old BedrockServer time to close down then bind our default server
         GeyserConnector.getInstance().getGeneralThreadPool().schedule(() -> {
-            GeyserConnector.getInstance().getBedrockServer().bind().whenComplete((avoid, throwable) -> {
+            server.bind().whenComplete((avoid, throwable) -> {
                 if (throwable != null) {
                     getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.core.fail", address.getAddress().toString(), address.getPort()));
                     throwable.printStackTrace();

diff --git a/...version/src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/BedrockEdition.java b/...version/src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/BedrockEdition.java
@@ -24,12 +24,11 @@
 import au.com.grieve.reversion.api.RegisteredTranslator;
 import au.com.grieve.reversion.api.ReversionServer;
 import au.com.grieve.reversion.editions.bedrock.BedrockRegisteredTranslator;
+import au.com.grieve.reversion.editions.bedrock.BedrockReversionServer;
 import lombok.RequiredArgsConstructor;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.BedrockProtocol;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 
 @RequiredArgsConstructor
@@ -40,16 +39,7 @@ public class BedrockEdition implements Edition {
     public ReversionServer createReversionServer(InetSocketAddress address) {
         extension.getLogger().info("BedrockServer listening on " + address.toString());
 
-        int version = 0;
-        try {
-            Object toCodec = BedrockProtocol.SUPPORTED_BEDROCK_CODECS.get(BedrockProtocol.SUPPORTED_BEDROCK_CODECS.size() - 1);
-            Method getProtocolVersion = toCodec.getClass().getMethod("getProtocolVersion");
-            version = (int) getProtocolVersion.invoke(toCodec);
-        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-
-        GeyserReversionServer server = new GeyserReversionServer("bedrock", version, address);
+        BedrockReversionServer server = new BedrockReversionServer(BedrockProtocol.DEFAULT_BEDROCK_CODEC, address);
         server.setHandler(new BedrockServerEventHandler(GeyserConnector.getInstance()));
 
         for (RegisteredTranslator translator : extension.getRegisteredTranslators()) {

diff --git a/.../src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/GeyserReversionServer.java b/.../src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/GeyserReversionServer.java
diff --git a/...src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/GeyserReversionSession.java b/...src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/GeyserReversionSession.java
diff --git a/...ion/src/main/java/au/com/grieve/geyser/reversion/editions/education/EducationEdition.java b/...ion/src/main/java/au/com/grieve/geyser/reversion/editions/education/EducationEdition.java
@@ -60,7 +60,7 @@ public void onGeyserStart(GeyserStartEvent event) {
     @Override
     public ReversionServer createReversionServer(InetSocketAddress address) {
         extension.getLogger().info("EducationServer listening on " + address.toString());
-        EducationReversionServer server = new EducationReversionServer("geyser-bedrock", BedrockProtocol.DEFAULT_BEDROCK_CODEC, tokenManager, address);
+        EducationReversionServer server = new EducationReversionServer(BedrockProtocol.DEFAULT_BEDROCK_CODEC, tokenManager, address);
         server.setHandler(new BedrockServerEventHandler(GeyserConnector.getInstance()));
 
         for (RegisteredTranslator translator : extension.getRegisteredTranslators()) {