Fix: hanging sign recipe not showing up in the recipe book (GeyserMC#…

…4814)
letsgoawaydev · Jul 12, 2024 · 93b0a61 · 93b0a61
1 parent 2a6025f
commit 93b0a61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/CreativeItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/CreativeItemRegistryPopulator.java
@@ -49,8 +49,6 @@
 
 public class CreativeItemRegistryPopulator {
     private static final List<BiPredicate<String, Integer>> JAVA_ONLY_ITEM_FILTER = List.of(
-            // Just shows an empty texture; either way it doesn't exist in the creative menu on Java
-            (identifier, data) -> identifier.equals("minecraft:debug_stick"),
             // Bedrock-only as its own item
             (identifier, data) -> identifier.equals("minecraft:empty_map") && data == 2,
             // Bedrock-only banner patterns
@@ -103,16 +101,8 @@ static void populate(ItemRegistryPopulator.PaletteVersion palette, Map<String, I
         }
 
         GeyserBedrockBlock blockDefinition = null;
-        JsonNode blockRuntimeIdNode = itemNode.get("blockRuntimeId");
         JsonNode blockStateNode;
-        if (blockRuntimeIdNode != null) {
-            bedrockBlockRuntimeId = blockRuntimeIdNode.asInt();
-            if (bedrockBlockRuntimeId == 0 && !identifier.equals("minecraft:blue_candle")) { // FIXME
-                bedrockBlockRuntimeId = -1;
-            }
-
-            blockDefinition = bedrockBlockRuntimeId == -1 ? null : blockMappings.getDefinition(bedrockBlockRuntimeId);
-        } else if ((blockStateNode = itemNode.get("block_state_b64")) != null) {
+        if ((blockStateNode = itemNode.get("block_state_b64")) != null) {
             byte[] bytes = Base64.getDecoder().decode(blockStateNode.asText());
             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
             try {

diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
@@ -252,10 +252,7 @@ public static void populate() {
                     } else {
                         // Try to get an example block runtime ID from the creative contents packet, for Bedrock identifier obtaining
                         int aValidBedrockBlockId = blacklistedIdentifiers.getOrDefault(bedrockIdentifier, customBlockItemOverride != null ? customBlockItemOverride.getRuntimeId() : -1);
-                        if (aValidBedrockBlockId == -1 && customBlockItemOverride == null) {
-                            // Fallback
-                            bedrockBlock = blockMappings.getBedrockBlock(firstBlockRuntimeId);
-                        } else {
+                        if (aValidBedrockBlockId != -1 || customBlockItemOverride != null) {
                             // As of 1.16.220, every item requires a block runtime ID attached to it.
                             // This is mostly for identifying different blocks with the same item ID - wool, slabs, some walls.
                             // However, in order for some visuals and crafting to work, we need to send the first matching block state
@@ -266,7 +263,7 @@ public static void populate() {
                             boolean firstPass = true;
                             // Block states are all grouped together. In the mappings, we store the first block runtime ID in order,
                             // and the last, if relevant. We then iterate over all those values and get their Bedrock equivalents
-                            Integer lastBlockRuntimeId = entry.getValue().getLastBlockRuntimeId() == null ? firstBlockRuntimeId : entry.getValue().getLastBlockRuntimeId();
+                            int lastBlockRuntimeId = entry.getValue().getLastBlockRuntimeId() == null ? firstBlockRuntimeId : entry.getValue().getLastBlockRuntimeId();
                             for (int i = firstBlockRuntimeId; i <= lastBlockRuntimeId; i++) {
                                 GeyserBedrockBlock bedrockBlockRuntimeId = blockMappings.getVanillaBedrockBlock(i);
                                 NbtMap blockTag = bedrockBlockRuntimeId.getState();