Use new Reversion

bundabrg · Aug 26, 2020 · 2060169 · 2060169
1 parent 34c6bc2
commit 2060169
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 40 deletions.
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
@@ -22,12 +22,10 @@
 import au.com.grieve.geyser.reversion.config.Configuration;
 import au.com.grieve.geyser.reversion.editions.bedrock.BedrockEdition;
 import au.com.grieve.geyser.reversion.editions.education.EducationEdition;
-import au.com.grieve.reversion.ReversionServer;
-import au.com.grieve.reversion.api.BaseTranslator;
-import au.com.grieve.reversion.api.TranslatorException;
-import au.com.grieve.reversion.translators.v390ee_to_v408be.Translator_v390ee_to_v408be;
-import au.com.grieve.reversion.translators.v409be_to_v408be.Translator_v409be_to_v408be;
-import au.com.grieve.reversion.translators.v411be_to_v409be.Translator_v411be_to_v409be;
+import au.com.grieve.reversion.api.RegisteredTranslator;
+import au.com.grieve.reversion.api.ReversionServer;
+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 lombok.Getter;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.event.annotations.GeyserEventHandler;
@@ -63,7 +61,7 @@ public class GeyserReversionPlugin extends GeyserPlugin {
     private static GeyserReversionPlugin instance;
 
     private final Map<String, Edition> registeredEditions = new HashMap<>();
-    private final List<Class<? extends BaseTranslator>> registeredTranslators = new ArrayList<>();
+    private final List<RegisteredTranslator> registeredTranslators = new ArrayList<>();
 
     private Configuration config;
 
@@ -88,9 +86,8 @@ private void registerEditions() {
      * Register built-in translators
      */
     private void registerTranslators() {
-        registerTranslator(Translator_v390ee_to_v408be.class);
-        registerTranslator(Translator_v409be_to_v408be.class);
-        registerTranslator(Translator_v411be_to_v409be.class);
+        registerTranslator(Register_v409be_to_v408be.TRANSLATOR);
+        registerTranslator(Register_v411be_to_v409be.TRANSLATOR);
     }
 
 
@@ -99,15 +96,13 @@ private void registerTranslators() {
      */
     public void registerEdition(String name, Edition edition) {
         registeredEditions.put(name, edition);
-        getLogger().debug("Registered Edition: " + name);
     }
 
     /**
      * Register a Translator
      */
-    public void registerTranslator(Class<? extends BaseTranslator> translatorClass) {
-        registeredTranslators.add(translatorClass);
-        getLogger().debug("Registered Translator: " + translatorClass.getSimpleName());
+    public void registerTranslator(RegisteredTranslator translator) {
+        registeredTranslators.add(translator);
     }
 
     /**
@@ -151,13 +146,9 @@ public void onGeyserStart(GeyserStartEvent event) {
             bedrockServer.setAccessible(true);
 
             ReversionServer server = edition.createReversionServer(GeyserConnector.getInstance().getBedrockServer().getBindAddress());
-            for (Class<? extends BaseTranslator> translatorClass : getRegisteredTranslators()) {
-                try {
-                    server.registerTranslator(translatorClass);
-                    getLogger().debug("Registered Translator: " + translatorClass.getSimpleName());
-                } catch (TranslatorException e) {
-                    getLogger().error(String.format("Unable to register Translator: %s", translatorClass.getName()), e);
-                }
+            for (RegisteredTranslator translator : getRegisteredTranslators()) {
+                server.registerTranslator(translator);
+                getLogger().debug("Registered Translator: " + translator.getName());
             }
 
             GeyserConnector.getInstance().getBedrockServer().close();

diff --git a/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/api/Edition.java b/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/api/Edition.java
@@ -18,7 +18,8 @@
 
 package au.com.grieve.geyser.reversion.api;
 
-import au.com.grieve.reversion.ReversionServer;
+
+import au.com.grieve.reversion.api.ReversionServer;
 
 import java.net.InetSocketAddress;
 

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
@@ -20,7 +20,7 @@
 
 import au.com.grieve.geyser.reversion.api.Edition;
 import au.com.grieve.geyser.reversion.editions.bedrock.handlers.BedrockServerEventHandler;
-import au.com.grieve.reversion.ReversionServer;
+import au.com.grieve.reversion.api.ReversionServer;
 import au.com.grieve.reversion.editions.bedrock.BedrockReversionServer;
 import lombok.RequiredArgsConstructor;
 import org.geysermc.connector.GeyserConnector;

diff --git a/...a/au/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockServerEventHandler.java b/...a/au/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockServerEventHandler.java
@@ -18,7 +18,7 @@
 
 package au.com.grieve.geyser.reversion.editions.bedrock.handlers;
 
-import au.com.grieve.reversion.ReversionServerSession;
+import au.com.grieve.reversion.api.ReversionSession;
 import com.nukkitx.protocol.bedrock.BedrockServerSession;
 import lombok.Getter;
 import org.geysermc.connector.GeyserConnector;
@@ -37,6 +37,6 @@ public BedrockServerEventHandler(GeyserConnector connector) {
     @Override
     public void onSessionCreation(BedrockServerSession bedrockServerSession) {
         bedrockServerSession.setLogging(true);
-        bedrockServerSession.setPacketHandler(new BedrockUpstreamPacketHandler((ReversionServerSession) bedrockServerSession, this.connector, new GeyserSession(this.connector, bedrockServerSession)));
+        bedrockServerSession.setPacketHandler(new BedrockUpstreamPacketHandler((ReversionSession) bedrockServerSession, this.connector, new GeyserSession(this.connector, bedrockServerSession)));
     }
 }
diff --git a/...u/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java b/...u/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java
@@ -18,8 +18,9 @@
 
 package au.com.grieve.geyser.reversion.editions.bedrock.handlers;
 
-import au.com.grieve.reversion.LoginData;
-import au.com.grieve.reversion.ReversionServerSession;
+import au.com.grieve.reversion.api.LoginData;
+import au.com.grieve.reversion.api.ReversionSession;
+import au.com.grieve.reversion.exceptions.LoginException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
 import com.nukkitx.protocol.bedrock.packet.LoginPacket;
@@ -40,10 +41,10 @@
 
 @Getter
 public class BedrockUpstreamPacketHandler extends UpstreamPacketHandler {
-    private final ReversionServerSession serverSession;
+    private final ReversionSession serverSession;
     private final GeyserSession geyserSession;
 
-    public BedrockUpstreamPacketHandler(ReversionServerSession serverSession, GeyserConnector connector, GeyserSession session) {
+    public BedrockUpstreamPacketHandler(ReversionSession serverSession, GeyserConnector connector, GeyserSession session) {
         super(connector, session);
         this.serverSession = serverSession;
         this.geyserSession = session;
@@ -72,7 +73,7 @@ public boolean handle(LoginPacket loginPacket) {
             ServerToClientHandshakePacket packet = new ServerToClientHandshakePacket();
             packet.setJwt(serverSession.getLoginData().getHandshakeJwt().serialize());
             session.sendUpstreamPacketImmediately(packet);
-        } catch (LoginData.LoginException e) {
+        } catch (LoginException e) {
             session.disconnect("disconnectionScreen.internalError.cantConnect");
             session.getConnector().getLogger().error("Failed to encrypt connection", e);
         }

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
@@ -19,16 +19,13 @@
 package au.com.grieve.geyser.reversion.editions.education;
 
 import au.com.grieve.geyser.reversion.api.Edition;
-import au.com.grieve.geyser.reversion.editions.bedrock.handlers.BedrockServerEventHandler;
 import au.com.grieve.geyser.reversion.editions.education.commands.EducationCommand;
-import au.com.grieve.reversion.ReversionServer;
-import au.com.grieve.reversion.editions.education.EducationReversionServer;
+import au.com.grieve.reversion.api.ReversionServer;
 import au.com.grieve.reversion.editions.education.utils.TokenManager;
 import lombok.Getter;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.event.annotations.GeyserEventHandler;
 import org.geysermc.connector.event.events.geyser.GeyserStartEvent;
-import org.geysermc.connector.network.BedrockProtocol;
 import org.geysermc.connector.plugin.GeyserPlugin;
 
 import java.io.File;
@@ -57,9 +54,10 @@ public void onGeyserStart(GeyserStartEvent event) {
 
     @Override
     public ReversionServer createReversionServer(InetSocketAddress address) {
-        plugin.getLogger().info("EducationServer listening on " + address.toString());
-        ReversionServer server = new EducationReversionServer("bedrock", BedrockProtocol.DEFAULT_BEDROCK_CODEC, tokenManager, address);
-        server.setHandler(new BedrockServerEventHandler(GeyserConnector.getInstance()));
-        return server;
+        return null;
+//        plugin.getLogger().info("EducationServer listening on " + address.toString());
+//        ReversionServer server = new EducationReversionServer("bedrock", BedrockProtocol.DEFAULT_BEDROCK_CODEC, tokenManager, address);
+//        server.setHandler(new BedrockServerEventHandler(GeyserConnector.getInstance()));
+//        return server;
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <reversion.version>1.0.4</reversion.version>
+        <reversion.version>1.1.0-SNAPSHOT</reversion.version>
     </properties>
 
     <build>
@@ -50,7 +50,7 @@
                 <version>3.7.0</version>
 
                 <configuration>
-                    <!--                    <forceJavacCompilerUse>true</forceJavacCompilerUse>-->
+                    <!--                                        <forceJavacCompilerUse>true</forceJavacCompilerUse>-->
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>