Reimplement support for 1.20.40

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.0 - 1.20.50 and Minecraft Java 1.20.3
+### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.50 and Minecraft Java 1.20.3
 
 ## Setting Up
 Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.

core/src/main/java/org/geysermc/geyser/network/GameProtocol.java

@@ -29,6 +29,7 @@ import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
 import com.github.steveice10.mc.protocol.codec.PacketCodec;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
+import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
 
@@ -58,11 +59,9 @@ public final class GameProtocol {
     private static final PacketCodec DEFAULT_JAVA_CODEC = MinecraftCodec.CODEC;
 
     static {
-        /*
         SUPPORTED_BEDROCK_CODECS.add(Bedrock_v622.CODEC.toBuilder()
             .minecraftVersion("1.20.40/1.20.41")
             .build());
-         */
         SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
     }
 

core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java

@@ -34,18 +34,11 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.*;
 import org.cloudburstmc.blockstateupdater.BlockStateUpdater;
-import org.cloudburstmc.blockstateupdater.BlockStateUpdater_1_20_10;
-import org.cloudburstmc.blockstateupdater.BlockStateUpdater_1_20_30;
-import org.cloudburstmc.blockstateupdater.BlockStateUpdater_1_20_40;
-import org.cloudburstmc.blockstateupdater.BlockStateUpdater_1_20_50;
 import org.cloudburstmc.blockstateupdater.util.tagupdater.CompoundTagUpdaterContext;
 import org.cloudburstmc.nbt.NBTInputStream;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.cloudburstmc.nbt.NbtType;
-import org.cloudburstmc.protocol.bedrock.codec.v589.Bedrock_v589;
-import org.cloudburstmc.protocol.bedrock.codec.v594.Bedrock_v594;
-import org.cloudburstmc.protocol.bedrock.codec.v618.Bedrock_v618;
 import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.data.BlockPropertyData;
@@ -83,7 +76,7 @@ public final class BlockRegistryPopulator {
     }
 
     @FunctionalInterface
-    private interface Remapper {
+    interface Remapper {
 
         NbtMap remap(NbtMap tag);
 
@@ -123,7 +116,7 @@ public final class BlockRegistryPopulator {
 
     private static void registerBedrockBlocks() {
         var blockMappers = ImmutableMap.<ObjectIntPair<String>, Remapper>builder()
-                //.put(ObjectIntPair.of("1_20_40", Bedrock_v622.CODEC.getProtocolVersion()), mapper622)
+                .put(ObjectIntPair.of("1_20_40", Bedrock_v622.CODEC.getProtocolVersion()), Conversion630_622::remapBlock)
                 .put(ObjectIntPair.of("1_20_50", Bedrock_v630.CODEC.getProtocolVersion()), tag -> tag)
                 .build();
 

core/src/main/java/org/geysermc/geyser/registry/populator/Conversion630_622.java

@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2019-2023 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.registry.populator;
+
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import org.cloudburstmc.nbt.NbtMap;
+import org.cloudburstmc.nbt.NbtMapBuilder;
+import org.geysermc.geyser.item.type.Item;
+import org.geysermc.geyser.registry.type.GeyserMappingItem;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Backwards-maps the blocks and items of 1.20.50 (630) to 1.20.40 (622)
+ */
+public class Conversion630_622 {
+
+    private static final List<String> NEW_STONES = List.of("minecraft:stone", "minecraft:granite", "minecraft:polished_granite", "minecraft:diorite", "minecraft:polished_diorite", "minecraft:andesite", "minecraft:polished_andesite");
+    private static final List<String> NEW_WOODS = List.of("minecraft:oak_planks", "minecraft:spruce_planks", "minecraft:birch_planks", "minecraft:jungle_planks", "minecraft:acacia_planks", "minecraft:dark_oak_planks");
+
+    private static final Map<String, String> ITEMS = new Object2ObjectOpenHashMap<>();
+
+    static {
+        ITEMS.put("minecraft:acacia_planks", "minecraft:planks");
+        ITEMS.put("minecraft:birch_planks", "minecraft:planks");
+        ITEMS.put("minecraft:dark_oak_planks", "minecraft:planks");
+        ITEMS.put("minecraft:jungle_planks", "minecraft:planks");
+        ITEMS.put("minecraft:oak_planks", "minecraft:planks");
+        ITEMS.put("minecraft:spruce_planks", "minecraft:planks");
+
+        ITEMS.put("minecraft:diorite", "minecraft:stone");
+        ITEMS.put("minecraft:andesite", "minecraft:stone");
+        ITEMS.put("minecraft:granite", "minecraft:stone");
+        ITEMS.put("minecraft:polished_andesite", "minecraft:stone");
+        ITEMS.put("minecraft:polished_diorite", "minecraft:stone");
+        ITEMS.put("minecraft:polished_granite", "minecraft:stone");
+
+        ITEMS.put("minecraft:chiseled_tuff", "minecraft:chiseled_deepslate");
+        ITEMS.put("minecraft:chiseled_tuff_bricks", "minecraft:chiseled_deepslate");
+        ITEMS.put("minecraft:polished_tuff", "minecraft:polished_deepslate");
+        ITEMS.put("minecraft:polished_tuff_double_slab", "minecraft:polished_deepslate_double_slab");
+        ITEMS.put("minecraft:polished_tuff_slab", "minecraft:polished_deepslate_slab");
+        ITEMS.put("minecraft:polished_tuff_stairs", "minecraft:polished_deepslate_stairs");
+        ITEMS.put("minecraft:polished_tuff_wall", "minecraft:polished_deepslate_wall");
+        ITEMS.put("minecraft:tuff_brick_double_slab", "minecraft:deepslate_brick_double_slab");
+        ITEMS.put("minecraft:tuff_brick_slab", "minecraft:deepslate_brick_slab");
+        ITEMS.put("minecraft:tuff_brick_stairs", "minecraft:deepslate_brick_stairs");
+        ITEMS.put("minecraft:tuff_brick_wall", "minecraft:deepslate_brick_wall");
+        ITEMS.put("minecraft:tuff_bricks", "minecraft:deepslate_bricks");
+        ITEMS.put("minecraft:tuff_double_slab", "minecraft:cobbled_deepslate_double_slab");
+        ITEMS.put("minecraft:tuff_slab", "minecraft:cobbled_deepslate_slab");
+        ITEMS.put("minecraft:tuff_stairs", "minecraft:cobbled_deepslate_stairs");
+        ITEMS.put("minecraft:tuff_wall", "minecraft:cobbled_deepslate_wall");
+
+        ITEMS.put("minecraft:chiseled_copper", "minecraft:copper_block");
+        ITEMS.put("minecraft:copper_bulb", "minecraft:copper_block");
+        ITEMS.put("minecraft:copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:copper_trapdoor", "minecraft:iron_trapdoor");
+        ITEMS.put("minecraft:exposed_chiseled_copper", "minecraft:exposed_copper");
+        ITEMS.put("minecraft:exposed_copper_bulb", "minecraft:exposed_copper");
+        ITEMS.put("minecraft:exposed_copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:exposed_copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:exposed_copper_trapdoor", "minecraft:iron_trapdoor");
+        ITEMS.put("minecraft:oxidized_chiseled_copper", "minecraft:oxidized_copper");
+        ITEMS.put("minecraft:oxidized_copper_bulb", "minecraft:oxidized_copper");
+        ITEMS.put("minecraft:oxidized_copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:oxidized_copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:oxidized_copper_trapdoor", "minecraft:iron_trapdoor");
+        ITEMS.put("minecraft:waxed_chiseled_copper", "minecraft:waxed_copper");
+        ITEMS.put("minecraft:waxed_copper_bulb", "minecraft:waxed_copper");
+        ITEMS.put("minecraft:waxed_copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:waxed_copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:waxed_copper_trapdoor", "minecraft:iron_trapdoor");
+        ITEMS.put("minecraft:waxed_exposed_chiseled_copper", "minecraft:waxed_exposed_copper");
+        ITEMS.put("minecraft:waxed_exposed_copper_bulb", "minecraft:waxed_exposed_copper");
+        ITEMS.put("minecraft:waxed_exposed_copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:waxed_exposed_copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:waxed_exposed_copper_trapdoor", "minecraft:iron_trapdoor");
+        ITEMS.put("minecraft:waxed_oxidized_chiseled_copper", "minecraft:waxed_oxidized_copper");
+        ITEMS.put("minecraft:waxed_oxidized_copper_bulb", "minecraft:waxed_oxidized_copper");
+        ITEMS.put("minecraft:waxed_oxidized_copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:waxed_oxidized_copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:waxed_oxidized_copper_trapdoor", "minecraft:iron_trapdoor");
+        ITEMS.put("minecraft:waxed_weathered_chiseled_copper", "minecraft:waxed_weathered_copper");
+        ITEMS.put("minecraft:waxed_weathered_copper_bulb", "minecraft:waxed_weathered_copper");
+        ITEMS.put("minecraft:waxed_weathered_copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:waxed_weathered_copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:waxed_weathered_copper_trapdoor", "minecraft:iron_trapdoor");
+        ITEMS.put("minecraft:weathered_chiseled_copper", "minecraft:weathered_copper");
+        ITEMS.put("minecraft:weathered_copper_bulb", "minecraft:weathered_copper");
+        ITEMS.put("minecraft:weathered_copper_door", "minecraft:iron_door");
+        ITEMS.put("minecraft:weathered_copper_grate", "minecraft:raw_iron_block");
+        ITEMS.put("minecraft:weathered_copper_trapdoor", "minecraft:iron_trapdoor");
+
+        ITEMS.put("minecraft:crafter", "minecraft:crafting_table");
+    }
+
+    static GeyserMappingItem remapItem(@SuppressWarnings("unused") Item item, GeyserMappingItem mapping) {
+        String replacement = ITEMS.get(mapping.getBedrockIdentifier());
+        if (replacement == null) {
+            return mapping;
+        } else {
+            return mapping.withBedrockIdentifier(replacement);
+        }
+    }
+
+    static NbtMap remapBlock(NbtMap tag) {
+        final String name = tag.getString("name");
+
+        String replacement;
+        if (NEW_STONES.contains(name) || NEW_WOODS.contains(name)) {
+
+            String typeKey;
+            String type = name.substring(10);
+            if (NEW_STONES.contains(name)) {
+                replacement = "minecraft:stone";
+                typeKey = "stone_type";
+                if (type.startsWith("polished_")) {
+                    type = type.substring(9) + "_smooth";
+                }
+            } else {
+                replacement = "minecraft:planks";
+                typeKey = "wood_type";
+                type = type.substring(0, type.indexOf("_planks"));
+            }
+
+            return tag.toBuilder()
+                .putString("name", replacement)
+                .putCompound("states", NbtMap.builder().putString(typeKey, type).build())
+                .build();
+        } else if (name.contains("tuff") && !name.equals("minecraft:tuff")) {
+
+            if (name.contains("brick") || name.contains("polished") || name.contains("chiseled")) {
+                replacement = name.replace("tuff", "deepslate");
+
+                if (name.contains("chiseled")) {
+                    // chiseled deepslate bricks don't exist. just use chiseled deepslate instead
+                    replacement = replacement.replace("_bricks", "");
+                }
+            } else {
+                replacement = name.replace("tuff", "cobbled_deepslate");
+            }
+
+            return tag.toBuilder()
+                .putString("name", replacement)
+                .build();
+        } else if (name.contains("copper")) {
+
+            boolean removeStates = false;
+            if (name.contains("chiseled")) {
+                replacement = name.replace("_chiseled", ""); // special chiseled
+                replacement = replacement.replace("chiseled_", ""); // plain chiseled
+            } else if (name.endsWith("bulb")) {
+                replacement = name.replace("_bulb", "");
+                removeStates = true;
+            } else if (name.endsWith("grate")) {
+                replacement = "minecraft:raw_iron_block";
+            } else if (name.endsWith("door")) {
+                if (name.contains("trap")) {
+                    replacement = "minecraft:iron_trapdoor";
+                } else {
+                    replacement = "minecraft:iron_door";
+                }
+            } else {
+                return tag;
+            }
+
+            if (replacement.endsWith(":copper")) {
+                // case for plain chiseled copper and plain bulb
+                replacement = replacement + "_block";
+            }
+
+            NbtMapBuilder builder = tag.toBuilder();
+            builder.putString("name", replacement);
+            if (removeStates) {
+                builder.putCompound("states", NbtMap.EMPTY);
+            }
+            return builder.build();
+        } else if (name.equals("minecraft:crafter")) {
+            NbtMapBuilder builder = tag.toBuilder();
+            builder.put("name", "minecraft:crafting_table");
+            builder.put("states", NbtMap.EMPTY);
+            return builder.build();
+        }
+
+        return tag;
+    }
+}

core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java

@@ -38,9 +38,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.cloudburstmc.nbt.NbtType;
-import org.cloudburstmc.protocol.bedrock.codec.v589.Bedrock_v589;
-import org.cloudburstmc.protocol.bedrock.codec.v594.Bedrock_v594;
-import org.cloudburstmc.protocol.bedrock.codec.v618.Bedrock_v618;
 import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
@@ -89,21 +86,8 @@ public class ItemRegistryPopulator {
     }
 
     public static void populate() {
-        /*
-        Remapper remapper630 = (item, mapping) -> {
-            String id = item.javaIdentifier();
-            // 1.20.50 replaced stone & planks to individual stone types
-            // E.g.: granite, diorite, andesite, polished variants, dark_oak_planks etc
-            if (mapping.getBedrockIdentifier().equals("minecraft:stone") || mapping.getBedrockIdentifier().equals("minecraft:planks")) {
-                return mapping.withBedrockIdentifier(id);
-            }
-
-            return mapping;
-        };
-         */
-
         List<PaletteVersion> paletteVersions = new ArrayList<>(3);
-        //paletteVersions.add(new PaletteVersion("1_20_40", Bedrock_v622.CODEC.getProtocolVersion(), Collections.emptyMap(), remapper618)); // NO item changes between 1.20.30 and 1.20.40
+        paletteVersions.add(new PaletteVersion("1_20_40", Bedrock_v622.CODEC.getProtocolVersion(), Collections.emptyMap(), Conversion630_622::remapItem)); // NO item changes between 1.20.30 and 1.20.40
         paletteVersions.add(new PaletteVersion("1_20_50", Bedrock_v630.CODEC.getProtocolVersion()));
 
         GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
@@ -371,7 +355,7 @@ public class ItemRegistryPopulator {
                                         if (customBlockItemOverride != null && customBlockData != null) {
                                             // Assuming this is a valid custom block override we'll just register it now while we have the creative item
                                             int customProtocolId = nextFreeBedrockId++;
-                                            mappingItem.setBedrockData(customProtocolId);
+                                            mappingItem = mappingItem.withBedrockData(customProtocolId);
                                             bedrockIdentifier = customBlockData.identifier();
                                             definition = new SimpleItemDefinition(bedrockIdentifier, customProtocolId, true);
                                             registry.put(customProtocolId, definition);

core/src/main/java/org/geysermc/geyser/registry/type/GeyserMappingItem.java

@@ -30,7 +30,6 @@ import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.ToString;
 import lombok.With;
 
@@ -40,7 +39,6 @@ import lombok.With;
 @ToString
 @EqualsAndHashCode
 @Getter
-@Setter
 @With
 @NoArgsConstructor
 @AllArgsConstructor

core/src/main/resources/mappings

@@ -1 +1 @@
-Subproject commit ad4b7952e997aaff144e2ce80e9552c8db93b8f1
+Subproject commit 2393a655595abd8e0b93e88553d9d8d7cdbde95b