changes for 1.16 and version bump to 1.6.0

Exceptionflug · Jun 22, 2020 · 2d9cbac · 2d9cbac
1 parent 91c8527
commit 2d9cbac
Show file tree

Hide file tree

Showing 31 changed files with 239 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -22,25 +22,25 @@ This is the full portfolio of protocolize dependencies:
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-api</artifactId>
-  <version>1.5.5-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-items</artifactId>
-  <version>1.5.5-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-inventory</artifactId>
-  <version>1.5.5-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 <dependency>
   <groupId>de.exceptionflug</groupId>
   <artifactId>protocolize-world</artifactId>
-  <version>1.5.5-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <scope>provided</scope>
 </dependency>
 ```

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/protocolize-api/pom.xml b/protocolize-api/pom.xml
@@ -48,7 +48,7 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>

diff --git a/protocolize-api/src/main/java/de/exceptionflug/protocolize/api/util/ProtocolVersions.java b/protocolize-api/src/main/java/de/exceptionflug/protocolize/api/util/ProtocolVersions.java
@@ -29,9 +29,10 @@ public final class ProtocolVersions {
     public final static int MINECRAFT_1_15 = 573;
     public final static int MINECRAFT_1_15_1 = 575;
     public final static int MINECRAFT_1_15_2 = 578;
+    public final static int MINECRAFT_1_16 = 735;
 
 
-    public final static int MINECRAFT_LATEST = MINECRAFT_1_15_2;
+    public final static int MINECRAFT_LATEST = MINECRAFT_1_16;
 
     private ProtocolVersions() {}
 

diff --git a/protocolize-examples/pom.xml b/protocolize-examples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
@@ -18,19 +18,19 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-items</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-inventory</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/protocolize-inventory/pom.xml b/protocolize-inventory/pom.xml
@@ -20,18 +20,18 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-inventory</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/...ze-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ClickWindow.java b/...ze-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ClickWindow.java
@@ -39,6 +39,7 @@ public class ClickWindow extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_15, 0x09);
         MAPPING.put(MINECRAFT_1_15_1, 0x09);
         MAPPING.put(MINECRAFT_1_15_2, 0x09);
+        MAPPING.put(MINECRAFT_1_16, 0x09);
     }
 
     private int windowId, actionNumber;

diff --git a/...ze-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/CloseWindow.java b/...ze-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/CloseWindow.java
@@ -38,6 +38,7 @@ public class CloseWindow extends AbstractPacket {
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x14);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_1, 0x14);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_2, 0x14);
+        MAPPING_CLIENTBOUND.put(MINECRAFT_1_16, 0x13);
 
         MAPPING_SERVERBOUND.put(MINECRAFT_1_8, 0x0D);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x08);
@@ -61,6 +62,7 @@ public class CloseWindow extends AbstractPacket {
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x0A);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15_1, 0x0A);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15_2, 0x0A);
+        MAPPING_SERVERBOUND.put(MINECRAFT_1_16, 0x0A);
     }
 
     private int windowId;

diff --git a/...ntory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ConfirmTransaction.java b/...ntory/src/main/java/de/exceptionflug/protocolize/inventory/packet/ConfirmTransaction.java
@@ -39,6 +39,7 @@ public class ConfirmTransaction extends AbstractPacket {
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x13);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_1, 0x13);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_2, 0x13);
+        MAPPING_CLIENTBOUND.put(MINECRAFT_1_16, 0x12);
 
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x05);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9_1, 0x05);
@@ -61,6 +62,7 @@ public class ConfirmTransaction extends AbstractPacket {
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x07);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15_1, 0x07);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15_2, 0x07);
+        MAPPING_SERVERBOUND.put(MINECRAFT_1_16, 0x07);
     }
 
     private int windowId;

diff --git a/...ize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/OpenWindow.java b/...ize-inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/OpenWindow.java
@@ -41,6 +41,7 @@ public class OpenWindow extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_15, 0x2F);
         MAPPING.put(MINECRAFT_1_15_1, 0x2F);
         MAPPING.put(MINECRAFT_1_15_2, 0x2F);
+        MAPPING.put(MINECRAFT_1_16, 0x2E);
     }
 
     private int windowId;

diff --git a/...inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/WindowProperty.java b/...inventory/src/main/java/de/exceptionflug/protocolize/inventory/packet/WindowProperty.java
@@ -38,6 +38,7 @@ public class WindowProperty extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_15, 0x16);
         MAPPING.put(MINECRAFT_1_15_1, 0x16);
         MAPPING.put(MINECRAFT_1_15_2, 0x16);
+        MAPPING.put(MINECRAFT_1_16, 0x15);
     }
 
     private int windowId;

diff --git a/protocolize-items/pom.xml b/protocolize-items/pom.xml
@@ -8,7 +8,7 @@
             <plugin>
                 <groupId>de.exceptionflug</groupId>
                 <artifactId>protocolize-protogen-plugin</artifactId>
-                <version>1.5.5-SNAPSHOT</version>
+                <version>1.6.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -33,12 +33,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-items</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/...ocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/BlockPlacement.java b/...ocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/BlockPlacement.java
@@ -40,6 +40,7 @@ public class BlockPlacement extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_15, 0x2C);
         MAPPING.put(MINECRAFT_1_15_1, 0x2C);
         MAPPING.put(MINECRAFT_1_15_2, 0x2C);
+        MAPPING.put(MINECRAFT_1_16, 0x2D);
     }
 
     private BlockPosition position;

diff --git a/...ocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/HeldItemChange.java b/...ocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/HeldItemChange.java
@@ -38,6 +38,7 @@ public class HeldItemChange extends AbstractPacket {
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15, 0x40);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_1, 0x40);
         MAPPING_CLIENTBOUND.put(MINECRAFT_1_15_2, 0x40);
+        MAPPING_CLIENTBOUND.put(MINECRAFT_1_16, 0x3F);
 
         MAPPING_SERVERBOUND.put(MINECRAFT_1_8, 0x09);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_9, 0x17);
@@ -61,6 +62,7 @@ public class HeldItemChange extends AbstractPacket {
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15, 0x23);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15_1, 0x23);
         MAPPING_SERVERBOUND.put(MINECRAFT_1_15_2, 0x23);
+        MAPPING_SERVERBOUND.put(MINECRAFT_1_16, 0x24);
     }
 
     private short newSlot;

diff --git a/protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/SetSlot.java b/protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/SetSlot.java
@@ -39,6 +39,7 @@ public class SetSlot extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_15, 0x17);
         MAPPING.put(MINECRAFT_1_15_1, 0x17);
         MAPPING.put(MINECRAFT_1_15_2, 0x17);
+        MAPPING.put(MINECRAFT_1_16, 0x16);
     }
 
     private byte windowId;

diff --git a/protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/UseItem.java b/protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/UseItem.java
@@ -37,6 +37,7 @@ public class UseItem extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_15, 0x2D);
         MAPPING.put(MINECRAFT_1_15_1, 0x2D);
         MAPPING.put(MINECRAFT_1_15_2, 0x2D);
+        MAPPING.put(MINECRAFT_1_16, 0x2E);
     }
 
     private Hand hand;

diff --git a/protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/WindowItems.java b/protocolize-items/src/main/java/de/exceptionflug/protocolize/items/packet/WindowItems.java
@@ -44,6 +44,7 @@ public class WindowItems extends AbstractPacket {
         MAPPING.put(MINECRAFT_1_15, 0x15);
         MAPPING.put(MINECRAFT_1_15_1, 0x15);
         MAPPING.put(MINECRAFT_1_15_2, 0x15);
+        MAPPING.put(MINECRAFT_1_16, 0x14);
     }
 
     public WindowItems(final short windowId, final List<ItemStack> items) {

diff --git a/protocolize-plugin/pom.xml b/protocolize-plugin/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-plugin</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <properties>
         <plugin.main>de.exceptionflug.protocolize.ProtocolizePlugin</plugin.main>
@@ -23,22 +23,22 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-items</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-world</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-inventory</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/protocolize-protogen/pom.xml b/protocolize-protogen/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-protogen</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/protocolize-protogen/protocolize-protogen-compiler/pom.xml b/protocolize-protogen/protocolize-protogen-compiler/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize-protogen</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-protogen-compiler</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <build>
         <plugins>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/protocolize-protogen/protocolize-protogen-plugin/pom.xml b/protocolize-protogen/protocolize-protogen-plugin/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize-protogen</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-protogen-plugin</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <build>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-protogen-compiler</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/protocolize-util/pom.xml b/protocolize-util/pom.xml
@@ -33,12 +33,12 @@
     <parent>
         <groupId>de.exceptionflug</groupId>
         <artifactId>protocolize</artifactId>
-        <version>1.5.5-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>de.exceptionflug</groupId>
     <artifactId>protocolize-util</artifactId>
-    <version>1.5.5-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -49,17 +49,17 @@
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-api</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-world</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>de.exceptionflug</groupId>
             <artifactId>protocolize-items</artifactId>
-            <version>1.5.5-SNAPSHOT</version>
+            <version>1.6.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/protocolize-util/src/main/java/de/exceptionflug/protocolize/util/NewSoundEnumGenerator.java b/protocolize-util/src/main/java/de/exceptionflug/protocolize/util/NewSoundEnumGenerator.java
@@ -33,7 +33,7 @@ public static void main(final String[] args) throws Exception {
             sb.append("\t");
             sb.append(enumConstant);
             sb.append("(");
-            sb.append("new SoundIDMapping(MINECRAFT_1_15, MINECRAFT_LATEST, \"");
+            sb.append("new SoundIDMapping(MINECRAFT_1_16, MINECRAFT_LATEST, \"");
             sb.append(element.getKey().substring(10));
             sb.append("\")");
             sb.append(")");