Add back education support

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

Hide file tree

Showing 2 changed files with 54 additions and 16 deletions.
diff --git a/geyser-reversion/pom.xml b/geyser-reversion/pom.xml
@@ -74,6 +74,26 @@
             <version>${reversion.version}</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- Protocol Stuff -->
+        <dependency>
+            <groupId>com.nukkitx.protocol</groupId>
+            <artifactId>education-v390</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nukkitx.protocol</groupId>
+            <artifactId>bedrock-v409</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nukkitx.protocol</groupId>
+            <artifactId>bedrock-v411</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -90,20 +110,36 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>au.com.grieve.reversion:*</include>
+                                    <include>com.nukkitx.protocol:education-v390</include>
+                                    <include>com.nukkitx.protocol:bedrock-v409</include>
+                                    <include>com.nukkitx.protocol:bedrock-v411</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
                     </execution>
                 </executions>
                 <configuration>
-                    <!--                <relocations>-->
-                    <!--                    <relocation>-->
-                    <!--                        <pattern>com.nukkitx.protocol.bedrock.v363</pattern>-->
-                    <!--                        <shadedPattern>${project.groupId}.${project.artifactId}.v363</shadedPattern>-->
-                    <!--                    </relocation>-->
-                    <!--                </relocations>-->
-                    <artifactSet>
-                        <excludes>
-                            <exclude>it.unimi.dsi.fastutil:*</exclude>
-                        </excludes>
-                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.nukkitx.protocol.education.v390</pattern>
+                            <shadedPattern>${project.groupId}.${project.artifactId}.nukkitx.protocol.education.v390
+                            </shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.nukkitx.protocol.bedrock.v409</pattern>
+                            <shadedPattern>${project.groupId}.${project.artifactId}.nukkitx.protocol.bedrock.v409
+                            </shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.nukkitx.protocol.bedrock.v411</pattern>
+                            <shadedPattern>${project.groupId}.${project.artifactId}.nukkitx.protocol.bedrock.v411
+                            </shadedPattern>
+                        </relocation>
+                    </relocations>
                 </configuration>
             </plugin>
         </plugins>

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,13 +19,16 @@
 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.api.ReversionServer;
+import au.com.grieve.reversion.editions.education.EducationReversionServer;
 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;
@@ -54,10 +57,9 @@ public void onGeyserStart(GeyserStartEvent event) {
 
     @Override
     public ReversionServer createReversionServer(InetSocketAddress address) {
-        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;
+        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;
     }
 }