Merge pull request #1626 from Gerrygames/dev

1.15.2-pre1 + merge master

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 2.2.1 - Spigot, Sponge, BungeeCord, Velocity
+# ViaVersion 2.2.2 - Spigot, Sponge, BungeeCord, Velocity
 [![Build Status](https://travis-ci.com/ViaVersion/ViaVersion.svg?branch=master)](https://travis-ci.com/ViaVersion/ViaVersion)
 [![Discord](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://viaversion.com/discord)
 

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3-1.15.2-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3-1.15.2-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaInjector.java

@@ -9,28 +9,43 @@ import us.myles.ViaVersion.bungee.handlers.BungeeChannelInitializer;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;
 
 public class BungeeViaInjector implements ViaInjector {
+
     @Override
     public void inject() throws Exception {
         try {
-            try {
+            Class<?> pipelineUtils = Class.forName("net.md_5.bungee.netty.PipelineUtils");
+            Field field = pipelineUtils.getDeclaredField("SERVER_CHILD");
+            field.setAccessible(true);
 
-                Class<?> pipelineUtils = Class.forName("net.md_5.bungee.netty.PipelineUtils");
+            // Remove the final modifier (unless removed by a fork)
-                Field field = pipelineUtils.getDeclaredField("SERVER_CHILD");
+            int modifiers = field.getModifiers();
-                field.setAccessible(true);
+            if (Modifier.isFinal(modifiers)) {
-                // Remove any final stuff
+                try {
-                Field modifiersField = Field.class.getDeclaredField("modifiers");
+                    Field modifiersField = Field.class.getDeclaredField("modifiers");
-                modifiersField.setAccessible(true);
+                    modifiersField.setAccessible(true);
-                modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+                    modifiersField.setInt(field, modifiers & ~Modifier.FINAL);
-
+                } catch (NoSuchFieldException e) {
-                BungeeChannelInitializer newInit = new BungeeChannelInitializer((ChannelInitializer<Channel>) field.get(null));
+                    // Java 12 compatibility *this is fine*
-                field.set(null, newInit);
+                    Method getDeclaredFields0 = Class.class.getDeclaredMethod("getDeclaredFields0", boolean.class);
-            } catch (NoSuchFieldException e) {
+                    getDeclaredFields0.setAccessible(true);
-                throw new Exception("Unable to find core component 'childHandler', please check your plugins. issue: ");
+                    Field[] fields = (Field[]) getDeclaredFields0.invoke(Field.class, false);
+                    for (Field classField : fields) {
+                        if ("modifiers".equals(classField.getName())) {
+                            classField.setAccessible(true);
+                            classField.set(field, modifiers & ~Modifier.FINAL);
+                            break;
+                        }
+                    }
+                }
             }
+
+            BungeeChannelInitializer newInit = new BungeeChannelInitializer((ChannelInitializer<Channel>) field.get(null));
+            field.set(null, newInit);
         } catch (Exception e) {
             Via.getPlatform().getLogger().severe("Unable to inject ViaVersion, please post these details on our GitHub and ensure you're using a compatible server version.");
             throw e;
@@ -62,11 +77,6 @@ public class BungeeViaInjector implements ViaInjector {
         Class<?> pipelineUtils = Class.forName("net.md_5.bungee.netty.PipelineUtils");
         Field field = pipelineUtils.getDeclaredField("SERVER_CHILD");
         field.setAccessible(true);
-        // Remove any final stuff
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
         return (ChannelInitializer<Channel>) field.get(null);
     }
 

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3-1.15.2-pre1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java

@@ -75,6 +75,7 @@ public class ProtocolRegistry {
 
         registerProtocol(new Protocol1_15To1_14_4(), Collections.singletonList(ProtocolVersion.v1_15.getId()), ProtocolVersion.v1_14_4.getId());
         registerProtocol(new Protocol1_15_1To1_15(), Collections.singletonList(ProtocolVersion.v1_15_1.getId()), ProtocolVersion.v1_15.getId());
+        registerProtocol(new Protocol1_15_1To1_15(), Collections.singletonList(ProtocolVersion.v1_15_2.getId()), ProtocolVersion.v1_15_1.getId());
     }
 
     /**

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -42,6 +42,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_14_4;
     public static final ProtocolVersion v1_15;
     public static final ProtocolVersion v1_15_1;
+    public static final ProtocolVersion v1_15_2;
     public static final ProtocolVersion unknown;
 
     private final int id;
@@ -80,6 +81,7 @@ public class ProtocolVersion {
         register(v1_14_4 = new ProtocolVersion(498, "1.14.4"));
         register(v1_15 = new ProtocolVersion(573, "1.15"));
         register(v1_15_1 = new ProtocolVersion(575, "1.15.1"));
+        register(v1_15_2 = new ProtocolVersion(576, "1.15.2"));
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }
 

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15_2to1_15_1/Protocol1_15_2To1_15_1.java

@@ -0,0 +1,15 @@
+package us.myles.ViaVersion.protocols.protocol1_15_2to1_15_1;
+
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.Protocol;
+
+public class Protocol1_15_2To1_15_1 extends Protocol {
+
+    @Override
+    protected void registerPackets() {
+    }
+
+    @Override
+    public void init(UserConnection user) {
+    }
+}

jar/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3-1.15.2-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>viaversion-jar</name>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion-parent</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.3-1.15.2-pre1</version>
     <packaging>pom</packaging>
 
     <name>viaversion-parent</name>

sponge-legacy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3-1.15.2-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sponge/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3-1.15.2-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3-1.15.2-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>