Fix wooden slabs (GeyserMC#4489)

* Fix wooden slabs Signed-off-by: Joshua Castle <[email protected]> * Update submodule Signed-off-by: Joshua Castle <[email protected]> * Also indicate 1.20.71 support Signed-off-by: Joshua Castle <[email protected]> --------- Signed-off-by: Joshua Castle <[email protected]>
Kas-tle · Mar 13, 2024 · 7e4d97f · 7e4d97f
1 parent 1df63c6
commit 7e4d97f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
-### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.70 and Minecraft Java 1.20.4
+### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.71 and Minecraft Java 1.20.4
 
 ## Setting Up
 Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.

diff --git a/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java b/core/src/main/java/org/geysermc/geyser/network/GameProtocol.java
@@ -72,7 +72,7 @@ public final class GameProtocol {
             .minecraftVersion("1.20.60/1.20.62")
             .build());
         SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC.toBuilder()
-            .minecraftVersion("1.20.70")
+            .minecraftVersion("1.20.70/1.20.71")
             .build());
     }
 

diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/Conversion662_649.java b/core/src/main/java/org/geysermc/geyser/registry/populator/Conversion662_649.java
@@ -67,6 +67,17 @@ static GeyserMappingItem remapItem(@SuppressWarnings("unused") Item item, Geyser
             }
         }
 
+        if (NEW_SLABS.contains(identifer)) {
+            switch (identifer) {
+                case "minecraft:oak_slab" -> { return mapping.withBedrockIdentifier("minecraft:wooden_slab").withBedrockData(0); }
+                case "minecraft:spruce_slab" -> { return mapping.withBedrockIdentifier("minecraft:wooden_slab").withBedrockData(1); }
+                case "minecraft:birch_slab" -> { return mapping.withBedrockIdentifier("minecraft:wooden_slab").withBedrockData(2); }
+                case "minecraft:jungle_slab" -> { return mapping.withBedrockIdentifier("minecraft:wooden_slab").withBedrockData(3); }
+                case "minecraft:acacia_slab" -> { return mapping.withBedrockIdentifier("minecraft:wooden_slab").withBedrockData(4); }
+                case "minecraft:dark_oak_slab" -> { return mapping.withBedrockIdentifier("minecraft:wooden_slab").withBedrockData(5); }
+            }
+        }
+
         if (NEW_LEAVES.contains(identifer) || NEW_LEAVES2.contains(identifer)) {
             switch (identifer) {
                 case "minecraft:oak_leaves" -> { return mapping.withBedrockIdentifier("minecraft:leaves").withBedrockData(0); }

diff --git a/core/src/main/resources/mappings b/core/src/main/resources/mappings