1.20.80

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

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.73 and Minecraft Java 1.20.4
+### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.80 and Minecraft Java 1.20.4
 
 ## 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

@@ -40,6 +40,7 @@ import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.codec.v649.Bedrock_v649;
 import org.cloudburstmc.protocol.bedrock.codec.v662.Bedrock_v662;
+import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 import org.cloudburstmc.protocol.bedrock.netty.codec.packet.BedrockPacketCodec;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 import org.cloudburstmc.protocol.bedrock.packet.ClientCacheBlobStatusPacket;
@@ -72,7 +73,7 @@ public final class GameProtocol {
      * Default Bedrock codec that should act as a fallback. Should represent the latest available
      * release of the game that Geyser supports.
      */
-    public static final BedrockCodec DEFAULT_BEDROCK_CODEC = processCodec(Bedrock_v662.CODEC);
+    public static final BedrockCodec DEFAULT_BEDROCK_CODEC = processCodec(Bedrock_v671.CODEC);
 
     /**
      * A list of all supported Bedrock versions that can join Geyser
@@ -95,9 +96,12 @@ public final class GameProtocol {
         SUPPORTED_BEDROCK_CODECS.add(processCodec(Bedrock_v649.CODEC.toBuilder()
             .minecraftVersion("1.20.60/1.20.62")
             .build()));
-        SUPPORTED_BEDROCK_CODECS.add(processCodec(DEFAULT_BEDROCK_CODEC.toBuilder()
+        SUPPORTED_BEDROCK_CODECS.add(processCodec(Bedrock_v662.CODEC.toBuilder()
             .minecraftVersion("1.20.70/1.20.73")
             .build()));
+        SUPPORTED_BEDROCK_CODECS.add(processCodec(DEFAULT_BEDROCK_CODEC.toBuilder()
+            .minecraftVersion("1.20.80")
+            .build()));
     }
 
     /**
@@ -219,7 +223,7 @@ public final class GameProtocol {
                     }
                 })
                 // Ignored serverbound packets
-                .updateSerializer(CraftingEventPacket.class, getIgnoredSerializer()) // Make illegal when 1.20.40 is removed
+                .updateSerializer(CraftingEventPacket.class, setIgnoredSerializer()) // Make illegal when 1.20.40 is removed
                 // Ignored only when serverbound
                 .updateSerializer(MobArmorEquipmentPacket.class, new MobArmorEquipmentSerializer_v291() {
                     @Override
@@ -258,7 +262,7 @@ public final class GameProtocol {
         }
 
         VarInts.readInt(buffer); // Block runtime ID
-        int streamSize = VarInts.readInt(buffer);
+        int streamSize = VarInts.readUnsignedInt(buffer);
         buffer.skipBytes(streamSize);
     }
 
@@ -276,7 +280,7 @@ public final class GameProtocol {
         };
     }
 
-    private static <T extends BedrockPacket> BedrockPacketSerializer<T> getIgnoredSerializer() {
+    private static <T extends BedrockPacket> BedrockPacketSerializer<T> setIgnoredSerializer() {
         return new BedrockPacketSerializer<T>() {
             @Override
             public void serialize(ByteBuf buffer, BedrockCodecHelper helper, BedrockPacket packet) {

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

@@ -43,6 +43,7 @@ import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.codec.v649.Bedrock_v649;
 import org.cloudburstmc.protocol.bedrock.codec.v662.Bedrock_v662;
+import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 import org.cloudburstmc.protocol.bedrock.data.BlockPropertyData;
 import org.cloudburstmc.protocol.bedrock.data.definitions.BlockDefinition;
 import org.geysermc.geyser.GeyserImpl;
@@ -122,7 +123,8 @@ public final class BlockRegistryPopulator {
                 .put(ObjectIntPair.of("1_20_50", Bedrock_v630.CODEC.getProtocolVersion()), Conversion649_630::remapBlock)
                 // Only changes in 1.20.60 are hard_stained_glass (an EDU only block)
                 .put(ObjectIntPair.of("1_20_60", Bedrock_v649.CODEC.getProtocolVersion()), Conversion662_649::remapBlock)
-                .put(ObjectIntPair.of("1_20_70", Bedrock_v662.CODEC.getProtocolVersion()), tag -> tag)
+                .put(ObjectIntPair.of("1_20_70", Bedrock_v662.CODEC.getProtocolVersion()), Conversion671_662::remapBlock)
+                .put(ObjectIntPair.of("1_20_80", Bedrock_v671.CODEC.getProtocolVersion()), tag -> tag)
                 .build();
 
         // We can keep this strong as nothing should be garbage collected

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

@@ -44,6 +44,8 @@ public class Conversion662_649 {
 
 
     static GeyserMappingItem remapItem(@SuppressWarnings("unused") Item item, GeyserMappingItem mapping) {
+        mapping = Conversion671_662.remapItem(item, mapping);
+
         String identifer = mapping.getBedrockIdentifier();
 
         if (identifer.equals("minecraft:grass_block")) {
@@ -93,6 +95,8 @@ public class Conversion662_649 {
     }
 
     static NbtMap remapBlock(NbtMap tag) {
+        tag = Conversion671_662.remapBlock(tag);
+
         final String name = tag.getString("name");
         
         if (!NEW_BLOCKS.contains(name)) {

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

@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2019-2024 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 org.cloudburstmc.nbt.NbtMap;
+import org.geysermc.geyser.item.type.Item;
+import org.geysermc.geyser.registry.type.GeyserMappingItem;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+public class Conversion671_662 {
+    private static final List<String> NEW_CORAL_FANS = List.of("minecraft:tube_coral_fan", "minecraft:brain_coral_fan", "minecraft:bubble_coral_fan", "minecraft:fire_coral_fan", "minecraft:horn_coral_fan");
+    private static final List<String> NEW_DEAD_CORAL_FANS = List.of("minecraft:dead_tube_coral_fan", "minecraft:dead_brain_coral_fan", "minecraft:dead_bubble_coral_fan", "minecraft:dead_fire_coral_fan", "minecraft:dead_horn_coral_fan");
+    private static final List<String> NEW_FLOWERS = List.of("minecraft:poppy", "minecraft:blue_orchid", "minecraft:allium", "minecraft:azure_bluet", "minecraft:red_tulip", "minecraft:orange_tulip", "minecraft:white_tulip", "minecraft:pink_tulip", "minecraft:oxeye_daisy", "minecraft:cornflower", "minecraft:lily_of_the_valley");
+    private static final List<String> NEW_SAPLINGS = List.of("minecraft:oak_sapling", "minecraft:spruce_sapling", "minecraft:birch_sapling", "minecraft:jungle_sapling", "minecraft:acacia_sapling", "minecraft:dark_oak_sapling", "minecraft:bamboo_sapling");
+    private static final List<String> NEW_BLOCKS = Stream.of(NEW_CORAL_FANS, NEW_DEAD_CORAL_FANS, NEW_FLOWERS, NEW_SAPLINGS).flatMap(List::stream).toList();
+
+    static GeyserMappingItem remapItem(@SuppressWarnings("unused") Item item, GeyserMappingItem mapping) {
+        String identifer = mapping.getBedrockIdentifier();
+
+        if (!NEW_BLOCKS.contains(identifer)) {
+            return mapping;
+        }
+
+        if (NEW_FLOWERS.contains(identifer)) {
+            switch (identifer) {
+                case "minecraft:poppy" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(0); }
+                case "minecraft:blue_orchid" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(1); }
+                case "minecraft:allium" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(2); }
+                case "minecraft:azure_bluet" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(3); }
+                case "minecraft:red_tulip" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(4); }
+                case "minecraft:orange_tulip" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(5); }
+                case "minecraft:white_tulip" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(6); }
+                case "minecraft:pink_tulip" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(7); }
+                case "minecraft:oxeye_daisy" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(8); }
+                case "minecraft:cornflower" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(9); }
+                case "minecraft:lily_of_the_valley" -> { return mapping.withBedrockIdentifier("minecraft:red_flower").withBedrockData(10); }
+            }
+        }
+
+        if (NEW_SAPLINGS.contains(identifer)) {
+            switch (identifer) {
+                case "minecraft:oak_sapling" -> { return mapping.withBedrockIdentifier("minecraft:sapling").withBedrockData(0); }
+                case "minecraft:spruce_sapling" -> { return mapping.withBedrockIdentifier("minecraft:sapling").withBedrockData(1); }
+                case "minecraft:birch_sapling" -> { return mapping.withBedrockIdentifier("minecraft:sapling").withBedrockData(2); }
+                case "minecraft:jungle_sapling" -> { return mapping.withBedrockIdentifier("minecraft:sapling").withBedrockData(3); }
+                case "minecraft:acacia_sapling" -> { return mapping.withBedrockIdentifier("minecraft:sapling").withBedrockData(4); }
+                case "minecraft:dark_oak_sapling" -> { return mapping.withBedrockIdentifier("minecraft:sapling").withBedrockData(5); }
+            }
+        }
+
+        if (NEW_CORAL_FANS.contains(identifer)) {
+            switch (identifer) {
+                case "minecraft:tube_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan").withBedrockData(0); }
+                case "minecraft:brain_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan").withBedrockData(1); }
+                case "minecraft:bubble_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan").withBedrockData(2); }
+                case "minecraft:fire_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan").withBedrockData(3); }
+                case "minecraft:horn_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan").withBedrockData(4); }
+            }
+        }
+
+        if (NEW_DEAD_CORAL_FANS.contains(identifer)) {
+            switch (identifer) {
+                case "minecraft:dead_tube_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan_dead").withBedrockData(0); }
+                case "minecraft:dead_brain_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan_dead").withBedrockData(1); }
+                case "minecraft:dead_bubble_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan_dead").withBedrockData(2); }
+                case "minecraft:dead_fire_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan_dead").withBedrockData(3); }
+                case "minecraft:dead_horn_coral_fan" -> { return mapping.withBedrockIdentifier("minecraft:coral_fan_dead").withBedrockData(4); }
+            }
+        }
+
+        return mapping;
+    }
+
+    static NbtMap remapBlock(NbtMap tag) {
+        final String name = tag.getString("name");
+        
+        if (!NEW_BLOCKS.contains(name)) {
+            return tag;
+        }
+
+        if (name.equals("minecraft:bamboo_sapling")) {
+            NbtMap states = tag.getCompound("states")
+                .toBuilder()
+                .putString("sapling_type", "oak")
+                .build();
+
+            return tag.toBuilder().putCompound("states", states).build();
+        }
+
+        String replacement;
+
+        if (NEW_SAPLINGS.contains(name)) {
+            replacement = "minecraft:sapling";
+            String saplingType = name.replaceAll("minecraft:|_sapling", "");;
+
+            NbtMap states = tag.getCompound("states")
+                .toBuilder()
+                .putString("sapling_type", saplingType)
+                .build();
+
+            return tag.toBuilder().putString("name", replacement).putCompound("states", states).build();
+        }
+
+        if (NEW_FLOWERS.contains(name)) {
+            replacement = "minecraft:red_flower";
+            String flowerType;
+
+            switch (name) {
+                case "minecraft:poppy" -> flowerType = "poppy";
+                case "minecraft:blue_orchid" -> flowerType = "orchid";
+                case "minecraft:allium" -> flowerType = "allium";
+                case "minecraft:azure_bluet" -> flowerType = "houstonia";
+                case "minecraft:red_tulip" -> flowerType = "tulip_red";
+                case "minecraft:orange_tulip" -> flowerType = "tulip_orange";
+                case "minecraft:white_tulip" -> flowerType = "tulip_white";
+                case "minecraft:pink_tulip" -> flowerType = "tulip_pink";
+                case "minecraft:oxeye_daisy" -> flowerType = "oxeye";
+                case "minecraft:cornflower" -> flowerType = "cornflower";
+                case "minecraft:lily_of_the_valley" -> flowerType = "lily_of_the_valley";
+                default -> throw new IllegalStateException("Unexpected value: " + name);
+            }
+
+            NbtMap states = tag.getCompound("states")
+                .toBuilder()
+                .putString("flower_type", flowerType)
+                .build();
+            
+            return tag.toBuilder().putString("name", replacement).putCompound("states", states).build();
+        }
+
+        boolean isLiveCoralFan = NEW_CORAL_FANS.contains(name);
+        boolean isDeadCoralFan = NEW_DEAD_CORAL_FANS.contains(name);
+
+        if (isLiveCoralFan || isDeadCoralFan) {
+            replacement = isLiveCoralFan ? "minecraft:coral_fan" : "minecraft:coral_fan_dead";
+            String coralColor;
+
+            switch (name) {
+                case "minecraft:tube_coral_fan", "minecraft:dead_tube_coral_fan" -> coralColor = "blue";
+                case "minecraft:brain_coral_fan", "minecraft:dead_brain_coral_fan" -> coralColor = "pink";
+                case "minecraft:bubble_coral_fan", "minecraft:dead_bubble_coral_fan" -> coralColor = "purple";
+                case "minecraft:fire_coral_fan", "minecraft:dead_fire_coral_fan" -> coralColor = "yellow";
+                case "minecraft:horn_coral_fan", "minecraft:dead_horn_coral_fan" -> coralColor = "red";
+                default -> throw new IllegalStateException("Unexpected value: " + name);
+            }
+
+            NbtMap states = tag.getCompound("states")
+                .toBuilder()
+                .putString("coral_color", coralColor)
+                .build();
+
+            return tag.toBuilder().putString("name", replacement).putCompound("states", states).build();
+        }
+
+        return tag;
+    }
+}

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

@@ -42,6 +42,7 @@ import org.cloudburstmc.protocol.bedrock.codec.v622.Bedrock_v622;
 import org.cloudburstmc.protocol.bedrock.codec.v630.Bedrock_v630;
 import org.cloudburstmc.protocol.bedrock.codec.v649.Bedrock_v649;
 import org.cloudburstmc.protocol.bedrock.codec.v662.Bedrock_v662;
+import org.cloudburstmc.protocol.bedrock.codec.v671.Bedrock_v671;
 import org.cloudburstmc.protocol.bedrock.data.SoundEvent;
 import org.cloudburstmc.protocol.bedrock.data.definitions.BlockDefinition;
 import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
@@ -93,7 +94,8 @@ public class ItemRegistryPopulator {
         paletteVersions.add(new PaletteVersion("1_20_40", Bedrock_v622.CODEC.getProtocolVersion(), Collections.emptyMap(), Conversion630_622::remapItem));
         paletteVersions.add(new PaletteVersion("1_20_50", Bedrock_v630.CODEC.getProtocolVersion(), Collections.emptyMap(), Conversion649_630::remapItem));
         paletteVersions.add(new PaletteVersion("1_20_60", Bedrock_v649.CODEC.getProtocolVersion(), Collections.emptyMap(), Conversion662_649::remapItem));
-        paletteVersions.add(new PaletteVersion("1_20_70", Bedrock_v662.CODEC.getProtocolVersion()));
+        paletteVersions.add(new PaletteVersion("1_20_70", Bedrock_v662.CODEC.getProtocolVersion(), Collections.emptyMap(), Conversion671_662::remapItem));
+        paletteVersions.add(new PaletteVersion("1_20_80", Bedrock_v671.CODEC.getProtocolVersion()));
 
         GeyserBootstrap bootstrap = GeyserImpl.getInstance().getBootstrap();
 

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

@@ -173,7 +173,7 @@ public class RecipeRegistryPopulator {
             /* Convert end */
 
             return ShapedRecipeData.shaped(uuid.toString(), shape.get(0).length(), shape.size(),
-                    inputs.stream().map(ItemDescriptorWithCount::fromItem).toList(), Collections.singletonList(output), uuid, "crafting_table", 0, netId);
+                    inputs.stream().map(ItemDescriptorWithCount::fromItem).toList(), Collections.singletonList(output), uuid, "crafting_table", 0, netId, true);
         }
         List<ItemData> inputs = new ObjectArrayList<>();
         for (JsonNode entry : node.get("inputs")) {

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java

@@ -162,7 +162,7 @@ public class JavaUpdateRecipesTranslator extends PacketTranslator<ClientboundUpd
                         bedrockRecipeIDs.add(uuid.toString());
                         craftingDataPacket.getCraftingData().add(org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.ShapedRecipeData.shaped(uuid.toString(),
                                 shapedRecipeData.getWidth(), shapedRecipeData.getHeight(), Arrays.asList(inputs),
-                                Collections.singletonList(output), uuid, "crafting_table", 0, netId));
+                                Collections.singletonList(output), uuid, "crafting_table", 0, netId, true));
                         recipeMap.put(netId++, new GeyserShapedRecipe(shapedRecipeData));
                     }
                     addRecipeIdentifier(session, recipe.getIdentifier(), bedrockRecipeIDs);

core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java

@@ -193,7 +193,8 @@ public class JavaContainerSetSlotTranslator extends PacketTranslator<Clientbound
                     uuid,
                     "crafting_table",
                     0,
-                    newRecipeId
+                    newRecipeId,
+                    true
             ));
             craftPacket.setCleanRecipes(false);
             session.sendUpstreamPacket(craftPacket);

core/src/main/resources/mappings

@@ -1 +1 @@
-Subproject commit b1883ca53afc082de98aeb062ba2fad00e069617
+Subproject commit 4f89411d5bfb4e48699f635876d9c556e5c7e505

gradle/libs.versions.toml

@@ -9,10 +9,10 @@ netty = "4.1.107.Final"
 guava = "29.0-jre"
 gson = "2.3.1" # Provided by Spigot 1.8.8
 websocket = "1.5.1"
-protocol = "3.0.0.Beta1-20240313.120922-126"
+protocol = "3.0.0.Beta1-20240411.165033-129"
-protocol-connection = "3.0.0.Beta1-20240313.120922-125"
+protocol-connection = "3.0.0.Beta1-20240411.165033-128"
 raknet = "1.0.0.CR1-20240330.103819-16"
-blockstateupdater="1.20.70-20240303.125052-2"
+blockstateupdater="1.20.80-20240411.142413-1"
 mcauthlib = "d9d773e"
 mcprotocollib = "1.20.4-2-20240116.220521-7"
 adventure = "4.14.0"
@@ -116,9 +116,9 @@ websocket = { group = "org.java-websocket", name = "Java-WebSocket", version.ref
 #protocol-common = { group = "org.cloudburstmc.protocol", name = "common", version.ref = "protocol-connection" }
 #protocol-codec = { group = "org.cloudburstmc.protocol", name = "bedrock-codec", version.ref = "protocol" }
 #protocol-connection = { group = "org.cloudburstmc.protocol", name = "bedrock-connection", version.ref = "protocol-connection" }
-protocol-common = { group = "com.github.CloudburstMC.Protocol", name = "common", version = "a344da4" }
+protocol-common = { group = "com.github.Kas-tle.Protocol", name = "common", version = "d497426" }
-protocol-codec = { group = "com.github.CloudburstMC.Protocol", name = "bedrock-codec", version = "a344da4" }
+protocol-codec = { group = "com.github.Kas-tle.Protocol", name = "bedrock-codec", version = "d497426" }
-protocol-connection = { group = "com.github.CloudburstMC.Protocol", name = "bedrock-connection", version = "a344da4" }
+protocol-connection = { group = "com.github.Kas-tle.Protocol", name = "bedrock-connection", version = "d497426" }
 
 math = { group = "org.cloudburstmc.math", name = "immutable", version = "2.0" }