Initial v412

bundabrg · Aug 27, 2020 · f959724 · f959724
1 parent 05210fe
commit f959724
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/geyser-reversion/pom.xml b/geyser-reversion/pom.xml
@@ -56,6 +56,12 @@
             <version>${reversion.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>au.com.grieve.reversion</groupId>
+            <artifactId>translator-v412be_to_v411be</artifactId>
+            <version>${reversion.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>au.com.grieve.reversion</groupId>
             <artifactId>common</artifactId>
@@ -94,6 +100,12 @@
             <version>3.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.nukkitx.protocol</groupId>
+            <artifactId>bedrock-v412</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -117,6 +129,7 @@
                                     <include>com.nukkitx.protocol:education-v390</include>
                                     <include>com.nukkitx.protocol:bedrock-v409</include>
                                     <include>com.nukkitx.protocol:bedrock-v411</include>
+                                    <include>com.nukkitx.protocol:bedrock-v412</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
@@ -139,6 +152,11 @@
                             <shadedPattern>${project.groupId}.${project.artifactId}.nukkitx.protocol.bedrock.v411
                             </shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.nukkitx.protocol.bedrock.v412</pattern>
+                            <shadedPattern>${project.groupId}.${project.artifactId}.nukkitx.protocol.bedrock.v412
+                            </shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
             </plugin>

diff --git a/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/GeyserReversionPlugin.java b/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/GeyserReversionPlugin.java
@@ -24,8 +24,10 @@
 import au.com.grieve.geyser.reversion.editions.education.EducationEdition;
 import au.com.grieve.reversion.api.RegisteredTranslator;
 import au.com.grieve.reversion.api.ReversionServer;
+import au.com.grieve.reversion.translators.v390ee_to_v408be.Register_v390ee_to_v408be;
 import au.com.grieve.reversion.translators.v409be_to_v408be.Register_v409be_to_v408be;
 import au.com.grieve.reversion.translators.v411be_to_v409be.Register_v411be_to_v409be;
+import au.com.grieve.reversion.translators.v412be_to_v411be.Register_v412be_to_v411be;
 import lombok.Getter;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.event.annotations.GeyserEventHandler;
@@ -48,6 +50,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 @Plugin(
         name = "GeyserReversion",
@@ -88,6 +91,8 @@ private void registerEditions() {
     private void registerTranslators() {
         registerTranslator(Register_v409be_to_v408be.TRANSLATOR);
         registerTranslator(Register_v411be_to_v409be.TRANSLATOR);
+        registerTranslator(Register_v390ee_to_v408be.TRANSLATOR);
+        registerTranslator(Register_v412be_to_v411be.TRANSLATOR);
     }
 
 
@@ -158,11 +163,14 @@ public void onGeyserStart(GeyserStartEvent event) {
             getLogger().error(String.format("Unable to set Edition '%s'. Plugin disabled.", config.getEdition()), e);
         }
 
-        GeyserConnector.getInstance().getBedrockServer().bind().whenComplete((avoid, throwable) -> {
-            if (throwable != null) {
-                getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.core.fail", address.getAddress().toString(), address.getPort()));
-                throwable.printStackTrace();
-            }
-        }).join();
+        // Give the old BedrockServer time to close down
+        GeyserConnector.getInstance().getGeneralThreadPool().schedule(() -> {
+            GeyserConnector.getInstance().getBedrockServer().bind().whenComplete((avoid, throwable) -> {
+                if (throwable != null) {
+                    getLogger().severe(LanguageUtils.getLocaleStringLog("geyser.core.fail", address.getAddress().toString(), address.getPort()));
+                    throwable.printStackTrace();
+                }
+            }).join();
+        }, 1, TimeUnit.SECONDS);
     }
 }