wip: 1.16.1

src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/blocks/BlockProperties.java

@@ -240,6 +240,10 @@ public enum BlockProperties {
     SOUTH_UP,
     EAST_UP,
     WEST_UP,
+    NORTH_LOW,
+    SOUTH_LOW,
+    EAST_LOW,
+    WEST_LOW,
     NORTH_SIDE,
     SOUTH_SIDE,
     EAST_SIDE,
@@ -248,6 +252,10 @@ public enum BlockProperties {
     SOUTH_NONE,
     EAST_NONE,
     WEST_NONE,
+    NORTH_TALL,
+    SOUTH_TALL,
+    EAST_TALL,
+    WEST_TALL,
 
     LAYERS_1,
     LAYERS_2,
@@ -379,5 +387,12 @@ public enum BlockProperties {
     HATCH_2,
 
     ENABLED,
-    DISABLED
+    DISABLED,
+
+    // respawn anchor
+    CHARGES_0,
+    CHARGES_1,
+    CHARGES_2,
+    CHARGES_3,
+    CHARGES_4
 }

src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/blocks/BlockRotation.java

@@ -40,5 +40,20 @@ public enum BlockRotation {
     ASCENDING_SOUTH,
 
     UP,
-    DOWN
+    DOWN,
+
+    // 1.16+
+
+    DOWN_EAST,
+    DOWN_WEST,
+    DOWN_NORTH,
+    DOWN_SOUTH,
+    UP_EAST,
+    EAST_UP,
+    UP_WEST,
+    WEST_UP,
+    UP_NORTH,
+    NORTH_UP,
+    UP_SOUTH,
+    SOUTH_UP,
 }

src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/blocks/Blocks.java

@@ -114,6 +114,12 @@ public class Blocks {
         }
         propertiesMapping.put("note", propertyHashMap);
 
+        propertyHashMap = new HashMap<>();
+        for (int i = 0; i <= 4; i++) {
+            propertyHashMap.put(String.valueOf(i), BlockProperties.valueOf(String.format("CHARGES_%d", i)));
+        }
+        propertiesMapping.put("charges", propertyHashMap);
+
         propertyHashMap = new HashMap<>();
         propertyHashMap.put("0", BlockProperties.STAGE_0);
         propertyHashMap.put("1", BlockProperties.STAGE_1);
@@ -122,6 +128,8 @@ public class Blocks {
         propertyHashMap = new HashMap<>();
         propertyHashMap.put("true", BlockProperties.EAST);
         propertyHashMap.put("up", BlockProperties.EAST_UP);
+        propertyHashMap.put("low", BlockProperties.EAST_LOW);
+        propertyHashMap.put("tall", BlockProperties.EAST_TALL);
         propertyHashMap.put("side", BlockProperties.EAST_SIDE);
         propertyHashMap.put("false", BlockProperties.NOT_EAST);
         propertyHashMap.put("none", BlockProperties.EAST_NONE);
@@ -130,6 +138,8 @@ public class Blocks {
         propertyHashMap = new HashMap<>();
         propertyHashMap.put("true", BlockProperties.WEST);
         propertyHashMap.put("up", BlockProperties.WEST_UP);
+        propertyHashMap.put("low", BlockProperties.WEST_LOW);
+        propertyHashMap.put("tall", BlockProperties.WEST_TALL);
         propertyHashMap.put("side", BlockProperties.WEST_SIDE);
         propertyHashMap.put("false", BlockProperties.NOT_WEST);
         propertyHashMap.put("none", BlockProperties.WEST_NONE);
@@ -138,6 +148,8 @@ public class Blocks {
         propertyHashMap = new HashMap<>();
         propertyHashMap.put("true", BlockProperties.SOUTH);
         propertyHashMap.put("up", BlockProperties.SOUTH_UP);
+        propertyHashMap.put("low", BlockProperties.SOUTH_LOW);
+        propertyHashMap.put("tall", BlockProperties.SOUTH_TALL);
         propertyHashMap.put("side", BlockProperties.SOUTH_SIDE);
         propertyHashMap.put("false", BlockProperties.NOT_SOUTH);
         propertyHashMap.put("none", BlockProperties.SOUTH_NONE);
@@ -146,6 +158,8 @@ public class Blocks {
         propertyHashMap = new HashMap<>();
         propertyHashMap.put("true", BlockProperties.NORTH);
         propertyHashMap.put("up", BlockProperties.NORTH_UP);
+        propertyHashMap.put("low", BlockProperties.NORTH_LOW);
+        propertyHashMap.put("tall", BlockProperties.NORTH_TALL);
         propertyHashMap.put("side", BlockProperties.NORTH_SIDE);
         propertyHashMap.put("false", BlockProperties.NOT_NORTH);
         propertyHashMap.put("none", BlockProperties.NORTH_NONE);
@@ -432,6 +446,18 @@ public class Blocks {
         rotationMapping.put("ascending_west", BlockRotation.ASCENDING_WEST);
         rotationMapping.put("ascending_north", BlockRotation.ASCENDING_NORTH);
         rotationMapping.put("ascending_south", BlockRotation.ASCENDING_SOUTH);
+        rotationMapping.put("down_east", BlockRotation.DOWN_EAST);
+        rotationMapping.put("down_west", BlockRotation.DOWN_WEST);
+        rotationMapping.put("down_north", BlockRotation.DOWN_NORTH);
+        rotationMapping.put("down_south", BlockRotation.DOWN_SOUTH);
+        rotationMapping.put("up_east", BlockRotation.UP_EAST);
+        rotationMapping.put("east_up", BlockRotation.EAST_UP);
+        rotationMapping.put("up_west", BlockRotation.UP_WEST);
+        rotationMapping.put("west_up", BlockRotation.WEST_UP);
+        rotationMapping.put("up_north", BlockRotation.UP_NORTH);
+        rotationMapping.put("north_up", BlockRotation.NORTH_UP);
+        rotationMapping.put("up_south", BlockRotation.UP_SOUTH);
+        rotationMapping.put("south_up", BlockRotation.SOUTH_UP);
         rotationMapping.put("north_south", BlockRotation.NORTH_SOUTH);
         rotationMapping.put("east_west", BlockRotation.EAST_WEST);
     }
@@ -471,6 +497,9 @@ public class Blocks {
                     } else if (propertiesJSON.has("rotation")) {
                         rotation = rotationMapping.get(propertiesJSON.get("rotation").getAsString());
                         propertiesJSON.remove("rotation");
+                    } else if (propertiesJSON.has("orientation")) {
+                        rotation = rotationMapping.get(propertiesJSON.get("orientation").getAsString());
+                        propertiesJSON.remove("orientation");
                     }
                     HashSet<BlockProperties> properties = new HashSet<>();
                     for (String propertyName : propertiesJSON.keySet()) {

src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersion.java

@@ -26,7 +26,8 @@ public enum ProtocolVersion {
     VERSION_1_12_2(new Protocol_1_12_2()),
     VERSION_1_13_2(new Protocol_1_13_2()),
     VERSION_1_14_4(new Protocol_1_14_4()),
-    VERSION_1_15_2(new Protocol_1_15_2());
+    VERSION_1_15_2(new Protocol_1_15_2()),
+    VERSION_1_16_1(new Protocol_1_16_1());
 
     public static final TreeMap<Integer, ProtocolVersion> versionMapping = new TreeMap<>();
 

src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_16_1.java

@@ -0,0 +1,37 @@
+/*
+ * Codename Minosoft
+ * Copyright (C) 2020 Moritz Zwerger
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ *  This software is not affiliated with Mojang AB, the original developer of Minecraft.
+ */
+
+package de.bixilon.minosoft.protocol.protocol.versions;
+
+
+import de.bixilon.minosoft.protocol.protocol.Protocol;
+
+public class Protocol_1_16_1 extends Protocol {
+
+    public Protocol_1_16_1() {
+    }
+
+    public int getProtocolVersionNumber() {
+        return 736;
+    }
+
+    @Override
+    public String getVersionString() {
+        return "1.16.1";
+    }
+
+    @Override
+    public String getReleaseName() {
+        return "Nether";
+    }
+}