Merge Cactus-Blocks-and-Items branch into master

src/main/generated/.cache/3fe9b30c894751c497a98020ef04964100127e4d

@@ -0,0 +1,62 @@
+// 1.21	2024-11-23T11:17:53.6283888	Rafael's Useful Cactus/Model Definitions
+0560fb62cf6222c95dbb8b35b6c80aaf33fd5c06 assets\rafaels-useful-cactus\models\block\cactus_slab.json
+458aafe7a8a3e14f0c50a96e8fc91ccb71f20553 assets\rafaels-useful-cactus\models\block\cactus_door_top_left.json
+dd8acaab4e4e1351871d6b78da7d3500b709e0e3 assets\rafaels-useful-cactus\models\block\dried_cactus.json
+98c2e8884c0e19fb5bbea06cd9d620e9eaf8f92c assets\rafaels-useful-cactus\models\block\cactus_door_top_right_open.json
+36859b6246246e94ab9f7a3526c317f789941b20 assets\rafaels-useful-cactus\models\item\cactus_skin.json
+709420df78c4c5508177206e6f146f034494625c assets\rafaels-useful-cactus\models\block\cactus_trapdoor_top.json
+e75e12765b04a46550f720ef33310eb262af22a4 assets\rafaels-useful-cactus\models\item\cactus_trapdoor.json
+7cf88f07be1e2c8492fd70b0135582edd976ee60 assets\rafaels-useful-cactus\models\block\cactus_trapdoor_open.json
+7f06c33adedcdd38918e74551ac2d96fc7128469 assets\rafaels-useful-cactus\models\block\cactus_button_pressed.json
+b98ca7a56cef2ab19a4ab37c5af4fb0c51c91d3b assets\rafaels-useful-cactus\models\item\cactus_planks.json
+2a7a8bd311bb917e5e501d42bd6d39df462b4da6 assets\rafaels-useful-cactus\models\item\cactus_sword.json
+3373a2509745bb8e1cd8209e72061f0bff4ce14c assets\rafaels-useful-cactus\blockstates\cactus_door.json
+bf5b9d5ffb43912c8fe1c77b56db0b3bb0d41e83 assets\rafaels-useful-cactus\blockstates\cactus_slab.json
+a75d316c91d17093406f38b6516229afe08f3228 assets\rafaels-useful-cactus\models\block\cactus_button_inventory.json
+7823e4b9f8c796147fa56c9b68158be1ad4b2d1f assets\rafaels-useful-cactus\models\block\cactus_button.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
+535e99807933721f0ba90751ba8c3fe2a0285537 assets\rafaels-useful-cactus\models\block\dried_cactus_horizontal.json
+652e68cb600ed2bf02358255534baf1ab42f2bf5 assets\rafaels-useful-cactus\models\block\cactus_pressure_plate_down.json
+99cbbfb80f4e29a90e57f240bca9ea6a0027c1ae assets\rafaels-useful-cactus\models\item\cactus_axe.json
+90fd52d3c30df69f3c2dc70403002e22d123a9c7 assets\rafaels-useful-cactus\models\block\cactus_fence_post.json
+ecba60a4130d32dce005657373ba197fa30406b2 assets\rafaels-useful-cactus\blockstates\dried_cactus.json
+8a020951a065384e79326728148c046cc28b5d7b assets\rafaels-useful-cactus\models\item\cactus_pickaxe.json
+352f1be5ff575ef18d436d033a012e09e6c1cb23 assets\rafaels-useful-cactus\models\block\cactus_door_bottom_left.json
+5c6b19007cd0523a68f5a94f75ac8b92ea9cd5b4 assets\rafaels-useful-cactus\blockstates\cactus_button.json
+9a2d62690afe77fa943873de57cbc5d583b00d2a assets\rafaels-useful-cactus\models\item\cactus_fence.json
+732bc81b7facc16b1c17724c90ea1d72d59a3d28 assets\rafaels-useful-cactus\models\item\cactus_pressure_plate.json
+f5f371c32bff9cb47e13a11b6cc062ace7e73d29 assets\rafaels-useful-cactus\models\block\cactus_pressure_plate.json
+d97533d8f555fffe56bd31f03921707dbf7f40ef assets\rafaels-useful-cactus\models\block\cactus_slab_top.json
+7edd1320865f5417afdbabc6d774152854ba9e91 assets\rafaels-useful-cactus\models\item\cactus_shovel.json
+d09087c625458692aab164551dae073d58ff2dfc assets\rafaels-useful-cactus\models\block\stripped_cactus_horizontal.json
+cd80ec24d9fb88b9f2e3c137402fda427bdc38d5 assets\rafaels-useful-cactus\models\block\cactus_fence_gate_wall.json
+f2d0de6790bcc9345755dde9f38adeb6a3f1250b assets\rafaels-useful-cactus\models\item\dried_cactus.json
+c9e8fca07bd354889b6de9de2b3081a7a4f42fcd assets\rafaels-useful-cactus\models\item\cactus_door.json
+8ec5c420c868a64c8f4f95b21778d911b7c81121 assets\rafaels-useful-cactus\models\block\stripped_cactus.json
+cfb33a7a83f031cfdae21a0fafa7592e411d46e3 assets\rafaels-useful-cactus\blockstates\cactus_stairs.json
+946f7ef53f6b7fe70d101174993150faffd7a5ef assets\rafaels-useful-cactus\models\item\cactus_button.json
+d1f75f14ed64e638a8f9f45eae8e68bcf3455a55 assets\rafaels-useful-cactus\blockstates\cactus_pressure_plate.json
+af0dce00cadcfef1fdff927c181f48be6c1257d1 assets\rafaels-useful-cactus\models\block\cactus_stairs_inner.json
+83311c905a5c30e15aab1e217b08112774e6e876 assets\rafaels-useful-cactus\models\block\cactus_fence_gate_wall_open.json
+9aca077d225e855905e0bf07b3c2ca971eada5c3 assets\rafaels-useful-cactus\models\item\cactus_stairs.json
+94a2188c948114a5da7376dc1b634d068c99b30f assets\rafaels-useful-cactus\models\block\cactus_planks.json
+552f667cab75618c30b90b8cc95f2a88dc8f1ef3 assets\rafaels-useful-cactus\models\block\cactus_fence_gate.json
+92bea8330f8cc75be4f40d7f77d314ec265a46c3 assets\rafaels-useful-cactus\models\block\cactus_stairs.json
+96257fc8a78808b66e8c7dfb3760cd1a7b1a69ee assets\rafaels-useful-cactus\models\block\cactus_fence_side.json
+76e8884c7a3254ea9f102820fec9ddc06cc864f3 assets\rafaels-useful-cactus\models\item\cactus_hoe.json
+bd1435d35dec60df41775b19eb40f68f2967de0e assets\rafaels-useful-cactus\models\block\cactus_door_bottom_right_open.json
+d0ac2be3a476326ed497d7afa72974757b52e7e3 assets\rafaels-useful-cactus\models\item\stripped_cactus.json
+c02a2c4a7881c141b2f8f388192cb2a5f332c1d6 assets\rafaels-useful-cactus\models\block\cactus_door_bottom_left_open.json
+dd3a60975e2631ab44d2d894af4a3d96dc882bcf assets\rafaels-useful-cactus\models\item\cactus_fence_gate.json
+a8f5f44beefe6596cd59240a17b5badc74faaf79 assets\rafaels-useful-cactus\blockstates\cactus_trapdoor.json
+44618fa690430416ff56c4441b5bd32a2cefffc7 assets\rafaels-useful-cactus\models\block\cactus_door_top_left_open.json
+9117ea5b8fd420f987c256bae9db22595a07eb03 assets\rafaels-useful-cactus\models\block\cactus_fence_gate_open.json
+f939e79ed7426c73781bd906f293951ea7ce50f9 assets\rafaels-useful-cactus\blockstates\cactus_fence_gate.json
+409d3cdce9dea0972f09099c19b71c24d3432ea9 assets\rafaels-useful-cactus\blockstates\cactus_planks.json
+f670ac2bbeed4e16451a2af4bc5cb49e0b966507 assets\rafaels-useful-cactus\models\item\cactus_slab.json
+a7e12fff71ebf24b53946984ef8523bb375b8992 assets\rafaels-useful-cactus\models\block\cactus_door_bottom_right.json
+e57fe49173cb190b6ce0e5ceed706c1c2ea03122 assets\rafaels-useful-cactus\models\block\cactus_door_top_right.json
+3501e4b3b037b8157e77450e2271c7bfbaba4575 assets\rafaels-useful-cactus\models\block\cactus_trapdoor_bottom.json
+7e9bf08c77f50ffeb71f99a00ae46cfddaf56b19 assets\rafaels-useful-cactus\models\block\cactus_stairs_outer.json

src/main/generated/.cache/6e2cd334150209f747708cbeb7262750c4682641

@@ -0,0 +1,5 @@
+// 1.21	2024-11-23T11:17:53.6319011	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
+453caa2f607a094632b9aabcb9cf3e189dad2a24 data\minecraft\tags\block\fences.json

src/main/generated/.cache/7a697913fca97eb5edb52716edfd638e99104f1b

@@ -0,0 +1,29 @@
+// 1.21	2024-11-23T11:17:53.6329111	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
+9770862056fe87182e2a0bc140c9108fef70627d data\rafaels-useful-cactus\advancement\recipes\tools\cactus_axe.json
+2ab699d7ef47b221ae81fd907aef4fee0dc9a58b data\rafaels-useful-cactus\advancement\recipes\building_blocks\cactus_slab.json
+5c66146f45a73b6a3f9e523c8e6658e3bf3c4beb data\rafaels-useful-cactus\advancement\recipes\building_blocks\green_dye.json
+ea401c1bc21bc253ef72e3a5657f0723526c9f49 data\rafaels-useful-cactus\advancement\recipes\redstone\cactus_fence_gate.json
+bb277c954a606b26d891c2f6d5723e019fd00afd data\rafaels-useful-cactus\advancement\recipes\decorations\cactus_fence.json
+6551abf41e385490ad98d20e0353c3858673a84e data\rafaels-useful-cactus\recipe\green_dye.json
+e833b06a5d00426984b4b71a86471d5e82931272 data\rafaels-useful-cactus\recipe\cactus_axe.json
+33e4cdd25e1b5ce7af8c3accf0a25fe0e1d02599 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
+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
+511dbbf929f8ad9f22e41340d3828fbf2639d46b data\rafaels-useful-cactus\advancement\recipes\tools\cactus_shovel.json
+be472f97b255c8f3623cedc1d66ce4bc51a29f2d data\rafaels-useful-cactus\recipe\cactus_shovel.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
+080ec295080f1c11cabc68181ae631ab3dc4091a data\rafaels-useful-cactus\recipe\cactus_slab.json

src/main/generated/.cache/b5f6108e2496f4ebc1cd6231d694880bf0c853c0

@@ -0,0 +1,8 @@
+// 1.21	2024-11-23T11:17:53.6273897	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
+dd3b95a208d97cc381c3481b0cdb461ac7801e5a data\minecraft\tags\item\hoes.json
+615d09e6f281f5b0af72a597a99eff150b75e1d4 data\minecraft\tags\item\pickaxes.json
+0685a1436bdad4897b6381f597bcbd4787ad3147 data\minecraft\tags\item\shovels.json
+75a257801e246f0223c82e6967879404a9ff8a40 data\minecraft\tags\item\axes.json

src/main/generated/.cache/e159df37fe64af491d1c8d79f9828e59bbd7b65d

@@ -0,0 +1,12 @@
+// 1.21	2024-11-23T11:17:53.6253785	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
+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
+571953427042fdf3b362d79f168639a916f9ac81 data\rafaels-useful-cactus\loot_table\blocks\cactus_door.json
+c9dac28541a5d262f8660e42a9a84369f7a2d1b1 data\rafaels-useful-cactus\loot_table\blocks\cactus_pressure_plate.json
+f562301f747e588b214ee2b8935e18b6d151e386 data\rafaels-useful-cactus\loot_table\blocks\cactus_slab.json
+a1d6c8e8f295de2e75f4657753deb21cada4d64e data\rafaels-useful-cactus\loot_table\blocks\cactus_planks.json

src/main/generated/assets/rafaels-useful-cactus/blockstates/cactus_button.json

@@ -0,0 +1,118 @@
+{
+  "variants": {
+    "face=ceiling,facing=east,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=east,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=north,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=north,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=south,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "x": 180
+    },
+    "face=ceiling,facing=south,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "x": 180
+    },
+    "face=ceiling,facing=west,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "x": 180,
+      "y": 90
+    },
+    "face=ceiling,facing=west,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "x": 180,
+      "y": 90
+    },
+    "face=floor,facing=east,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "y": 90
+    },
+    "face=floor,facing=east,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "y": 90
+    },
+    "face=floor,facing=north,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button"
+    },
+    "face=floor,facing=north,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed"
+    },
+    "face=floor,facing=south,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "y": 180
+    },
+    "face=floor,facing=south,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "y": 180
+    },
+    "face=floor,facing=west,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "y": 270
+    },
+    "face=floor,facing=west,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "y": 270
+    },
+    "face=wall,facing=east,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=east,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=north,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "uvlock": true,
+      "x": 90
+    },
+    "face=wall,facing=north,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "uvlock": true,
+      "x": 90
+    },
+    "face=wall,facing=south,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=south,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=west,powered=false": {
+      "model": "rafaels-useful-cactus:block/cactus_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 270
+    },
+    "face=wall,facing=west,powered=true": {
+      "model": "rafaels-useful-cactus:block/cactus_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 270
+    }
+  }
+}