Merge pull request #24 from Exceptionflug/1.15

1.15

README.md

@@ -20,25 +20,25 @@ This is the full portfolio of protocolize dependencies:
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-api</artifactId>
-  <version>1.4.7-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-items</artifactId>
-  <version>1.4.7-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-inventory</artifactId>
-  <version>1.4.7-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-world</artifactId>
-  <version>1.4.7-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -42,20 +42,24 @@
             <id>bungeecord-repo</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </repository>
+        <repository>
+            <id>exceptionflug</id>
+            <url>http://mvn.exceptionflug.de/repository/exceptionflug-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.13-SNAPSHOT</version>
+            <version>1.14-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-proxy</artifactId>
-            <version>1.13-SNAPSHOT</version>
+            <version>1.14-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

protocolize-api/pom.xml

@@ -48,7 +48,7 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>

protocolize-api/src/main/java/de/exceptionflug/protocolize/api/protocol/PacketRegistration.java

@@ -144,12 +144,21 @@ public boolean isWaterfall() {
 
     private void registerPacketBungeeCord(final TIntObjectMap<Object> protocols, final int protocolVersion, final int packetId, final Class<?> clazz) throws IllegalAccessException, NoSuchMethodException {
         final Object protocolData = protocols.get(protocolVersion);
-        ((TObjectIntMap<Class<?>>)protocolDataPacketMapField.get(protocolData)).put(clazz, packetId);
+        if(protocolData == null) {
+            ProxyServer.getInstance().getLogger().warning("[Protocolize] Protocol version "+protocolVersion+" is not supported on this bungeecord version. Skipping registration for that specific version.");
+            return;
+        }
+        TObjectIntMap<Class<?>> map = ((TObjectIntMap<Class<?>>)protocolDataPacketMapField.get(protocolData));
+        map.put(clazz, packetId);
         ((Constructor[])protocolDataConstructorsField.get(protocolData))[packetId] = clazz.getDeclaredConstructor();
     }
 
     private void registerPacketWaterfall(final TIntObjectMap<Object> protocols, final int protocolVersion, final int packetId, final Class<?> clazz) throws IllegalAccessException, NoSuchMethodException {
         final Object protocolData = protocols.get(protocolVersion);
+        if(protocolData == null) {
+            ProxyServer.getInstance().getLogger().warning("[Protocolize] Protocol version "+protocolVersion+" is not supported on this waterfall version. Skipping registration for that specific version.");
+            return;
+        }
         ((TObjectIntMap<Class<?>>)protocolDataPacketMapField.get(protocolData)).put(clazz, packetId);
         ((Supplier[])protocolDataConstructorsField.get(protocolData))[packetId] = () -> {
             try {

protocolize-api/src/main/java/de/exceptionflug/protocolize/api/util/ProtocolVersions.java

@@ -26,9 +26,10 @@ public final class ProtocolVersions {
     public final static int MINECRAFT_1_14_2 = 485;
     public final static int MINECRAFT_1_14_3 = 490;
     public final static int MINECRAFT_1_14_4 = 498;
+    public final static int MINECRAFT_1_15 = 573;
 
 
-    public final static int MINECRAFT_LATEST = MINECRAFT_1_14_4;
+    public final static int MINECRAFT_LATEST = MINECRAFT_1_15;
 
     private ProtocolVersions() {}
 

protocolize-examples/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
@@ -18,19 +18,19 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.4.7-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-items</artifactId>
-            <version>1.4.7-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-inventory</artifactId>
-            <version>1.4.7-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

protocolize-inventory/pom.xml

@@ -20,18 +20,18 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-inventory</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.4.7-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

protocolize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ClickWindow.java

@@ -36,6 +36,7 @@ public class ClickWindow extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_14_2, 0x09);
         MAPPING.put(MINECRAFT_1_14_3, 0x09);
         MAPPING.put(MINECRAFT_1_14_4, 0x09);
+        MAPPING.put(MINECRAFT_1_15, 0x09);
     }
 
     private int windowId, actionNumber;

protocolize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/CloseWindow.java

@@ -35,6 +35,7 @@ public class CloseWindow extends AbstractPacket {
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_2, 0x13);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_3, 0x13);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_4, 0x13);
+        MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x14);
 
         MAPPING_SERVERBOUND.put(MINECRAFT_1_8, 0x0D);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x08);
@@ -55,6 +56,7 @@ public class CloseWindow extends AbstractPacket {
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_2, 0x0A);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_3, 0x0A);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_4, 0x0A);
+        MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x0A);
     }
 
     private int windowId;

protocolize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ConfirmTransaction.java

@@ -3,7 +3,6 @@
 import com.google.common.collect.Maps;
 import de.exceptionflug.protocolize.api.protocol.AbstractPacket;
 import io.netty.buffer.ByteBuf;
-import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.protocol.ProtocolConstants.Direction;
 
 import java.util.Map;
@@ -37,6 +36,7 @@ public class ConfirmTransaction extends AbstractPacket {
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_2, 0x12);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_3, 0x12);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_4, 0x12);
+        MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x13);
 
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x05);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9_1, 0x05);
@@ -56,6 +56,7 @@ public class ConfirmTransaction extends AbstractPacket {
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_2, 0x07);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_3, 0x07);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_4, 0x07);
+        MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x07);
     }
 
     private int windowId;

protocolize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/OpenWindow.java

@@ -38,6 +38,7 @@ public class OpenWindow extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_14_2, 0x2E);
         MAPPING.put(MINECRAFT_1_14_3, 0x2E);
         MAPPING.put(MINECRAFT_1_14_4, 0x2E);
+        MAPPING.put(MINECRAFT_1_15, 0x2F);
     }
 
     private int windowId;

protocolize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/WindowProperty.java

@@ -35,6 +35,7 @@ public class WindowProperty extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_14_2, 0x15);
         MAPPING.put(MINECRAFT_1_14_3, 0x15);
         MAPPING.put(MINECRAFT_1_14_4, 0x15);
+        MAPPING.put(MINECRAFT_1_15, 0x16);
     }
 
     private int windowId;

protocolize-items/pom.xml

@@ -8,7 +8,7 @@
             <plugin>
                 <groupId>de.exceptionflug</groupId>
                 <artifactId>protocolize-protogen-plugin</artifactId>
-                <version>1.4.7-SNAPSHOT</version>
+                <version>1.5.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -33,12 +33,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-items</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/BlockPlacement.java

@@ -37,6 +37,7 @@ public class BlockPlacement extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_14_2, 0x2C);
         MAPPING.put(MINECRAFT_1_14_3, 0x2C);
         MAPPING.put(MINECRAFT_1_14_4, 0x2C);
+        MAPPING.put(MINECRAFT_1_15, 0x2C);
     }
 
     private BlockPosition position;

protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/HeldItemChange.java

@@ -35,6 +35,7 @@ public class HeldItemChange extends AbstractPacket {
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_2, 0x3F);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_3, 0x3F);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_14_4, 0x3F);
+        MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x40);
 
         MAPPING_SERVERBOUND.put(MINECRAFT_1_8, 0x09);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x17);
@@ -55,6 +56,7 @@ public class HeldItemChange extends AbstractPacket {
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_2, 0x23);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_3, 0x23);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_14_4, 0x23);
+        MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x23);
     }
 
     private short newSlot;

protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/SetSlot.java

@@ -5,7 +5,6 @@
 import de.exceptionflug.protocolize.api.protocol.AbstractPacket;
 import de.exceptionflug.protocolize.items.ItemStack;
 import io.netty.buffer.ByteBuf;
-import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.ProtocolConstants.Direction;
 
 import java.util.Map;
@@ -37,6 +36,7 @@ public class SetSlot extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_14_2, 0x16);
         MAPPING.put(MINECRAFT_1_14_3, 0x16);
         MAPPING.put(MINECRAFT_1_14_4, 0x16);
+        MAPPING.put(MINECRAFT_1_15, 0x17);
     }
 
     private byte windowId;

protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/UseItem.java

@@ -34,6 +34,7 @@ public class UseItem extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_14_2, 0x2D);
         MAPPING.put(MINECRAFT_1_14_3, 0x2D);
         MAPPING.put(MINECRAFT_1_14_4, 0x2D);
+        MAPPING.put(MINECRAFT_1_15, 0x2D);
     }
 
     private Hand hand;

protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/WindowItems.java

@@ -41,6 +41,7 @@ public class WindowItems extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_14_2, 0x14);
         MAPPING.put(MINECRAFT_1_14_3, 0x14);
         MAPPING.put(MINECRAFT_1_14_4, 0x14);
+        MAPPING.put(MINECRAFT_1_15, 0x15);
     }
 
     public WindowItems(final short windowId, final List<ItemStack> items) {