Recipes Updated and Icon Fixed

rafaelmehdiyev · Dec 8, 2024 · 866092f · 866092f
1 parent 287f14d
commit 866092f
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 41 deletions.
diff --git a/src/main/generated/.cache/3fe9b30c894751c497a98020ef04964100127e4d b/src/main/generated/.cache/3fe9b30c894751c497a98020ef04964100127e4d
@@ -1,4 +1,4 @@
-// 1.21	2024-11-25T14:19:00.8077084	Rafael's Useful Cactus/Model Definitions
+// 1.21	2024-12-08T14:38:14.6433609	Rafael's Useful Cactus/Model Definitions
 24d3625bb648776f42d6c51f19a5cbab1d94e495 assets\rafaels-useful-cactus\models\item\cactus_helmet_gold_trim.json
 458aafe7a8a3e14f0c50a96e8fc91ccb71f20553 assets\rafaels-useful-cactus\models\block\cactus_door_top_left.json
 98c2e8884c0e19fb5bbea06cd9d620e9eaf8f92c assets\rafaels-useful-cactus\models\block\cactus_door_top_right_open.json
@@ -9,8 +9,8 @@ b98ca7a56cef2ab19a4ab37c5af4fb0c51c91d3b assets\rafaels-useful-cactus\models\ite
 3373a2509745bb8e1cd8209e72061f0bff4ce14c assets\rafaels-useful-cactus\blockstates\cactus_door.json
 a75d316c91d17093406f38b6516229afe08f3228 assets\rafaels-useful-cactus\models\block\cactus_button_inventory.json
 c98cbdf4e2aacafe3de775dd63c4b2b332509041 assets\rafaels-useful-cactus\models\block\cactus_fence_inventory.json
-c04b860718f16f40e4959c0fa82ee42e994f2d80 assets\rafaels-useful-cactus\blockstates\stripped_cactus.json
 5ba1cae16553b7123737d18617e282d3b7356520 assets\rafaels-useful-cactus\blockstates\cactus_fence.json
+c04b860718f16f40e4959c0fa82ee42e994f2d80 assets\rafaels-useful-cactus\blockstates\stripped_cactus.json
 99cbbfb80f4e29a90e57f240bca9ea6a0027c1ae assets\rafaels-useful-cactus\models\item\cactus_axe.json
 90fd52d3c30df69f3c2dc70403002e22d123a9c7 assets\rafaels-useful-cactus\models\block\cactus_fence_post.json
 04fb4109ce387758864ec5e2ae88df1aa4b29b4a assets\rafaels-useful-cactus\models\item\cactus_chestplate_copper_trim.json
@@ -50,8 +50,8 @@ f939e79ed7426c73781bd906f293951ea7ce50f9 assets\rafaels-useful-cactus\blockstate
 409d3cdce9dea0972f09099c19b71c24d3432ea9 assets\rafaels-useful-cactus\blockstates\cactus_planks.json
 399bec571e1f5e08add91800153f91c71c7579b1 assets\rafaels-useful-cactus\models\item\cactus_hammer.json
 b9943f526e90e7d2ea4a2ceb2b85d75010c18757 assets\rafaels-useful-cactus\models\item\cactus_chestplate_quartz_trim.json
-e5e5fd5be0c2783c5c6f1ab964e32ed101a5548f assets\rafaels-useful-cactus\models\item\cactus_leggings_netherite_trim.json
 9f982a986bd9ee32382ef5028006a4eed3814c0a assets\rafaels-useful-cactus\models\item\cactus_helmet_quartz_trim.json
+e5e5fd5be0c2783c5c6f1ab964e32ed101a5548f assets\rafaels-useful-cactus\models\item\cactus_leggings_netherite_trim.json
 fcceaec18dcde563b5852734c79c63d90678fc1c assets\rafaels-useful-cactus\models\item\cactus_chestplate_amethyst_trim.json
 c4777893516ae0f2ab872a5f4cfbd1e4f2eb5d9d assets\rafaels-useful-cactus\models\item\cactus_boots_lapis_trim.json
 b3c370433c215fe67d12f3bfabb3fc535760d4c0 assets\rafaels-useful-cactus\models\item\cactus_chestplate_lapis_trim.json

diff --git a/src/main/generated/.cache/6e2cd334150209f747708cbeb7262750c4682641 b/src/main/generated/.cache/6e2cd334150209f747708cbeb7262750c4682641
@@ -1,4 +1,4 @@
-// 1.21	2024-11-25T14:19:00.8126236	Rafael's Useful Cactus/Tags for minecraft:block
+// 1.21	2024-12-08T14:38:14.6459423	Rafael's Useful Cactus/Tags for minecraft:block
 1b11824111f555243f170b02c2bf1426799c23e7 data\minecraft\tags\block\logs_that_burn.json
 33df4dca4032dfb943a3c55f82cfdb69db8c796c data\minecraft\tags\block\fence_gates.json
 48a5eead7c4ebee35d993ca6ba3a889bb93c3d5b data\rafaels-useful-cactus\tags\block\incorrect_for_cactus_tool.json

diff --git a/src/main/generated/.cache/7a697913fca97eb5edb52716edfd638e99104f1b b/src/main/generated/.cache/7a697913fca97eb5edb52716edfd638e99104f1b
@@ -1,12 +1,12 @@
-// 1.21	2024-11-25T14:19:00.8136316	Rafael's Useful Cactus/Recipes
+// 1.21	2024-12-08T14:38:14.6459423	Rafael's Useful Cactus/Recipes
 c95038d2f92cee85fd31cfb2372ce629e3144c09 data\rafaels-useful-cactus\recipe\cactus_fence_gate.json
 0082270da7d4726fd0cd94419ae29e89d56e5c92 data\rafaels-useful-cactus\advancement\recipes\tools\cactus_pickaxe.json
 e79a6100184d82340fe870bb7501ad0b351b82c9 data\rafaels-useful-cactus\recipe\cactus_fence.json
 ef38637ef2d3c1070b766b8f0d5f5f04dae24472 data\rafaels-useful-cactus\advancement\recipes\redstone\cactus_door.json
 c84458a9c49482c8cf837540e1b848db98e2dd5f data\rafaels-useful-cactus\advancement\recipes\combat\cactus_sword.json
 bd190e032b89874f445e5b534631d0157b65feee data\rafaels-useful-cactus\recipe\cactus_planks.json
 47468a4bc0d4accd3b3745a64984edbe6ea55829 data\rafaels-useful-cactus\recipe\cactus_button.json
-dcbfb6f5db8049a8fde3545b183db89eec612468 data\rafaels-useful-cactus\recipe\cactus_sword.json
+d0c6e496a4ec3b1e81a79f6ea5abc9f61757f39b data\rafaels-useful-cactus\recipe\cactus_sword.json
 0da0af1bae692586bc969f238a102b607b887dea data\rafaels-useful-cactus\recipe\cactus_leggings.json
 9770862056fe87182e2a0bc140c9108fef70627d data\rafaels-useful-cactus\advancement\recipes\tools\cactus_axe.json
 2ab699d7ef47b221ae81fd907aef4fee0dc9a58b data\rafaels-useful-cactus\advancement\recipes\building_blocks\cactus_slab.json
@@ -17,20 +17,20 @@ a6da78bbda2a2855567e25770ac766ebe370ba82 data\rafaels-useful-cactus\advancement\
 bb277c954a606b26d891c2f6d5723e019fd00afd data\rafaels-useful-cactus\advancement\recipes\decorations\cactus_fence.json
 6551abf41e385490ad98d20e0353c3858673a84e data\rafaels-useful-cactus\recipe\green_dye.json
 c3b368a0e1a8c73c917a4628db8c2ce40d3a2a6b data\rafaels-useful-cactus\recipe\cactus_boots.json
-e833b06a5d00426984b4b71a86471d5e82931272 data\rafaels-useful-cactus\recipe\cactus_axe.json
-33e4cdd25e1b5ce7af8c3accf0a25fe0e1d02599 data\rafaels-useful-cactus\recipe\cactus_hoe.json
+a59af05154ef2be3b70f714634f9cabb6b774a67 data\rafaels-useful-cactus\recipe\cactus_axe.json
+91d03787c837a01cdacf6c8177690e5aba75addf data\rafaels-useful-cactus\recipe\cactus_hoe.json
 ba65ffd9b39b3d16e811bdc705ad435115c3e00f data\rafaels-useful-cactus\advancement\recipes\building_blocks\cactus_planks.json
-0310214e3f1d8f9bee8122d4e7a2343719a68051 data\rafaels-useful-cactus\recipe\cactus_pickaxe.json
+3fde8ecfe7990af5ec1221e7a4eb1c5691be97f4 data\rafaels-useful-cactus\recipe\cactus_pickaxe.json
 d736d14e8e74f140a93ae3448de6513ef862f0c2 data\rafaels-useful-cactus\advancement\recipes\redstone\cactus_pressure_plate.json
 f1ca7bc69ff1b0437daf752bb7574d3376c0dd1a data\rafaels-useful-cactus\recipe\cactus_trapdoor.json
 6a3504b3f085e9fa1b98524d8610112910638b42 data\rafaels-useful-cactus\recipe\cactus_door.json
 283950975b67dcf1c5d1afc1b0bb53470e55a9f8 data\rafaels-useful-cactus\advancement\recipes\redstone\cactus_button.json
 1d46f4e0a65d18cc0e52f32ae22142bce3a411b2 data\rafaels-useful-cactus\advancement\recipes\combat\cactus_chestplate.json
 289470c4b8290dc4ba31e686f5599113312b3e66 data\rafaels-useful-cactus\recipe\cactus_chestplate.json
 511dbbf929f8ad9f22e41340d3828fbf2639d46b data\rafaels-useful-cactus\advancement\recipes\tools\cactus_shovel.json
-be472f97b255c8f3623cedc1d66ce4bc51a29f2d data\rafaels-useful-cactus\recipe\cactus_shovel.json
+0b3fc4349c7fad9691a83fd3bdef61d8867b9bd1 data\rafaels-useful-cactus\recipe\cactus_shovel.json
 217e3c02140455ff77e29c4931b2de93d66ef667 data\rafaels-useful-cactus\advancement\recipes\tools\cactus_hammer.json
-a4e2cb23f187264bb373c6e0a9358b54fac0c67c data\rafaels-useful-cactus\recipe\cactus_hammer.json
+fd02b03e883b4a39eafa8f916dfa767f2dead73d data\rafaels-useful-cactus\recipe\cactus_hammer.json
 4ec78e60333cf7397cb338c354928d8d13f755c1 data\rafaels-useful-cactus\advancement\recipes\redstone\cactus_trapdoor.json
 c9e4da4d9f9297ee62db5f5e36494f54132eafb1 data\rafaels-useful-cactus\advancement\recipes\tools\cactus_hoe.json
 521af39000705195769eb7d9c98440678ac1bc2f data\rafaels-useful-cactus\recipe\cactus_pressure_plate.json

diff --git a/src/main/generated/.cache/b5f6108e2496f4ebc1cd6231d694880bf0c853c0 b/src/main/generated/.cache/b5f6108e2496f4ebc1cd6231d694880bf0c853c0
@@ -1,4 +1,4 @@
-// 1.21	2024-11-25T14:19:00.8046508	Rafael's Useful Cactus/Tags for minecraft:item
+// 1.21	2024-12-08T14:38:14.6423614	Rafael's Useful Cactus/Tags for minecraft:item
 1b11824111f555243f170b02c2bf1426799c23e7 data\minecraft\tags\item\logs_that_burn.json
 f704219fabe59db1a5422132658ac3ae79e2f7bf data\minecraft\tags\item\swords.json
 8ea813711c272376b3ae5bc7a56820da4d261ceb data\minecraft\tags\item\planks.json

diff --git a/src/main/generated/.cache/e159df37fe64af491d1c8d79f9828e59bbd7b65d b/src/main/generated/.cache/e159df37fe64af491d1c8d79f9828e59bbd7b65d
@@ -1,4 +1,4 @@
-// 1.21	2024-11-25T14:19:00.8035283	Rafael's Useful Cactus/Block Loot Tables
+// 1.21	2024-12-08T14:38:14.6413539	Rafael's Useful Cactus/Block Loot Tables
 f53bc992bcde86b40c3e75de659beaeb44ee5070 data\rafaels-useful-cactus\loot_table\blocks\cactus_button.json
 460986b841e23a1a2a050d4dbd1a1882b2c1c4bb data\rafaels-useful-cactus\loot_table\blocks\cactus_fence_gate.json
 b59f82035469dd1bb02777825644f6b80badd940 data\rafaels-useful-cactus\loot_table\blocks\stripped_cactus.json

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_axe.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_axe.json
@@ -3,16 +3,19 @@
   "category": "equipment",
   "key": {
     "C": {
+      "item": "rafaels-useful-cactus:cactus_planks"
+    },
+    "P": {
       "item": "rafaels-useful-cactus:cactus_skin"
     },
     "S": {
       "item": "minecraft:stick"
     }
   },
   "pattern": [
-    "CC ",
+    "CCP",
     "CS ",
-    " S "
+    "PS "
   ],
   "result": {
     "count": 1,

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_hammer.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_hammer.json
@@ -5,13 +5,16 @@
     "C": {
       "item": "rafaels-useful-cactus:cactus_skin"
     },
+    "P": {
+      "item": "rafaels-useful-cactus:cactus_planks"
+    },
     "S": {
       "item": "minecraft:stick"
     }
   },
   "pattern": [
-    "CCC",
-    "CCC",
+    "PCP",
+    "PCP",
     " S "
   ],
   "result": {

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_hoe.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_hoe.json
@@ -5,13 +5,16 @@
     "#": {
       "item": "minecraft:stick"
     },
-    "X": {
+    "P": {
       "item": "rafaels-useful-cactus:cactus_skin"
+    },
+    "X": {
+      "item": "rafaels-useful-cactus:cactus_planks"
     }
   },
   "pattern": [
-    "XX ",
-    " # ",
+    "XXP",
+    "P# ",
     " # "
   ],
   "result": {

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_pickaxe.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_pickaxe.json
@@ -3,6 +3,9 @@
   "category": "equipment",
   "key": {
     "C": {
+      "item": "rafaels-useful-cactus:cactus_planks"
+    },
+    "P": {
       "item": "rafaels-useful-cactus:cactus_skin"
     },
     "S": {
@@ -11,7 +14,7 @@
   },
   "pattern": [
     "CCC",
-    " S ",
+    "PSP",
     " S "
   ],
   "result": {

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_shovel.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_shovel.json
@@ -3,14 +3,17 @@
   "category": "equipment",
   "key": {
     "C": {
+      "item": "rafaels-useful-cactus:cactus_planks"
+    },
+    "P": {
       "item": "rafaels-useful-cactus:cactus_skin"
     },
     "S": {
       "item": "minecraft:stick"
     }
   },
   "pattern": [
-    " C ",
+    "PCP",
     " S ",
     " S "
   ],

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_sword.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_sword.json
@@ -5,13 +5,16 @@
     "C": {
       "item": "rafaels-useful-cactus:cactus_skin"
     },
+    "P": {
+      "item": "rafaels-useful-cactus:cactus_planks"
+    },
     "S": {
       "item": "minecraft:stick"
     }
   },
   "pattern": [
-    " C ",
-    " C ",
+    " P ",
+    "CPC",
     " S "
   ],
   "result": {

diff --git a/src/main/java/net/rafael/usefulcactus/datagen/ModRecipeProvider.java b/src/main/java/net/rafael/usefulcactus/datagen/ModRecipeProvider.java
@@ -1,5 +1,7 @@
 package net.rafael.usefulcactus.datagen;
 
+import java.util.concurrent.CompletableFuture;
+
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.data.server.recipe.RecipeExporter;
@@ -11,8 +13,6 @@
 import net.rafael.usefulcactus.block.ModBlocks;
 import net.rafael.usefulcactus.item.ModItems;
 
-import java.util.concurrent.CompletableFuture;
-
 public class ModRecipeProvider extends FabricRecipeProvider {
     public ModRecipeProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
         super(output, registriesFuture);
@@ -89,55 +89,61 @@ public void generate(RecipeExporter recipeExporter) {
 
         // Cactus Tool Recipes
         ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, ModItems.CACTUS_SWORD)
-                .pattern(" C ")
-                .pattern(" C ")
+                .pattern(" P ")
+                .pattern("CPC")
                 .pattern(" S ")
                 .input('C', ModItems.CACTUS_SKIN)
+                .input('P', ModBlocks.CACTUS_PLANKS)
                 .input('S', Items.STICK)
                 .criterion(hasItem(ModItems.CACTUS_SKIN), conditionsFromItem(ModItems.CACTUS_SKIN))
                 .offerTo(recipeExporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, ModItems.CACTUS_PICKAXE)
                 .pattern("CCC")
+                .pattern("PSP")
                 .pattern(" S ")
-                .pattern(" S ")
-                .input('C', ModItems.CACTUS_SKIN)
+                .input('P', ModItems.CACTUS_SKIN)
+                .input('C', ModBlocks.CACTUS_PLANKS)
                 .input('S', Items.STICK)
                 .criterion(hasItem(ModItems.CACTUS_SKIN), conditionsFromItem(ModItems.CACTUS_SKIN))
                 .offerTo(recipeExporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, ModItems.CACTUS_AXE)
-                .pattern("CC ")
+                .pattern("CCP")
                 .pattern("CS ")
-                .pattern(" S ")
-                .input('C', ModItems.CACTUS_SKIN)
+                .pattern("PS ")
+                .input('P', ModItems.CACTUS_SKIN)
+                .input('C', ModBlocks.CACTUS_PLANKS)
                 .input('S', Items.STICK)
                 .criterion(hasItem(ModItems.CACTUS_SKIN), conditionsFromItem(ModItems.CACTUS_SKIN))
                 .offerTo(recipeExporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, ModItems.CACTUS_SHOVEL)
-                .pattern(" C ")
+                .pattern("PCP")
                 .pattern(" S ")
                 .pattern(" S ")
-                .input('C', ModItems.CACTUS_SKIN)
+                .input('P', ModItems.CACTUS_SKIN)
+                .input('C', ModBlocks.CACTUS_PLANKS)
                 .input('S', Items.STICK)
                 .criterion(hasItem(ModItems.CACTUS_SKIN), conditionsFromItem(ModItems.CACTUS_SKIN))
                 .offerTo(recipeExporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, ModItems.CACTUS_HOE)
-                .pattern("XX ")
+                .pattern("XXP")
+                .pattern("P# ")
                 .pattern(" # ")
-                .pattern(" # ")
-                .input('X', ModItems.CACTUS_SKIN)
+                .input('P', ModItems.CACTUS_SKIN)
+                .input('X', ModBlocks.CACTUS_PLANKS)
                 .input('#', Items.STICK)
                 .criterion(hasItem(ModItems.CACTUS_SKIN), conditionsFromItem(ModItems.CACTUS_SKIN))
                 .offerTo(recipeExporter);
 
         ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, ModItems.CACTUS_HAMMER)
-                .pattern("CCC")
-                .pattern("CCC")
+                .pattern("PCP")
+                .pattern("PCP")
                 .pattern(" S ")
                 .input('C', ModItems.CACTUS_SKIN)
+                .input('P', ModBlocks.CACTUS_PLANKS)
                 .input('S', Items.STICK)
                 .criterion(hasItem(ModItems.CACTUS_SKIN), conditionsFromItem(ModItems.CACTUS_SKIN))
                 .offerTo(recipeExporter);

diff --git a/src/main/resources/assets/rafaels-useful-cactus/icon.gif b/src/main/resources/assets/rafaels-useful-cactus/icon.gif
diff --git a/src/main/resources/assets/rafaels-useful-cactus/icon.png b/src/main/resources/assets/rafaels-useful-cactus/icon.png
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -13,7 +13,7 @@
 		"sources": "https://github.com/rafaelmehdiyev/Useful-Cactus-Fabric-1.21.x"
 	},
 	"license": "MIT",
-	"icon": "assets/rafaels-useful-cactus/icon.gif",
+	"icon": "assets/rafaels-useful-cactus/icon.png",
 	"environment": "*",
 	"entrypoints": {
 		"fabric-datagen": [