Update to 1.21.2

rafaelmehdiyev · Dec 7, 2024 · d11fb9e · d11fb9e
1 parent 689d02d
commit d11fb9e
Show file tree

Hide file tree

Showing 50 changed files with 505 additions and 485 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,8 +4,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
+minecraft_version=1.21.2
+yarn_mappings=1.21.2+build.1
 loader_version=0.16.9
 
 # Mod Properties
@@ -14,4 +14,4 @@ maven_group=net.rafael.usefulcactus
 archives_base_name=rafaels-useful-cactus
 
 # Dependencies
-fabric_version=0.110.0+1.21.1
+fabric_version=0.106.0+1.21.2
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.2	2024-12-08T03:05:34.5836359	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

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.2	2024-12-08T03:05:34.5881584	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,5 +1,6 @@
-// 1.21	2024-11-25T14:19:00.8046508	Rafael's Useful Cactus/Tags for minecraft:item
+// 1.21.2	2024-12-08T03:05:34.5816375	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
 8ea813711c272376b3ae5bc7a56820da4d261ceb data\minecraft\tags\item\planks.json
 dd3b95a208d97cc381c3481b0cdb461ac7801e5a data\minecraft\tags\item\hoes.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.2	2024-12-08T03:05:34.5745933	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/.../7a697913fca97eb5edb52716edfd638e99104f1b → .../e3512a1cbb26d540e5bb6e8484444237c0a81e97 b/.../7a697913fca97eb5edb52716edfd638e99104f1b → .../e3512a1cbb26d540e5bb6e8484444237c0a81e97
@@ -1,39 +1,39 @@
-// 1.21	2024-11-25T14:19:00.8136316	Rafael's Useful Cactus/Recipes
-c95038d2f92cee85fd31cfb2372ce629e3144c09 data\rafaels-useful-cactus\recipe\cactus_fence_gate.json
+// 1.21.2	2024-12-08T03:05:34.5791146	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
-e79a6100184d82340fe870bb7501ad0b351b82c9 data\rafaels-useful-cactus\recipe\cactus_fence.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
-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
-0da0af1bae692586bc969f238a102b607b887dea data\rafaels-useful-cactus\recipe\cactus_leggings.json
+44d98b318d99d0db48e790654daf35b5c6188986 data\rafaels-useful-cactus\recipe\cactus_planks.json
+b6378dd819949d44d48ecc18689e112c073f76f2 data\rafaels-useful-cactus\recipe\cactus_button.json
+856ea2164215a934c000a035184ad19645a2dbc8 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
 5c66146f45a73b6a3f9e523c8e6658e3bf3c4beb data\rafaels-useful-cactus\advancement\recipes\building_blocks\green_dye.json
 a2029a5c0d1d1069a978221fbb6a6e79c63ad7d0 data\rafaels-useful-cactus\advancement\recipes\combat\cactus_helmet.json
 ea401c1bc21bc253ef72e3a5657f0723526c9f49 data\rafaels-useful-cactus\advancement\recipes\redstone\cactus_fence_gate.json
 a6da78bbda2a2855567e25770ac766ebe370ba82 data\rafaels-useful-cactus\advancement\recipes\combat\cactus_boots.json
 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
+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
 ba65ffd9b39b3d16e811bdc705ad435115c3e00f data\rafaels-useful-cactus\advancement\recipes\building_blocks\cactus_planks.json
-0310214e3f1d8f9bee8122d4e7a2343719a68051 data\rafaels-useful-cactus\recipe\cactus_pickaxe.json
+be27e27c5ebc8312fb2fe63914ce06d4df89cb3c 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
+5ce65090b928fbc0f81e741320c2958b683a0ee3 data\rafaels-useful-cactus\recipe\cactus_trapdoor.json
+fd8f74fbaa7008352bb9857e2c41f302aaf58e4c 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
+8fbfe7374581006e7878775614250a950b0f42a3 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
+ee435c3c42b8eeb5edd802954289ac84d49bbac6 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
+95ff44348176781b210bb4a543141698273a419f 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
-d9cf281b83e46d7d25ef221d61d181ccf38e7539 data\rafaels-useful-cactus\recipe\cactus_helmet.json
+c51e49afc64adf5538dac0a8c0ef3f5365f0cbab data\rafaels-useful-cactus\recipe\cactus_pressure_plate.json
+fe6e9c08e07cff3ee7d29c86a45c4c6f87a22ddb data\rafaels-useful-cactus\recipe\cactus_helmet.json
 d83d4733598200436c4f3c477e96972a7baf61c4 data\rafaels-useful-cactus\advancement\recipes\combat\cactus_leggings.json
-080ec295080f1c11cabc68181ae631ab3dc4091a data\rafaels-useful-cactus\recipe\cactus_slab.json
+b38f86569570dbe37071402c9bd717656757f140 data\rafaels-useful-cactus\recipe\cactus_slab.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
@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "C": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    },
-    "S": {
-      "item": "minecraft:stick"
-    }
+    "C": "rafaels-useful-cactus:cactus_skin",
+    "S": "minecraft:stick"
   },
   "pattern": [
     "CC ",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_boots.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_boots.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    }
+    "#": "rafaels-useful-cactus:cactus_skin"
   },
   "pattern": [
     "# #",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_button.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_button.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shapeless",
   "category": "redstone",
   "ingredients": [
-    {
-      "item": "rafaels-useful-cactus:cactus_planks"
-    }
+    "rafaels-useful-cactus:cactus_planks"
   ],
   "result": {
     "count": 1,

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_chestplate.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_chestplate.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    }
+    "#": "rafaels-useful-cactus:cactus_skin"
   },
   "pattern": [
     "# #",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_door.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_door.json
@@ -2,12 +2,9 @@
   "type": "minecraft:crafting_shaped",
   "category": "redstone",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_planks"
-    }
+    "#": "rafaels-useful-cactus:cactus_planks"
   },
   "pattern": [
-    "##",
     "##",
     "##"
   ],

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_fence.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_fence.json
@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_planks"
-    },
-    "|": {
-      "item": "minecraft:stick"
-    }
+    "#": "rafaels-useful-cactus:cactus_planks",
+    "|": "minecraft:stick"
   },
   "pattern": [
     "#|#",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_fence_gate.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_fence_gate.json
@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "redstone",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_planks"
-    },
-    "|": {
-      "item": "minecraft:stick"
-    }
+    "#": "rafaels-useful-cactus:cactus_planks",
+    "|": "minecraft:stick"
   },
   "pattern": [
     "|#|",

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
@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "C": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    },
-    "S": {
-      "item": "minecraft:stick"
-    }
+    "C": "rafaels-useful-cactus:cactus_skin",
+    "S": "minecraft:stick"
   },
   "pattern": [
     "CCC",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_helmet.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_helmet.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    }
+    "#": "rafaels-useful-cactus:cactus_skin"
   },
   "pattern": [
     "###",

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,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "#": {
-      "item": "minecraft:stick"
-    },
-    "X": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    }
+    "#": "minecraft:stick",
+    "X": "rafaels-useful-cactus:cactus_skin"
   },
   "pattern": [
     "XX ",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_leggings.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_leggings.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    }
+    "#": "rafaels-useful-cactus:cactus_skin"
   },
   "pattern": [
     "###",

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
@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "C": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    },
-    "S": {
-      "item": "minecraft:stick"
-    }
+    "C": "rafaels-useful-cactus:cactus_skin",
+    "S": "minecraft:stick"
   },
   "pattern": [
     "CCC",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_planks.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_planks.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shapeless",
   "category": "building",
   "ingredients": [
-    {
-      "item": "rafaels-useful-cactus:dried_cactus"
-    }
+    "rafaels-useful-cactus:dried_cactus"
   ],
   "result": {
     "count": 4,

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_pressure_plate.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_pressure_plate.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "redstone",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_planks"
-    }
+    "#": "rafaels-useful-cactus:cactus_planks"
   },
   "pattern": [
     "##"

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
@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "C": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    },
-    "S": {
-      "item": "minecraft:stick"
-    }
+    "C": "rafaels-useful-cactus:cactus_skin",
+    "S": "minecraft:stick"
   },
   "pattern": [
     " C ",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_slab.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_slab.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "building",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_planks"
-    }
+    "#": "rafaels-useful-cactus:cactus_planks"
   },
   "pattern": [
     "###"

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
@@ -2,12 +2,8 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "key": {
-    "C": {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    },
-    "S": {
-      "item": "minecraft:stick"
-    }
+    "C": "rafaels-useful-cactus:cactus_skin",
+    "S": "minecraft:stick"
   },
   "pattern": [
     " C ",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_trapdoor.json b/src/main/generated/data/rafaels-useful-cactus/recipe/cactus_trapdoor.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "redstone",
   "key": {
-    "#": {
-      "item": "rafaels-useful-cactus:cactus_planks"
-    }
+    "#": "rafaels-useful-cactus:cactus_planks"
   },
   "pattern": [
     "###",

diff --git a/src/main/generated/data/rafaels-useful-cactus/recipe/green_dye.json b/src/main/generated/data/rafaels-useful-cactus/recipe/green_dye.json
@@ -2,9 +2,7 @@
   "type": "minecraft:crafting_shapeless",
   "category": "building",
   "ingredients": [
-    {
-      "item": "rafaels-useful-cactus:cactus_skin"
-    }
+    "rafaels-useful-cactus:cactus_skin"
   ],
   "result": {
     "count": 1,

diff --git a/src/main/generated/data/rafaels-useful-cactus/tags/item/cactus_repair.json b/src/main/generated/data/rafaels-useful-cactus/tags/item/cactus_repair.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "rafaels-useful-cactus:cactus_skin"
+  ]
+}
diff --git a/src/main/java/net/rafael/usefulcactus/RafaelsUsefulCactus.java b/src/main/java/net/rafael/usefulcactus/RafaelsUsefulCactus.java
@@ -1,5 +1,8 @@
 package net.rafael.usefulcactus;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
 import net.rafael.usefulcactus.block.ModBlocks;
@@ -8,19 +11,17 @@
 import net.rafael.usefulcactus.item.ModItems;
 import net.rafael.usefulcactus.util.CactusHammerUsageEvent;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class RafaelsUsefulCactus implements ModInitializer {
 	public static final String MOD_ID = "rafaels-useful-cactus";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
 	@Override
 	public void onInitialize() {
-		ModItemGroups.registerItemGroups();
 		ModItems.registerModItems();
 		ModBlocks.registerModBlocks();
 		ModEffects.registerEffects();
+		ModItemGroups.registerItemGroups();
+
 
 		PlayerBlockBreakEvents.BEFORE.register(new CactusHammerUsageEvent());
 

diff --git a/src/main/java/net/rafael/usefulcactus/RafaelsUsefulCactusDataGenerator.java b/src/main/java/net/rafael/usefulcactus/RafaelsUsefulCactusDataGenerator.java
@@ -2,7 +2,11 @@
 
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
-import net.rafael.usefulcactus.datagen.*;
+import net.rafael.usefulcactus.datagen.ModBlockTagProvider;
+import net.rafael.usefulcactus.datagen.ModItemTagProvider;
+import net.rafael.usefulcactus.datagen.ModLootTableProvider;
+import net.rafael.usefulcactus.datagen.ModModelProvider;
+import net.rafael.usefulcactus.datagen.ModRecipeProvider;
 
 public class RafaelsUsefulCactusDataGenerator implements DataGeneratorEntrypoint {
 	@Override