fix: AI comments and cleanup

The-Code-Monkey · The-Code-Monkey · commit 06119f75d9a6 · 2026-02-02T08:36:12.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
+        if: ${{ matrix.java == '25' }} # Only upload artifacts built from latest java
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts
diff --git a/src/main/generated/data/houseki/advancement/recipes/bauxite_crushing.json b/src/main/generated/data/houseki/advancement/recipes/bauxite_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:bauxite_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:bauxite_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/cobblestone_crushing.json b/src/main/generated/data/houseki/advancement/recipes/cobblestone_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:cobblestone_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:cobblestone_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/copper_ingot_crushing.json b/src/main/generated/data/houseki/advancement/recipes/copper_ingot_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:copper_ingot_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:copper_ingot_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/deepslate_platinum_ore_crushing.json b/src/main/generated/data/houseki/advancement/recipes/deepslate_platinum_ore_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:deepslate_platinum_ore_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:deepslate_platinum_ore_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/platinum_ore_crushing.json b/src/main/generated/data/houseki/advancement/recipes/platinum_ore_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:platinum_ore_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:platinum_ore_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/sandstone_crushing.json b/src/main/generated/data/houseki/advancement/recipes/sandstone_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:sandstone_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:sandstone_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/scheelite_crushing.json b/src/main/generated/data/houseki/advancement/recipes/scheelite_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:scheelite_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:scheelite_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/stone_crushing.json b/src/main/generated/data/houseki/advancement/recipes/stone_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:stone_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:stone_crushing"
+    ]
+  }
+}
diff --git a/src/main/generated/data/houseki/advancement/recipes/wolframite_crushing.json b/src/main/generated/data/houseki/advancement/recipes/wolframite_crushing.json
@@ -0,0 +1,21 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "houseki:wolframite_crushing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "houseki:wolframite_crushing"
+    ]
+  }
+}
diff --git a/src/main/java/anya/pizza/houseki/block/entity/custom/CrusherBlockEntity.java b/src/main/java/anya/pizza/houseki/block/entity/custom/CrusherBlockEntity.java
@@ -5,7 +5,6 @@
 import anya.pizza.houseki.block.entity.ModBlockEntities;
 import anya.pizza.houseki.recipe.CrusherRecipe;
 import anya.pizza.houseki.recipe.CrusherRecipeInput;
-import anya.pizza.houseki.recipe.ModSerializer;
 import anya.pizza.houseki.recipe.ModTypes;
 import anya.pizza.houseki.screen.custom.CrusherScreenHandler;
 import net.fabricmc.fabric.api.menu.v1.ExtendedMenuProvider;
@@ -34,7 +33,6 @@
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.Nullable;
 import org.jspecify.annotations.NonNull;
-import org.lwjgl.system.windows.INPUT;
 
 import java.util.Optional;
 
@@ -115,7 +113,6 @@ public AbstractContainerMenu createMenu(int syncId, @NonNull Inventory playerInv
     @Override
     public void preRemoveSideEffects(@NonNull BlockPos pos, @NonNull BlockState oldState) {
         assert level != null;
-        Containers.dropContents(level, pos, (this));
         if (level != null) {
             Containers.dropContents(level, pos, this);
         }
@@ -238,23 +235,6 @@ private boolean canInsertIntoSlot(int slot, ItemStack stack) {
      * recipe provides one and its configured chance succeeds. One item is removed from the input slot
      * when a recipe is applied.
      */
-    // private void craftItem() {
-    //     Optional<RecipeHolder<CrusherRecipe>> recipe = getCurrentRecipe();
-    //     if (recipe.isEmpty()) return;
-
-    //     CrusherRecipe crusherRecipe = recipe.get().value();
-
-    //     // Handle Main Output
-    //     insertOrIncrement(OUTPUT_SLOT, crusherRecipe.getResult(null).copy(), 1.0);
-
-    //     // Handle Auxiliary Output
-    //     crusherRecipe.auxiliaryOutput().ifPresent(stack -> {
-    //         insertOrIncrement(AUXILIARY_OUTPUT_SLOT, stack.copy(), crusherRecipe.auxiliaryChance());
-    //     });
-
-    //     inventory.get(INPUT_SLOT).shrink(1);
-    // }
-
     private void craftItem() {
         Optional<RecipeHolder<CrusherRecipe>> recipe = getCurrentRecipe();
         if (recipe.isEmpty()) return;
@@ -263,7 +243,7 @@ private void craftItem() {
 
         // Handle Main Output
         // getResult already returns a new ItemStack(output), so we copy that.
-        insertOrIncrement(OUTPUT_SLOT, crusherRecipe.getResult(null).copy(), 1.0);
+        insertOrIncrement(OUTPUT_SLOT, crusherRecipe.getResult(null), 1.0);
 
         // Handle Auxiliary Output
         crusherRecipe.auxiliaryOutput().ifPresent(item -> {
@@ -297,10 +277,12 @@ private void insertOrIncrement(int slot, ItemStack result, double chance) {
     }
 
     private Optional<RecipeHolder<CrusherRecipe>> getCurrentRecipe() {
-        assert this.getLevel() != null;
-        return ((ServerLevel) this.getLevel()).recipeAccess()
-                .getRecipeFor(ModTypes.CRUSHER_TYPE, new CrusherRecipeInput(inventory.getFirst()), this.getLevel());
-
+        Level level = this.getLevel();
+        if (!(level instanceof ServerLevel serverLevel)) {
+            return Optional.empty();
+        }
+        return serverLevel.recipeAccess()
+                .getRecipeFor(ModTypes.CRUSHER_TYPE, new CrusherRecipeInput(inventory.getFirst()), level);
     }
 
     @Override
diff --git a/src/main/java/anya/pizza/houseki/datagen/ModModelProvider.java b/src/main/java/anya/pizza/houseki/datagen/ModModelProvider.java
@@ -5,7 +5,6 @@
 import anya.pizza.houseki.item.ModItems;
 import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput;
-import net.minecraft.client.data.*;
 import net.minecraft.client.data.models.BlockModelGenerators;
 import net.minecraft.client.data.models.ItemModelGenerators;
 import net.minecraft.client.data.models.model.ModelTemplates;
diff --git a/src/main/java/anya/pizza/houseki/datagen/ModRecipeProvider.java b/src/main/java/anya/pizza/houseki/datagen/ModRecipeProvider.java
@@ -49,32 +49,66 @@ public void buildRecipes() {
                 List<ItemLike> CAST_STEEL_SMELTABLES = List.of(ModItems.STEEL);
 
                 //Crushing recipes with auxiliary output
-                CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.BAUXITE), ModItems.CRUSHED_BAUXITE, 250).chance(0.5)
-                        .auxiliary(Items.CLAY).save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "bauxite_crushing")));
-
-                CrusherRecipeBuilder.create(Ingredient.of(Items.SANDSTONE), Items.SAND, 100).chance(0.2)
-                        .auxiliary(Items.CALCITE).save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "sandstone_crushing")));
-
-                CrusherRecipeBuilder.create(Ingredient.of(ModItems.WOLFRAMITE), ModItems.TUNGSTEN, 250).chance(0.5)
-                        .auxiliary(Items.QUARTZ).save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "wolframite_crushing")));
-
-                // Crushing recipes WITHOUT an auxiliary output (it will default to Optional.empty())
+                CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.BAUXITE), ModItems.CRUSHED_BAUXITE, 250)
+                        .chance(0.5)
+                        .auxiliary(Items.CLAY)
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "bauxite_crushing"))
+                        );
+
+                CrusherRecipeBuilder.create(Ingredient.of(Items.SANDSTONE), Items.SAND, 100)
+                        .chance(0.2)
+                        .auxiliary(Items.CALCITE)
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "sandstone_crushing"))
+                        );
+
+                CrusherRecipeBuilder.create(Ingredient.of(ModItems.WOLFRAMITE), ModItems.TUNGSTEN, 250)
+                        .chance(0.5)
+                        .auxiliary(Items.QUARTZ)
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "wolframite_crushing"))
+                        );
+
+                // Crushing recipes WITHOUT an auxiliary output
                 CrusherRecipeBuilder.create(Ingredient.of(Items.COBBLESTONE), Items.GRAVEL, 100)
-                        .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "cobblestone_crushing")));
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "cobblestone_crushing"))
+                        );
 
                 CrusherRecipeBuilder.create(Ingredient.of(Items.STONE), Items.GRAVEL, 100)
-                        .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "stone_crushing")));
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "stone_crushing"))
+                        );
 
                 CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.PLATINUM_ORE), ModItems.PLATINUM, 250)
-                        .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "platinum_ore_crushing")));
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "platinum_ore_crushing"))
+                        );
+
                 CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.DEEPSLATE_PLATINUM_ORE), ModItems.PLATINUM, 250)
-                        .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "deepslate_platinum_ore_crushing")));
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "deepslate_platinum_ore_crushing"))
+                        );
 
                 CrusherRecipeBuilder.create(Ingredient.of(Items.COPPER_INGOT), ModItems.PLATINUM_NUGGET, 250)
-                        .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "copper_ingot_crushing")));
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "copper_ingot_crushing"))
+                        );
 
                 CrusherRecipeBuilder.create(Ingredient.of(ModItems.SCHEELITE), ModItems.TUNGSTEN, 250)
-                        .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "scheelite_crushing")));
+                        .save(
+                                output, 
+                                ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "scheelite_crushing"))
+                        );
 
                 //Smithing Upgrades
                 offerPinkuUpgradeRecipe(output, Items.NETHERITE_HELMET, RecipeCategory.COMBAT, ModItems.PINKU_HELMET);
diff --git a/src/main/java/anya/pizza/houseki/datagen/recipebuilder/CrusherRecipeBuilder.java b/src/main/java/anya/pizza/houseki/datagen/recipebuilder/CrusherRecipeBuilder.java
diff --git a/src/main/java/anya/pizza/houseki/recipe/CrusherRecipe.java b/src/main/java/anya/pizza/houseki/recipe/CrusherRecipe.java
diff --git a/src/main/java/anya/pizza/houseki/util/ModGenRecipes.java b/src/main/java/anya/pizza/houseki/util/ModGenRecipes.java
diff --git a/src/main/java/anya/pizza/houseki/util/ModLootTableModifiers.java b/src/main/java/anya/pizza/houseki/util/ModLootTableModifiers.java
diff --git a/src/main/java/anya/pizza/houseki/world/ModPlacedFeatures.java b/src/main/java/anya/pizza/houseki/world/ModPlacedFeatures.java
