Merge pull request #1580 from KennyTV/dev

1.15.1-pre1

bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.2-1.15.1-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-SNAPSHOT</version>
+        <version>2.2.2-1.15.1-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/pom.xml

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

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

@@ -21,6 +21,7 @@ import us.myles.ViaVersion.protocols.protocol1_14_2to1_14_1.Protocol1_14_2To1_14
 import us.myles.ViaVersion.protocols.protocol1_14_3to1_14_2.Protocol1_14_3To1_14_2;
 import us.myles.ViaVersion.protocols.protocol1_14_4to1_14_3.Protocol1_14_4To1_14_3;
 import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
+import us.myles.ViaVersion.protocols.protocol1_15_1to1_15.Protocol1_15_1To1_15;
 import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
 import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4;
 import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1To1_9;
@@ -73,6 +74,7 @@ public class ProtocolRegistry {
         registerProtocol(new Protocol1_14_4To1_14_3(), Collections.singletonList(ProtocolVersion.v1_14_4.getId()), ProtocolVersion.v1_14_3.getId());
 
         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());
     }
 
     /**

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

@@ -41,6 +41,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_14_3;
     public static final ProtocolVersion v1_14_4;
     public static final ProtocolVersion v1_15;
+    public static final ProtocolVersion v1_15_1;
     public static final ProtocolVersion unknown;
 
     private final int id;
@@ -78,6 +79,7 @@ public class ProtocolVersion {
         register(v1_14_3 = new ProtocolVersion(490, "1.14.3"));
         register(v1_14_4 = new ProtocolVersion(498, "1.14.4"));
         register(v1_15 = new ProtocolVersion(573, "1.15"));
+        register(v1_15_1 = new ProtocolVersion(574, "1.15.1"));
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }
 

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15_1to1_15/Protocol1_15_1To1_15.java

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

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java

@@ -101,18 +101,20 @@ public class WorldPackets {
                         if (chunk.isGroundUp()) {
                             int[] biomeData = chunk.getBiomeData();
                             int[] newBiomeData = new int[1024];
-                            // Now in 4x4x4 areas - take the biome of each "middle"
+                            if (biomeData != null) {
-                            for (int i = 0; i < 4; ++i) {
+                                // Now in 4x4x4 areas - take the biome of each "middle"
-                                for (int j = 0; j < 4; ++j) {
+                                for (int i = 0; i < 4; ++i) {
-                                    int x = (j << 2) + 2;
+                                    for (int j = 0; j < 4; ++j) {
-                                    int z = (i << 2) + 2;
+                                        int x = (j << 2) + 2;
-                                    int oldIndex = (z << 4 | x);
+                                        int z = (i << 2) + 2;
-                                    newBiomeData[i << 2 | j] = biomeData[oldIndex];
+                                        int oldIndex = (z << 4 | x);
+                                        newBiomeData[i << 2 | j] = biomeData[oldIndex];
+                                    }
+                                }
+                                // ... and copy it to the new y layers
+                                for (int i = 1; i < 64; ++i) {
+                                    System.arraycopy(newBiomeData, 0, newBiomeData, i * 16, 16);
                                 }
-                            }
-                            // ... and copy it to the new y layers
-                            for (int i = 1; i < 64; ++i) {
-                                System.arraycopy(newBiomeData, 0, newBiomeData, i * 16, 16);
                             }
 
                             chunk.setBiomeData(newBiomeData);

jar/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.2.2-1.15.1-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-SNAPSHOT</version>
+    <version>2.2.2-1.15.1-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-SNAPSHOT</version>
+        <version>2.2.2-1.15.1-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-SNAPSHOT</version>
+        <version>2.2.2-1.15.1-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-SNAPSHOT</version>
+        <version>2.2.2-1.15.1-pre1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>