feat: Update to Minecraft 1.21.4

TwelveIterationMods · Dec 3, 2024 · 8c9c336 · 8c9c336
1 parent 69b23ff
commit 8c9c336
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/common/src/generated/resources/assets/fertilization/items/compressed_bonemeal.json b/common/src/generated/resources/assets/fertilization/items/compressed_bonemeal.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "fertilization:item/compressed_bonemeal"
+  }
+}
diff --git a/common/src/generated/resources/assets/fertilization/items/extremely_compressed_bonemeal.json b/common/src/generated/resources/assets/fertilization/items/extremely_compressed_bonemeal.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "fertilization:item/extremely_compressed_bonemeal"
+  }
+}
diff --git a/common/src/generated/resources/assets/fertilization/items/florists_bonemeal.json b/common/src/generated/resources/assets/fertilization/items/florists_bonemeal.json
@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "fertilization:item/florists_bonemeal"
+  }
+}
diff --git a/common/src/generated/resources/data/fertilization/recipe/florists_bonemeal.json b/common/src/generated/resources/data/fertilization/recipe/florists_bonemeal.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "B": "minecraft:bone_meal",
-    "F": "#minecraft:flowers"
+    "F": "#minecraft:small_flowers"
   },
   "pattern": [
     "BF",

diff --git a/fabric/src/main/java/net/blay09/mods/fertilization/fabric/datagen/ModModelProvider.java b/fabric/src/main/java/net/blay09/mods/fertilization/fabric/datagen/ModModelProvider.java
@@ -1,11 +1,11 @@
 package net.blay09.mods.fertilization.fabric.datagen;
 
 import net.blay09.mods.fertilization.item.ModItems;
+import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
-import net.minecraft.data.models.BlockModelGenerators;
-import net.minecraft.data.models.ItemModelGenerators;
-import net.minecraft.data.models.model.ModelTemplates;
+import net.minecraft.client.data.models.BlockModelGenerators;
+import net.minecraft.client.data.models.ItemModelGenerators;
+import net.minecraft.client.data.models.model.ModelTemplates;
 
 
 public class ModModelProvider extends FabricModelProvider {

diff --git a/fabric/src/main/java/net/blay09/mods/fertilization/fabric/datagen/ModRecipeProvider.java b/fabric/src/main/java/net/blay09/mods/fertilization/fabric/datagen/ModRecipeProvider.java
@@ -42,7 +42,7 @@ public void buildRecipes() {
                         .pattern("BF")
                         .pattern("FB")
                         .define('B', Items.BONE_MEAL)
-                        .define('F', ItemTags.FLOWERS)
+                        .define('F', ItemTags.SMALL_FLOWERS)
                         .unlockedBy("has_bone_meal", has(Items.BONE_MEAL))
                         .save(exporter);
             }