Recipes Updated and Icon Fixed

rafaelmehdiyev · Dec 8, 2024 · 40ee6f2 · 40ee6f2
1 parent 1a1757f
commit 40ee6f2
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 46 deletions.
diff --git a/src/main/generated/.cache/3fe9b30c894751c497a98020ef04964100127e4d b/src/main/generated/.cache/3fe9b30c894751c497a98020ef04964100127e4d
@@ -1,4 +1,4 @@
-// 1.21.3	2024-12-08T03:30:13.0543652	Rafael's Useful Cactus/Model Definitions
+// 1.21.3	2024-12-08T16:08:59.8522134	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
-5ba1cae16553b7123737d18617e282d3b7356520 assets\rafaels-useful-cactus\blockstates\cactus_fence.json
 c04b860718f16f40e4959c0fa82ee42e994f2d80 assets\rafaels-useful-cactus\blockstates\stripped_cactus.json
+5ba1cae16553b7123737d18617e282d3b7356520 assets\rafaels-useful-cactus\blockstates\cactus_fence.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
@@ -61,8 +61,8 @@ a7e12fff71ebf24b53946984ef8523bb375b8992 assets\rafaels-useful-cactus\models\blo
 3501e4b3b037b8157e77450e2271c7bfbaba4575 assets\rafaels-useful-cactus\models\block\cactus_trapdoor_bottom.json
 7e9bf08c77f50ffeb71f99a00ae46cfddaf56b19 assets\rafaels-useful-cactus\models\block\cactus_stairs_outer.json
 0560fb62cf6222c95dbb8b35b6c80aaf33fd5c06 assets\rafaels-useful-cactus\models\block\cactus_slab.json
-c4d14663fa33a2fd3bf4ac3ae5191e7d8fab5a31 assets\rafaels-useful-cactus\models\item\cactus_leggings_lapis_trim.json
 dd8acaab4e4e1351871d6b78da7d3500b709e0e3 assets\rafaels-useful-cactus\models\block\dried_cactus.json
+c4d14663fa33a2fd3bf4ac3ae5191e7d8fab5a31 assets\rafaels-useful-cactus\models\item\cactus_leggings_lapis_trim.json
 7c4bf5005b8f3dd2d8b1e10d154e2bd213e8c0ec assets\rafaels-useful-cactus\models\item\cactus_helmet_netherite_trim.json
 5405f2a3efeda29a60d0cc5971b3a29304950b68 assets\rafaels-useful-cactus\models\item\cactus_chestplate.json
 c553fa4cfdcfed0bf7b4f20c053366dcdaffb1a4 assets\rafaels-useful-cactus\models\item\cactus_chestplate_emerald_trim.json
@@ -76,8 +76,8 @@ cc3047b9ed3e44d1a5b3cf3b6a7a0efd11f0d07f assets\rafaels-useful-cactus\models\ite
 bf5b9d5ffb43912c8fe1c77b56db0b3bb0d41e83 assets\rafaels-useful-cactus\blockstates\cactus_slab.json
 7823e4b9f8c796147fa56c9b68158be1ad4b2d1f assets\rafaels-useful-cactus\models\block\cactus_button.json
 547bc231be85356da929915b95c862593356a679 assets\rafaels-useful-cactus\models\item\cactus_boots_netherite_trim.json
-652e68cb600ed2bf02358255534baf1ab42f2bf5 assets\rafaels-useful-cactus\models\block\cactus_pressure_plate_down.json
 535e99807933721f0ba90751ba8c3fe2a0285537 assets\rafaels-useful-cactus\models\block\dried_cactus_horizontal.json
+652e68cb600ed2bf02358255534baf1ab42f2bf5 assets\rafaels-useful-cactus\models\block\cactus_pressure_plate_down.json
 8a020951a065384e79326728148c046cc28b5d7b assets\rafaels-useful-cactus\models\item\cactus_pickaxe.json
 352f1be5ff575ef18d436d033a012e09e6c1cb23 assets\rafaels-useful-cactus\models\block\cactus_door_bottom_left.json
 39acbdb854f028a64efa0e0e3234c1d4089df8e4 assets\rafaels-useful-cactus\models\item\cactus_leggings_diamond_trim.json

diff --git a/src/main/generated/.cache/6e2cd334150209f747708cbeb7262750c4682641 b/src/main/generated/.cache/6e2cd334150209f747708cbeb7262750c4682641
@@ -1,4 +1,4 @@
-// 1.21.3	2024-12-08T03:30:13.0624239	Rafael's Useful Cactus/Tags for minecraft:block
+// 1.21.3	2024-12-08T16:08:59.8572879	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/b5f6108e2496f4ebc1cd6231d694880bf0c853c0 b/src/main/generated/.cache/b5f6108e2496f4ebc1cd6231d694880bf0c853c0
@@ -1,4 +1,4 @@
-// 1.21.3	2024-12-08T03:30:13.0533543	Rafael's Useful Cactus/Tags for minecraft:item
+// 1.21.3	2024-12-08T16:08:59.8512022	Rafael's Useful Cactus/Tags for minecraft:item
 1b11824111f555243f170b02c2bf1426799c23e7 data\minecraft\tags\item\logs_that_burn.json
 8624d8dd098de02f38b817b021d7e6efdfdfec0e data\rafaels-useful-cactus\tags\item\cactus_repair.json
 f704219fabe59db1a5422132658ac3ae79e2f7bf data\minecraft\tags\item\swords.json

diff --git a/src/main/generated/.cache/e159df37fe64af491d1c8d79f9828e59bbd7b65d b/src/main/generated/.cache/e159df37fe64af491d1c8d79f9828e59bbd7b65d
@@ -1,8 +1,8 @@
-// 1.21.3	2024-12-08T03:30:13.0466076	Rafael's Useful Cactus/Block Loot Tables
+// 1.21.3	2024-12-08T16:08:59.8450089	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
 98a374ded47ee4a0584c33b757c37844cd5a65d8 data\rafaels-useful-cactus\loot_table\blocks\cactus_fence.json
+b59f82035469dd1bb02777825644f6b80badd940 data\rafaels-useful-cactus\loot_table\blocks\stripped_cactus.json
 8b56ebbba29363bcb9781a74722a41d2e9c9d6f5 data\rafaels-useful-cactus\loot_table\blocks\cactus_stairs.json
 6fda26d3cfc6d49e577325e6f517b96488bdcaea data\rafaels-useful-cactus\loot_table\blocks\dried_cactus.json
 d4d4ebd07a388ab3c0d30e5339cfa922f032382b data\rafaels-useful-cactus\loot_table\blocks\cactus_trapdoor.json

diff --git a/src/main/generated/.cache/e3512a1cbb26d540e5bb6e8484444237c0a81e97 b/src/main/generated/.cache/e3512a1cbb26d540e5bb6e8484444237c0a81e97
@@ -1,12 +1,12 @@
-// 1.21.3	2024-12-08T03:30:13.0496064	Rafael's Useful Cactus/Rafaels Useful Cactus Recipes
+// 1.21.3	2024-12-08T16:08:59.84902	Rafael's Useful Cactus/Rafaels Useful Cactus Recipes
 45f00f98de5f2995e91eef28f01b6107d767559e data\rafaels-useful-cactus\recipe\cactus_fence_gate.json
 0082270da7d4726fd0cd94419ae29e89d56e5c92 data\rafaels-useful-cactus\advancement\recipes\tools\cactus_pickaxe.json
 c35eb22649568dfaf1671f13067dbb1ee25cb99d 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
-b6378dd819949d44d48ecc18689e112c073f76f2 data\rafaels-useful-cactus\recipe\cactus_button.json
 44d98b318d99d0db48e790654daf35b5c6188986 data\rafaels-useful-cactus\recipe\cactus_planks.json
-856ea2164215a934c000a035184ad19645a2dbc8 data\rafaels-useful-cactus\recipe\cactus_sword.json
+b6378dd819949d44d48ecc18689e112c073f76f2 data\rafaels-useful-cactus\recipe\cactus_button.json
+f79c934cd64325b4d80a0caae0903117ae48b78d data\rafaels-useful-cactus\recipe\cactus_sword.json
 1f29e836fc261da659b0861ea469ec7e4cc06193 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
 859461361de32414b776152aff0e39fde10b0b4b data\rafaels-useful-cactus\recipe\green_dye.json
 72192432085121e328186160ca8d58dcbfeccbe6 data\rafaels-useful-cactus\recipe\cactus_boots.json
-43d34d184b23523f0bd14758231ad2295bae38d0 data\rafaels-useful-cactus\recipe\cactus_axe.json
-8e0c9396b868c25bb2fea8ddee6699d1b1c249f8 data\rafaels-useful-cactus\recipe\cactus_hoe.json
+2f4aa70236ccc59a60317eac29d6cca401a6e06a data\rafaels-useful-cactus\recipe\cactus_axe.json
+7e086704499a76881621e0be6ceda0d4f9fbecbb data\rafaels-useful-cactus\recipe\cactus_hoe.json
 ba65ffd9b39b3d16e811bdc705ad435115c3e00f data\rafaels-useful-cactus\advancement\recipes\building_blocks\cactus_planks.json
-be27e27c5ebc8312fb2fe63914ce06d4df89cb3c data\rafaels-useful-cactus\recipe\cactus_pickaxe.json
+81d5c185ed754a04b757c3091b0384bef030d255 data\rafaels-useful-cactus\recipe\cactus_pickaxe.json
 d736d14e8e74f140a93ae3448de6513ef862f0c2 data\rafaels-useful-cactus\advancement\recipes\redstone\cactus_pressure_plate.json
 5ce65090b928fbc0f81e741320c2958b683a0ee3 data\rafaels-useful-cactus\recipe\cactus_trapdoor.json
 0fefab5681bb690877629cb0fd66ce0bb9a4a394 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
 8fbfe7374581006e7878775614250a950b0f42a3 data\rafaels-useful-cactus\recipe\cactus_chestplate.json
 511dbbf929f8ad9f22e41340d3828fbf2639d46b data\rafaels-useful-cactus\advancement\recipes\tools\cactus_shovel.json
-ee435c3c42b8eeb5edd802954289ac84d49bbac6 data\rafaels-useful-cactus\recipe\cactus_shovel.json
+721f40fa8539021a75ab89acb792c35b64f0ecac data\rafaels-useful-cactus\recipe\cactus_shovel.json
 217e3c02140455ff77e29c4931b2de93d66ef667 data\rafaels-useful-cactus\advancement\recipes\tools\cactus_hammer.json
-95ff44348176781b210bb4a543141698273a419f data\rafaels-useful-cactus\recipe\cactus_hammer.json
+2582d60c9159accf8befa5922cc53aa6080ed40d 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
 c51e49afc64adf5538dac0a8c0ef3f5365f0cbab data\rafaels-useful-cactus\recipe\cactus_pressure_plate.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,12 +3,13 @@
   "category": "equipment",
   "key": {
     "C": "rafaels-useful-cactus:cactus_skin",
+    "P": "rafaels-useful-cactus:cactus_planks",
     "S": "minecraft:stick"
   },
   "pattern": [
-    "CC ",
-    "CS ",
-    " S "
+    "PPC",
+    "PS ",
+    "CS "
   ],
   "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
@@ -3,11 +3,12 @@
   "category": "equipment",
   "key": {
     "C": "rafaels-useful-cactus:cactus_skin",
+    "P": "rafaels-useful-cactus:cactus_planks",
     "S": "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
@@ -2,13 +2,14 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "#": "minecraft:stick",
-    "X": "rafaels-useful-cactus:cactus_skin"
+    "C": "rafaels-useful-cactus:cactus_skin",
+    "P": "rafaels-useful-cactus:cactus_planks",
+    "S": "minecraft:stick"
   },
   "pattern": [
-    "XX ",
-    " # ",
-    " # "
+    "PPC",
+    "CS ",
+    " S "
   ],
   "result": {
     "count": 1,

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,11 +3,12 @@
   "category": "equipment",
   "key": {
     "C": "rafaels-useful-cactus:cactus_skin",
+    "P": "rafaels-useful-cactus:cactus_planks",
     "S": "minecraft:stick"
   },
   "pattern": [
-    "CCC",
-    " S ",
+    "PPP",
+    "CSC",
     " 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,10 +3,11 @@
   "category": "equipment",
   "key": {
     "C": "rafaels-useful-cactus:cactus_skin",
+    "P": "rafaels-useful-cactus:cactus_planks",
     "S": "minecraft:stick"
   },
   "pattern": [
-    " C ",
+    "CPC",
     " 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
@@ -3,11 +3,12 @@
   "category": "equipment",
   "key": {
     "C": "rafaels-useful-cactus:cactus_skin",
+    "P": "rafaels-useful-cactus:cactus_planks",
     "S": "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
@@ -107,60 +107,66 @@ public void generate() {
 
                                 // Cactus Tool Recipes
                                 createShaped(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(exporter);
 
                                 createShaped(RecipeCategory.TOOLS, ModItems.CACTUS_PICKAXE)
-                                                .pattern("CCC")
-                                                .pattern(" S ")
+                                                .pattern("PPP")
+                                                .pattern("CSC")
                                                 .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(exporter);
 
                                 createShaped(RecipeCategory.TOOLS, ModItems.CACTUS_AXE)
-                                                .pattern("CC ")
+                                                .pattern("PPC")
+                                                .pattern("PS ")
                                                 .pattern("CS ")
-                                                .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(exporter);
 
                                 createShaped(RecipeCategory.TOOLS, ModItems.CACTUS_SHOVEL)
-                                                .pattern(" C ")
+                                                .pattern("CPC")
                                                 .pattern(" S ")
                                                 .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(exporter);
 
                                 createShaped(RecipeCategory.TOOLS, ModItems.CACTUS_HOE)
-                                                .pattern("XX ")
-                                                .pattern(" # ")
-                                                .pattern(" # ")
-                                                .input('X', ModItems.CACTUS_SKIN)
-                                                .input('#', Items.STICK)
+                                                .pattern("PPC")
+                                                .pattern("CS ")
+                                                .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(exporter);
 
                                 createShaped(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))
@@ -205,4 +211,4 @@ public void generate() {
 
                 };
         }
-}
+}
diff --git a/src/main/resources/assets/rafaels-useful-cactus/icon.png b/src/main/resources/assets/rafaels-useful-cactus/icon.png