diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java index 713665b97..310df08e1 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java @@ -66,37 +66,9 @@ public final class BlockRegistryPopulator { } private static void registerBedrockBlocks() { - BiFunction woolMapper = (bedrockIdentifier, statesBuilder) -> { - if (bedrockIdentifier.equals("minecraft:wool")) { - String color = (String) statesBuilder.remove("color"); - if ("silver".equals(color)) { - color = "light_gray"; - } - return "minecraft:" + color + "_wool"; - } - return null; - }; BiFunction emptyMapper = (bedrockIdentifier, statesBuilder) -> null; ImmutableMap, BiFunction> blockMappers = ImmutableMap., BiFunction>builder() - .put(ObjectIntPair.of("1_19_80", Bedrock_v582.CODEC.getProtocolVersion()), (bedrockIdentifier, statesBuilder) -> { - String identifier = woolMapper.apply(bedrockIdentifier, statesBuilder); - if (identifier != null) { - return identifier; - } - switch (bedrockIdentifier) { - case "minecraft:log", "minecraft:log2" -> { - String woodType = (String) statesBuilder.remove(bedrockIdentifier.equals("minecraft:log") ? "old_log_type" : "new_log_type"); - return "minecraft:" + woodType + "_log"; - } - case "minecraft:fence" -> { - String woodType = (String) statesBuilder.remove("wood_type"); - return "minecraft:" + woodType + "_fence"; - } - default -> { - return null; - } - } - }) + .put(ObjectIntPair.of("1_19_80", Bedrock_v582.CODEC.getProtocolVersion()), emptyMapper) .build(); // We can keep this strong as nothing should be garbage collected 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 index b67780cb0..155d68636 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java @@ -198,20 +198,7 @@ public class ItemRegistryPopulator { continue; } - String bedrockIdentifier; - if (mappingItem.getBedrockIdentifier().equals("minecraft:wool")) { - bedrockIdentifier = javaItem.javaIdentifier(); - } else { - bedrockIdentifier = mappingItem.getBedrockIdentifier(); - } - - //1.19.80+ - if (mappingItem.getBedrockIdentifier().equals("minecraft:log") || - mappingItem.getBedrockIdentifier().equals("minecraft:log2") || - mappingItem.getBedrockIdentifier().equals("minecraft:fence")) { - bedrockIdentifier = javaItem.javaIdentifier(); - } - + String bedrockIdentifier = mappingItem.getBedrockIdentifier(); ItemDefinition definition = definitions.get(bedrockIdentifier); if (definition == null) { throw new RuntimeException("Missing Bedrock ItemDefinition in mappings: " + bedrockIdentifier);