Throw when we cannot find Bedrock item components for vanilla component based items; load default Bedrock item_components :(

Author: onebeastchris

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

@@ -164,7 +164,8 @@ public static void populate() {
         }
 
         NbtMap vanillaComponents;
-        try (InputStream stream = bootstrap.getResourceOrThrow("mappings/item_components.nbt")) {
+        // TODO e.g. breeze rod icon does not load with our modified item components
+        try (InputStream stream = bootstrap.getResourceOrThrow("bedrock/item_components.nbt")) {
             vanillaComponents = (NbtMap) NbtUtils.createGZIPReader(stream, true, true).readTag();
         } catch (Exception e) {
             throw new AssertionError("Unable to load Bedrock item components", e);
@@ -198,7 +199,7 @@ public static void populate() {
 
             // Used for custom items
             int nextFreeBedrockId = 0;
-            // TODO rename or yeet
+            // TODO yeet
             List<ItemDefinition> componentItemData = new ObjectArrayList<>();
 
             Int2ObjectMap<ItemDefinition> registry = new Int2ObjectOpenHashMap<>();
@@ -212,8 +213,10 @@ public static void populate() {
 
                 NbtMap components = null;
                 if (entry.isComponentBased()) {
-                    // TODO test
                     components = vanillaComponents.getCompound(entry.getName());
+                    if (components == null) {
+                        throw new RuntimeException("Could not find vanilla components for vanilla component based item! " + entry.getName());
+                    }
                 }
 
                 ItemDefinition definition = new SimpleItemDefinition(entry.getName().intern(), id, entry.getVersion(), entry.isComponentBased(), components);
@@ -449,8 +452,7 @@ public static void populate() {
                                             int customProtocolId = nextFreeBedrockId++;
                                             mappingItem = mappingItem.withBedrockData(customProtocolId);
                                             bedrockIdentifier = customBlockData.identifier();
-                                            // TODO add component nbt here
-                                            definition = new SimpleItemDefinition(bedrockIdentifier, customProtocolId, true);
+                                            definition = new SimpleItemDefinition(bedrockIdentifier, customProtocolId, 2, false, null);
                                             registry.put(customProtocolId, definition);
                                             customBlockItemDefinitions.put(customBlockData, definition);
                                             customIdMappings.put(customProtocolId, bedrockIdentifier);
@@ -528,7 +530,7 @@ public static void populate() {
                         }
 
                         // ComponentItemData - used to register some custom properties
-                        componentItemData.add(customMapping.itemDefinition()); // TODO
+                        componentItemData.add(customMapping.itemDefinition());
                         customItemOptions.add(Pair.of(customItem.customItemOptions(), customMapping.itemDefinition()));
                         registry.put(customMapping.integerId(), customMapping.itemDefinition());
 
@@ -623,7 +625,6 @@ public static void populate() {
                     int customItemId = nextFreeBedrockId++;
                     NonVanillaItemRegistration registration = CustomItemRegistryPopulator.registerCustomItem(customItem, customItemId, palette.protocolVersion);
 
-                    // TODO yeet?
                     componentItemData.add(registration.mapping().getBedrockDefinition());
                     ItemMapping mapping = registration.mapping();
                     Item javaItem = registration.javaItem();
@@ -663,7 +664,6 @@ public static void populate() {
                     int customProtocolId = nextFreeBedrockId++;
                     String identifier = customBlock.identifier();
 
-                    // TODO
                     final ItemDefinition definition = new SimpleItemDefinition(identifier, customProtocolId, 2, false, null);
                     registry.put(customProtocolId, definition);
                     customBlockItemDefinitions.put(customBlock, definition);

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

@@ -77,7 +77,6 @@
 import org.cloudburstmc.protocol.bedrock.data.command.CommandPermission;
 import org.cloudburstmc.protocol.bedrock.data.command.SoftEnumUpdateType;
 import org.cloudburstmc.protocol.bedrock.data.definitions.DimensionDefinition;
-import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
 import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
 import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.CraftingRecipeData;
@@ -740,10 +739,9 @@ public void connect() {
         sentSpawnPacket = true;
         syncEntityProperties();
 
-        // TODO test
         if (this.protocolVersion() >= 776) {
             ItemComponentPacket componentPacket = new ItemComponentPacket();
-            componentPacket.getItems().addAll(itemMappings.getItemDefinitions().values().stream().map((item) -> new SimpleItemDefinition(item.getIdentifier(), item.getRuntimeId(), item.getVersion(), item.getComponentData() != null, item.getComponentData())).toList());
+            componentPacket.getItems().addAll(itemMappings.getItemDefinitions().values());
             upstream.sendPacket(componentPacket);
         } else if (GeyserImpl.getInstance().getConfig().isAddNonBedrockItems()) {
             ItemComponentPacket componentPacket = new ItemComponentPacket();