Optimize Item Extractor

Reduce JSON file size. All things we put in are already there as components
Replace item searching with a HashMap (which is faster)

extractor/src/main/kotlin/de/snowii/extractor/extractors/Items.kt

@@ -7,6 +7,7 @@ import com.mojang.serialization.JsonOps
 import de.snowii.extractor.Extractor
 import net.minecraft.component.ComponentMap
 import net.minecraft.item.Item
+import net.minecraft.recipe.Recipe
 import net.minecraft.registry.Registries
 import net.minecraft.registry.RegistryKeys
 import net.minecraft.registry.RegistryOps
@@ -20,19 +21,13 @@ class Items : Extractor.Extractor {
 
 
     override fun extract(server: MinecraftServer): JsonElement {
-        val itemsJson = JsonArray()
+        val itemsJson = JsonObject()
 
         for (item in server.registryManager.getOrThrow(RegistryKeys.ITEM).streamEntries().toList()) {
             val itemJson = JsonObject()
             val realItem: Item = item.value()
 
             itemJson.addProperty("id", Registries.ITEM.getRawId(realItem))
-            itemJson.addProperty("name", Registries.ITEM.getId(realItem).toString())
-            itemJson.addProperty("translation_key", realItem.translationKey)
-            itemJson.addProperty("max_stack", realItem.maxCount)
-            itemJson.addProperty("max_durability", realItem.defaultStack.maxDamage)
-            itemJson.addProperty("break_sound", realItem.breakSound.id().toString())
-
             itemJson.add(
                 "components",
                 ComponentMap.CODEC.encodeStart(
@@ -41,7 +36,7 @@ class Items : Extractor.Extractor {
                 ).getOrThrow()
             )
 
-            itemsJson.add(itemJson)
+            itemsJson.add(Registries.ITEM.getId(realItem).toString(), itemJson)
         }
         return itemsJson
     }

pumpkin-world/src/item/item_registry.rs

@@ -1,35 +1,25 @@
-use std::sync::LazyLock;
+use std::{collections::HashMap, sync::LazyLock};
 
 use serde::Deserialize;
 
 const ITEMS_JSON: &str = include_str!("../../../assets/items.json");
 
-pub static ITEMS: LazyLock<Vec<Item>> = LazyLock::new(|| {
+pub static ITEMS: LazyLock<HashMap<String, Item>> = LazyLock::new(|| {
     serde_json::from_str(ITEMS_JSON).expect("Could not parse items.json registry.")
 });
 
-pub fn get_item<'a>(name: &str) -> Option<&'a Item> {
-    ITEMS.iter().find(|item| item.name == name)
+pub fn get_item(name: &str) -> Option<&Item> {
+    ITEMS.get(name)
 }
 
-#[expect(dead_code)]
 #[derive(Deserialize, Clone, Debug)]
 pub struct Item {
     pub id: u16,
-    pub name: String,
-    translation_key: String,
-    pub max_stack: i8,
-    max_durability: u16,
-    break_sound: String,
-    food: Option<FoodComponent>,
+    pub components: ItemComponents,
 }
 
-#[expect(dead_code)]
 #[derive(Deserialize, Clone, Debug)]
-struct FoodComponent {
-    hunger: u16,
-    saturation: f32,
-    always_edible: bool,
-    meat: bool,
-    snack: bool,
+pub struct ItemComponents {
+    #[serde(rename = "minecraft:max_stack_size")]
+    pub max_stack_size: u8,
 }

pumpkin/src/client/container.rs

@@ -552,7 +552,7 @@ impl Player {
     }
 
     async fn pickup_items(&self, item: &Item, mut amount: u32) {
-        let max_stack = item.max_stack as u8;
+        let max_stack = item.components.max_stack_size;
         let mut inventory = self.inventory.lock().await;
         let slots = inventory.slots_with_hotbar_first();
 
@@ -578,7 +578,7 @@ impl Player {
                 amount = amount_left;
                 *slot = Some(ItemStack {
                     item_id: item.id,
-                    item_count: item.max_stack as u8,
+                    item_count: item.components.max_stack_size,
                 });
             } else {
                 *slot = Some(ItemStack {
@@ -610,7 +610,9 @@ impl Player {
                 return;
             }
         }
-        log::warn!("{amount} items ({}) were discarded because dropping them to the ground is not implemented", item.name);
+        log::warn!(
+            "{amount} items were discarded because dropping them to the ground is not implemented"
+        );
     }
 
     /// Add items to inventory if there's space, else drop them to the ground.

pumpkin/src/command/args/arg_item.rs

@@ -67,12 +67,12 @@ impl DefaultNameArgConsumer for ItemArgumentConsumer {
 }
 
 impl<'a> FindArg<'a> for ItemArgumentConsumer {
-    type Data = &'a Item;
+    type Data = (&'a str, &'a Item);
 
     fn find_arg(args: &'a super::ConsumedArgs, name: &'a str) -> Result<Self::Data, CommandError> {
         match args.get(name) {
             Some(Arg::Item(name)) => match item_registry::get_item(name) {
-                Some(item) => Ok(item),
+                Some(item) => Ok((name, item)),
                 None => Err(CommandError::GeneralCommandIssue(format!(
                     "Item {name} does not exist."
                 ))),

pumpkin/src/command/commands/cmd_give.rs

@@ -34,7 +34,7 @@ impl CommandExecutor for GiveExecutor {
     ) -> Result<(), CommandError> {
         let targets = PlayersArgumentConsumer.find_arg_default_name(args)?;
 
-        let item = ItemArgumentConsumer::find_arg(args, ARG_ITEM)?;
+        let (item_name, item) = ItemArgumentConsumer::find_arg(args, ARG_ITEM)?;
 
         let item_count = match ITEM_COUNT_CONSUMER.find_arg_default_name(args) {
             Err(_) => 1,
@@ -58,11 +58,11 @@ impl CommandExecutor for GiveExecutor {
             .send_message(TextComponent::text_string(match targets {
                 [target] => format!(
                     "Gave {item_count} {} to {}",
-                    item.name, target.gameprofile.name
+                    item_name, target.gameprofile.name
                 ),
                 _ => format!(
                     "Gave {item_count} {} to {} players",
-                    item.name,
+                    item_name,
                     targets.len()
                 ),
             }))