upgrade to 1.21.3

src/main/resources/assets/quickiemod/blockstates/drillstop.json

@@ -1,7 +0,0 @@
-{
-	"variants": {
-		"": {
-			"model": "quickiemod:block/drillstop"
-		}
-	}
-}

src/main/resources/assets/quickiemod/lang/de_de.json

@@ -69,8 +69,8 @@
 	"block.quickiemod.itemhoarder": "Itemsauger",
 	"block.quickiemod.monsterhoarder": "Monstersauger",
 	"block.quickiemod.kelpstack": "Seegrassbündel",
-	"block.quickiemod.cottonplant": "Baumwollpflanze",
-	"block.quickiemod.canolaplant": "Canolapflanze",
+	"block.quickiemod.blockcottonplant": "Baumwollpflanze",
+	"block.quickiemod.blockcanolaplant": "Canolapflanze",
 	"block.quickiemod.blocksulphor": "Schwefelblock",
 	"block.quickiemod.blocksalpeter": "Salpeterblock",
 	"block.quickiemod.blockspeedpowder": "Fluchtpulverblock",
@@ -103,6 +103,7 @@
 	"msg.buildingplan.failonblock": "Der Bau wurde abgelehnt, es ist im Weg: %s",
 	"msg.buildingplan.failonplayer": "Der Bau wurde abgelehnt, um Spieler %s nicht zu gefährden.",
 	"msg.itemhoarder.summary": "Der Itemsauger enthält: %s",
+	"msg.monsterhoarder.size": "Der Radius für diesen Monstersauger beträgt jetzt %d.",
 	"msg.notyetimplemented": "leider noch nicht verfügbar",
 	"msg.backpack.transfer.filled": "Der Rucksack wurde befüllt.",
 	"msg.backpack.transfer.cleared": "Der Rucksackinhalt wurde soweit möglich geleert.",

src/main/resources/assets/quickiemod/lang/en_us.json

@@ -69,8 +69,8 @@
 	"block.quickiemod.itemhoarder": "item hoarder",
 	"block.quickiemod.monsterhoarder": "monster hoarder",
 	"block.quickiemod.kelpstack": "kelp bundle",
-	"block.quickiemod.cottonplant": "cotton plant",
-	"block.quickiemod.canolaplant": "canola plant",
+	"block.quickiemod.blockcottonplant": "cotton plant",
+	"block.quickiemod.blockcanolaplant": "canola plant",
 	"block.quickiemod.blocksulphor": "block of sulfur",
 	"block.quickiemod.blocksalpeter": "block of salpeter",
 	"block.quickiemod.blockspeedpowder": "block of speedpowder",
@@ -103,6 +103,7 @@
 	"msg.buildingplan.failonblock": "The building execution was rejected because of %s",
 	"msg.buildingplan.failonplayer": "The building execution was rejected because of %s who could be injured.",
 	"msg.itemhoarder.summary": "The item hoarder contains: %s",
+  "msg.monsterhoarder.size": "The radius for this monster hoarder is %d from now on.",
 	"msg.notyetimplemented": "not yet implemented",
 	"msg.backpack.transfer.filled": "Filled the backpack.",
 	"msg.backpack.transfer.cleared": "Cleared the backpack as much as possible.",

src/main/resources/assets/quickiemod/models/block/blockstackerdown.json

@@ -1,5 +1,5 @@
 {
-	"parent": "block/cube_bottom_top",
+	"parent": "minecraft:block/cube_bottom_top",
 	"textures": {
 		"bottom": "quickiemod:block/blockstackerout",
 		"side": "quickiemod:block/blockstackerdown",

src/main/resources/assets/quickiemod/models/block/drillstop.json

@@ -1,6 +0,0 @@
-{
-		"parent": "block/cube_all",
-		"textures": {
-				"all": "quickiemod:block/drillstop"
-		}
-}

src/main/resources/assets/quickiemod/models/item/drillstop.json

@@ -1,10 +0,0 @@
-{
-		"parent": "quickiemod:block/drillstop",
-		"display": {
-				"thirdperson": {
-						"rotation": [ 10, -45, 170 ],
-						"translation": [ 0, 1.5, -2.75 ],
-						"scale": [ 0.375, 0.375, 0.375 ]
-				}
-		}
-}

src/main/resources/assets/quickiemod/models/item/kelpstack.json

@@ -1,10 +1,25 @@
 {
-		"parent": "quickiemod:block/kelpstack",
-		"display": {
-				"thirdperson": {
-						"rotation": [ 10, -45, 170 ],
-						"translation": [ 0, 1.5, -2.75 ],
-						"scale": [ 0.375, 0.375, 0.375 ]
-				}
-		}
-}
+    "parent": "block/block",
+    "textures": {
+        "particle": "quickiemod:block/kelpstack_side",
+        "down": "quickiemod:block/kelpstack_bottom",
+        "up": "quickiemod:block/kelpstack_top",
+        "north": "quickiemod:block/kelpstack_side",
+        "east": "quickiemod:block/kelpstack_side",
+        "south": "quickiemod:block/kelpstack_side",
+        "west": "quickiemod:block/kelpstack_side"
+    },
+    "elements": [
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "faces": {
+                "down":  { "texture": "#down", "cullface": "down" },
+                "up":    { "texture": "#up", "cullface": "up" },
+                "north": { "texture": "#north", "cullface": "north" },
+                "south": { "uv": [16, 0, 0, 16], "texture": "#south", "cullface": "south" },
+                "west":  { "texture": "#west", "cullface": "west" },
+                "east":  { "uv": [16, 0, 0, 16], "texture": "#east", "cullface": "east" }
+            }
+        }
+    ]
+}

src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -1,6 +1,11 @@
 	{
 		"replace": false,
 		"values": [
+			"quickiemod:blocksulphor",
+			"quickiemod:blocksalpeter",
+			"quickiemod:monsterhoarder",
+			"quickiemod:lavahoarder",
+			"quickiemod:emptylavahoarder",
 			"quickiemod:oresulphor",
 			"quickiemod:oredeepslatesulphor",
 			"quickiemod:orenethersulphor",

src/main/resources/data/minecraft/tags/items/enchantable/durability.json

@@ -1,5 +0,0 @@
-{
-  "values": [
-    "quickiemod:speedpowdershears"
-  ]
-}

src/main/resources/data/minecraft/tags/items/enchantable/mining.json

@@ -1,5 +0,0 @@
-{
-  "values": [
-    "quickiemod:speedpowdershears"
-  ]
-}

src/main/resources/data/quickiemod/advancements/recipes/tools/salpeterblock.json

@@ -1,21 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "quickiemod:blocksalpeter"
-    ]
-  },
-  "criteria": {
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "quickiemod:blocksalpeter"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_the_recipe"
-    ]
-  ]
-}

src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder1.json

@@ -1,8 +1,6 @@
 {
 	"type": "minecraft:blasting",
-	"ingredient": {
-		"item": "minecraft:oxidized_copper"
-	},
+	"ingredient": "minecraft:oxidized_copper",
 	"result": {
 		"id": "quickiemod:oxidizedcopperpowder"
 	},

src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder2.json

@@ -1,8 +1,6 @@
 {
     "type": "minecraft:blasting",
-    "ingredient": {
-        "item": "minecraft:oxidized_cut_copper"
-    },
+    "ingredient": "minecraft:oxidized_cut_copper",
     "result": {
     		"id": "quickiemod:oxidizedcopperpowder"
     },

src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder3.json

@@ -1,13 +1,8 @@
 {
 	"type": "minecraft:blasting",
-	"ingredient": {
-		"item": "minecraft:oxidized_cut_copper_stairs"
-	},
+	"ingredient": "minecraft:oxidized_cut_copper_stairs",
 	"result": {
 		"id": "quickiemod:oxidizedcopperpowder"},
 	"experience": 0.1,
 	"cookingtime": 200
-},
-    "experience": 0.1,
-    "cookingtime": 200
 }

src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder4.json

@@ -1,8 +1,6 @@
 {
 	"type": "minecraft:blasting",
-	"ingredient": {
-		"item": "minecraft:oxidized_cut_copper_slab"
-	},
+	"ingredient": "minecraft:oxidized_cut_copper_slab",
 	"result": {
 		"id": "quickiemod:oxidizedcopperpowder"},
 	"experience": 0.1,

src/main/resources/data/quickiemod/recipe/blasting_quickieingot.json

@@ -1,8 +1,6 @@
 {
     "type": "minecraft:blasting",
-    "ingredient": {
-        "item": "quickiemod:quickiepowder"
-    },
+    "ingredient": "quickiemod:quickiepowder",
     "result": {"id":"quickiemod:quickieingot"},
     "experience": 0.1,
     "cookingtime": 200

src/main/resources/data/quickiemod/recipe/blasting_salpeter_from_brain_coral.json

@@ -2,9 +2,7 @@
 	"type": "minecraft:blasting",
 	"group": "ores",
 	"ingredient": [
-		{
-			"item": "minecraft:dead_brain_coral_block"
-		}
+		"minecraft:dead_brain_coral_block"
 	],
 	"result": {
 	  "id":"quickiemod:salpeter"

src/main/resources/data/quickiemod/recipe/blasting_salpeter_from_bubble_coral.json

@@ -2,9 +2,7 @@
 	"type": "minecraft:blasting",
 	"group": "ores",
 	"ingredient": [
-		{
-			"item": "minecraft:dead_bubble_coral_block"
-		}
+		"minecraft:dead_bubble_coral_block"
 	],
 	"result": {
 	  "id":"quickiemod:salpeter"

src/main/resources/data/quickiemod/recipe/blasting_salpeter_from_fire_coral.json

@@ -2,9 +2,7 @@
 	"type": "minecraft:blasting",
 	"group": "ores",
 	"ingredient": [
-		{
-			"item": "minecraft:dead_fire_coral_block"
-		}
+		"minecraft:dead_fire_coral_block"
 	],
 	"result": {
 	  "id":"quickiemod:salpeter"

src/main/resources/data/quickiemod/recipe/blasting_salpeter_from_horn_coral.json

@@ -2,9 +2,7 @@
 	"type": "minecraft:blasting",
 	"group": "ores",
 	"ingredient": [
-		{
-			"item": "minecraft:dead_horn_coral_block"
-		}
+		"minecraft:dead_horn_coral_block"
 	],
 	"result": {
 	  "id":"quickiemod:salpeter"

src/main/resources/data/quickiemod/recipe/blasting_salpeter_from_tube_coral.json

@@ -2,9 +2,7 @@
 	"type": "minecraft:blasting",
 	"group": "ores",
 	"ingredient": [
-		{
-			"item": "minecraft:dead_tube_coral_block"
-		}
+		 "minecraft:dead_tube_coral_block"
 	],
 	"result": {
 	  "id":"quickiemod:salpeter"

src/main/resources/data/quickiemod/recipe/blasting_speedingot.json

@@ -1,8 +1,6 @@
 {
     "type": "minecraft:blasting",
-    "ingredient": {
-        "item": "quickiemod:speedpowder"
-    },
+    "ingredient":  "quickiemod:speedpowder",
     "result": {"id":"quickiemod:speedingot"},
     "experience": 0.1,
     "cookingtime": 200

src/main/resources/data/quickiemod/recipe/campfire_dried_kelpblock.json

@@ -1,8 +1,6 @@
 {
     "type": "minecraft:campfire_cooking",
-    "ingredient": {
-        "item": "quickiemod:kelpstack"
-    },
+    "ingredient": "quickiemod:kelpstack",
     "result": {
     	"id": "minecraft:dried_kelp_block"
     },

src/main/resources/data/quickiemod/recipe/campfire_torch.json

@@ -1,10 +1,8 @@
 {
     "type": "minecraft:campfire_cooking",
-    "ingredient": {
-        "item": "quickiemod:stub"
-    },
+    "ingredient": "quickiemod:stub",
     "result": {
-      "id":"minecraft:torch"
+      "id": "minecraft:torch"
     },
     "experience": 0.1,
     "cookingtime": 20

src/main/resources/data/quickiemod/recipe/shaped_blockquickiepowder_from_quickiepowder.json

@@ -6,9 +6,7 @@
 		"sss"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:quickiepowder"
-		}
+		"s": "quickiemod:quickiepowder"
 	},
 	"result": {
 		"id": "quickiemod:blockquickiepowder",

src/main/resources/data/quickiemod/recipe/shaped_blocksalpeter.json

@@ -6,9 +6,7 @@
 		"sss"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:salpeter"
-		}
+		"s": "quickiemod:salpeter"
 	},
 	"result": {
 		"id": "quickiemod:blocksalpeter",

src/main/resources/data/quickiemod/recipe/shaped_blockspeedpowder_from_speedpowder.json

@@ -6,9 +6,7 @@
 		"sss"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:speedpowder"
-		}
+		"s": "quickiemod:speedpowder"
 	},
 	"result": {
 		"id": "quickiemod:blockspeedpowder",

src/main/resources/data/quickiemod/recipe/shaped_blockstacker.json

@@ -6,12 +6,11 @@
 		" s "
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:speedingot"
-		},
-		"c": {
-			"tag": "c:chests"
-		}
+		"s": "quickiemod:speedingot",
+		"c": [
+		  "minecraft:chest",
+		  "minecraft:barrel"
+		]
 	},
 	"result": {
 		"id": "quickiemod:blockstackerdown",

src/main/resources/data/quickiemod/recipe/shaped_blocksulphor.json

@@ -6,9 +6,7 @@
 		"sss"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:sulphor"
-		}
+		"s": "quickiemod:sulphor"
 	},
 	"result": {
 		"id": "quickiemod:blocksulphor",

src/main/resources/data/quickiemod/recipe/shaped_canolabottlestack.json

@@ -6,9 +6,7 @@
     "ccc"
   ],
   "key": {
-    "c": {
-      "item": "quickiemod:canolabottle"
-    }
+    "c":"quickiemod:canolabottle"
   },
 	"result": {
 		"id": "quickiemod:canolabottlestack",

src/main/resources/data/quickiemod/recipe/shaped_carrotstack_from_carrots.json

@@ -5,9 +5,7 @@
     "cc"
   ],
   "key": {
-    "c": {
-      "item": "minecraft:carrot"
-    }
+    "c": "minecraft:carrot"
   },
   "result": {
     "id": "quickiemod:carrotstack"

src/main/resources/data/quickiemod/recipe/shaped_drill.json

@@ -1,17 +1,14 @@
 {
 	"type": "minecraft:crafting_shaped",
 	"pattern": [
-		"q q",
+		"qbq",
 		"dqd",
 		" d "
 	],
 	"key": {
-		"q": {
-			"item": "quickiemod:quickieingot"
-		},
-		"d": {
-		    "item": "minecraft:diamond"
-		}
+		"q": "quickiemod:quickieingot",
+		"d": "minecraft:diamond",
+		"b": "minecraft:barrel"
 	},
 	"result": {
 		"id": "quickiemod:drill",

src/main/resources/data/quickiemod/recipe/shaped_drillstop.json

@@ -1,20 +0,0 @@
-{
-	"type": "minecraft:crafting_shaped",
-	"pattern": [
-		"ooo",
-		"oso",
-		"ooo"
-	],
-	"key": {
-		"s": {
-			"item": "quickiemod:speedingot"
-		},
-		"o": {
-		    "item": "minecraft:obsidian"
-		}
-	},
-	"result": {
-		"id": "quickiemod:drillstop",
-		"count": 1
-	}
-}

src/main/resources/data/quickiemod/recipe/shaped_emptylavahoarder.json

@@ -1,17 +1,14 @@
 {
 	"type": "minecraft:crafting_shaped",
 	"pattern": [
-		"ooo",
-		"obo",
-		"ooo"
+		"oio",
+		"ibi",
+		"oio"
 	],
 	"key": {
-		"o": {
-			"item": "minecraft:obsidian"
-		},
-		"b": {
-			"item": "minecraft:bucket"
-		}
+		"o": "minecraft:obsidian",
+		"i": "quickiemod:quickieingot",
+		"b": "minecraft:bucket"
 	},
 	"result": {
 		"id": "quickiemod:emptylavahoarder",

src/main/resources/data/quickiemod/recipe/shaped_itemhoarder_from_barrel.json

@@ -2,16 +2,12 @@
 	"type": "minecraft:crafting_shaped",
 	"pattern": [
 		"ooo",
-		"oso",
+		"obo",
 		"ooo"
 	],
 	"key": {
-		"o": {
-			"item": "quickiemod:speedpowder"
-		},
-		"s": {
-			"item": "minecraft:barrel"
-		}
+		"o": "quickiemod:speedingot",
+		"b": "minecraft:barrel"
 	},
 	"result": {
 		"id": "quickiemod:itemhoarder",

src/main/resources/data/quickiemod/recipe/shaped_itemhoarder_from_chest.json

@@ -2,16 +2,12 @@
 	"type": "minecraft:crafting_shaped",
 	"pattern": [
 		"ooo",
-		"oso",
+		"oco",
 		"ooo"
 	],
 	"key": {
-		"o": {
-			"item": "quickiemod:speedpowder"
-		},
-		"s": {
-			"tag": "c:chests"
-		}
+		"o": "quickiemod:speedingot",
+		"c": "minecraft:chest"
 	},
 	"result": {
 		"id": "quickiemod:itemhoarder",

src/main/resources/data/quickiemod/recipe/shaped_kelpstack_from_kelp.json

@@ -6,9 +6,7 @@
 		"kkk"
 	],
 	"key": {
-		"k": {
-			"item": "minecraft:kelp"
-		}
+		"k": "minecraft:kelp"
 	},
 	"result": {
 		"id": "quickiemod:kelpstack",

src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json

@@ -1,17 +1,14 @@
 {
 	"type": "minecraft:crafting_shaped",
 	"pattern": [
-		"qqq",
+		"oqo",
 		"qtq",
-		"qqq"
+		"oqo"
 	],
 	"key": {
-		"q": {
-			"item": "quickiemod:quickieingot"
-		},
-		"t": {
-			"item": "minecraft:torch"
-		}
+		"q": "quickiemod:quickieingot",
+		"t": "minecraft:torch",
+		"o": "minecraft:obsidian"
 	},
 	"result": {
 		"id": "quickiemod:monsterhoarder",

src/main/resources/data/quickiemod/recipe/shaped_quickiepowderaxe.json

@@ -7,12 +7,8 @@
 		" |"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:quickieingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:quickieingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:quickiepowderaxe",

src/main/resources/data/quickiemod/recipe/shaped_quickiepowderhoe.json

@@ -7,12 +7,8 @@
 		" |"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:quickieingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:quickieingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:quickiepowderhoe",

src/main/resources/data/quickiemod/recipe/shaped_quickiepowderpickaxe.json

@@ -7,12 +7,8 @@
 		" | "
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:quickieingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:quickieingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:quickiepowderpickaxe",

src/main/resources/data/quickiemod/recipe/shaped_quickiepowdershovel.json

@@ -7,12 +7,8 @@
 		"|"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:quickieingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:quickieingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:quickiepowdershovel",

src/main/resources/data/quickiemod/recipe/shaped_speedpowder_shears.json

@@ -6,9 +6,7 @@
     "# "
   ],
   "key": {
-    "#": {
-      "item": "quickiemod:speedingot"
-    }
+    "#": "quickiemod:speedingot"
   },
   "result": {
     "id": "quickiemod:speedpowdershears"

src/main/resources/data/quickiemod/recipe/shaped_speedpowderaxe.json

@@ -7,12 +7,8 @@
 		" |"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:speedingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:speedingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:speedpowderaxe",

src/main/resources/data/quickiemod/recipe/shaped_speedpowderhoe.json

@@ -7,12 +7,8 @@
 		" |"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:speedingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:speedingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:speedpowderhoe",

src/main/resources/data/quickiemod/recipe/shaped_speedpowderpickaxe.json

@@ -7,12 +7,8 @@
 		" | "
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:speedingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:speedingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:speedpowderpickaxe",

src/main/resources/data/quickiemod/recipe/shaped_speedpowdershovel.json

@@ -7,12 +7,8 @@
 		"|"
 	],
 	"key": {
-		"s": {
-			"item": "quickiemod:speedingot"
-		},
-		"|": {
-			"item": "minecraft:stick"
-		}
+		"s": "quickiemod:speedingot",
+		"|": "minecraft:stick"
 	},
 	"result": {
 		"id": "quickiemod:speedpowdershovel",

src/main/resources/data/quickiemod/recipe/shaped_string_from_cotton.json

@@ -6,9 +6,7 @@
 		"c"
 	],
 	"key": {
-		"c": {
-			"item": "quickiemod:cotton"
-		}
+		"c": "quickiemod:cotton"
 	},
 	"result": {
 		"id": "minecraft:string",

src/main/resources/data/quickiemod/recipe/shapeless_blockquickiepowder_from_slimeblockandspeedpowderblock.json

@@ -1,12 +1,8 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "minecraft:slime_block"
-		},
-		{
-			"item": "quickiemod:blockspeedpowder"
-		}
+		"minecraft:slime_block",
+		"quickiemod:blockspeedpowder"
 	],
 	"result": {
 		"id": "quickiemod:blockquickiepowder",

src/main/resources/data/quickiemod/recipe/shapeless_blockspeedpowder_from_salpetersulforcoalblock.json

@@ -1,13 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
-    {
-      "item": "quickiemod:blocksalpeter"
-    },{
-      "item": "quickiemod:blocksulphor"
-    },{
-    	"item": "minecraft:coal_block"
-    }
+    "quickiemod:blocksalpeter",
+    "quickiemod:blocksulphor",
+    "minecraft:coal_block",
+    "minecraft:redstone_block"
   ],
 	"result": {
 		"id": "quickiemod:blockspeedpowder",

src/main/resources/data/quickiemod/recipe/shapeless_blockstackerdown_up.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockstackerup"
-		}
+		"quickiemod:blockstackerup"
 	],
 	"result": {
 		"id": "quickiemod:blockstackerdown",

src/main/resources/data/quickiemod/recipe/shapeless_blockstackereast_down.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockstackerdown"
-		}
+		"quickiemod:blockstackerdown"
 	],
 	"result": {
 		"id": "quickiemod:blockstackereast",

src/main/resources/data/quickiemod/recipe/shapeless_blockstackernorth_west.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockstackerwest"
-		}
+		"quickiemod:blockstackerwest"
 	],
 	"result": {
 		"id": "quickiemod:blockstackernorth",

src/main/resources/data/quickiemod/recipe/shapeless_blockstackersouth_east.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockstackereast"
-		}
+		"quickiemod:blockstackereast"
 	],
 	"result": {
 		"id": "quickiemod:blockstackersouth",

src/main/resources/data/quickiemod/recipe/shapeless_blockstackerup_north.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockstackernorth"
-		}
+		"quickiemod:blockstackernorth"
 	],
 	"result": {
 		"id": "quickiemod:blockstackerup",

src/main/resources/data/quickiemod/recipe/shapeless_blockstackerwest_south.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockstackersouth"
-		}
+		"quickiemod:blockstackersouth"
 	],
 	"result": {
 		"id": "quickiemod:blockstackerwest",

src/main/resources/data/quickiemod/recipe/shapeless_canolabottle.json

@@ -1,12 +1,8 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "minecraft:glass_bottle"
-		},
-		{
-			"item": "quickiemod:canola"
-		}
+		"minecraft:glass_bottle",
+		"quickiemod:canola"
 	],
 	"result": {
 		"id": "quickiemod:canolabottle",

src/main/resources/data/quickiemod/recipe/shapeless_canolabottle_from_stack.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:canolabottlestack"
-		}
+    "quickiemod:canolabottlestack"
 	],
 	"result": {
 		"id": "quickiemod:canolabottle",

src/main/resources/data/quickiemod/recipe/shapeless_carrots_from_carrotstack.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:carrotstack"
-		}
+		"quickiemod:carrotstack"
 	],
 	"result": {
 		"id": "minecraft:carrot",

src/main/resources/data/quickiemod/recipe/shapeless_drill2drilleast.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:drill"
-		}
+		"quickiemod:drill"
 	],
 	"result": {
 		"id": "quickiemod:drilleast",

src/main/resources/data/quickiemod/recipe/shapeless_drilleast2drillsouth.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:drilleast"
-		}
+		"quickiemod:drilleast"
 	],
 	"result": {
 		"id": "quickiemod:drillsouth",

src/main/resources/data/quickiemod/recipe/shapeless_drillnorth2drill.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:drillnorth"
-		}
+		"quickiemod:drillnorth"
 	],
 	"result": {
 		"id": "quickiemod:drill",

src/main/resources/data/quickiemod/recipe/shapeless_drillsouth2drillwest.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:drillsouth"
-		}
+		"quickiemod:drillsouth"
 	],
 	"result": {
 		"id": "quickiemod:drillwest",

src/main/resources/data/quickiemod/recipe/shapeless_drillwest2drillnorth.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:drillwest"
-		}
+		"quickiemod:drillwest"
 	],
 	"result": {
 		"id": "quickiemod:drillnorth",

src/main/resources/data/quickiemod/recipe/shapeless_glowstone_item_frame.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:crafting_shapeless",
-	"ingredients": [
-		{
-			"item": "minecraft:item_frame"
-		},
-		{
-			"item": "minecraft:glowstone_dust"
-		}
-	],
-	"result": {
-		"id": "minecraft:glow_item_frame",
-		"count": 2
-	}
-}

src/main/resources/data/quickiemod/recipe/shapeless_gunpowder.json

@@ -1,15 +1,9 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "minecraft:coal"
-		},
-		{
-			"item": "quickiemod:sulphor"
-		},
-		{
-		  "item": "quickiemod:salpeter"
-		}
+		"minecraft:coal",
+    "quickiemod:sulphor",
+		"quickiemod:salpeter"
 	],
 	"result": {
 		"id": "minecraft:gunpowder",

src/main/resources/data/quickiemod/recipe/shapeless_quickiepowder_from_block.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockquickiepowder"
-		}
+		"quickiemod:blockquickiepowder"
 	],
 	"result": {
 		"id": "quickiemod:quickiepowder",

src/main/resources/data/quickiemod/recipe/shapeless_quickiepowder_from_oxidizedcopperpowder.json

@@ -1,12 +1,8 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:speedpowder"
-		},
-		{
-			"item": "quickiemod:oxidizedcopperpowder"
-		}
+		"quickiemod:speedpowder",
+		"quickiemod:oxidizedcopperpowder"
 	],
 	"result": {
 		"id": "quickiemod:quickiepowder",

src/main/resources/data/quickiemod/recipe/shapeless_quickiepowder_from_slimeball.json

@@ -1,12 +1,8 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:speedpowder"
-		},
-		{
-			"item": "minecraft:slime_ball"
-		}
+		"quickiemod:speedpowder",
+		"minecraft:slime_ball"
 	],
 	"result": {
 		"id": "quickiemod:quickiepowder",

src/main/resources/data/quickiemod/recipe/shapeless_quickiepowderwaterhoe.json

@@ -1,12 +1,8 @@
 {
 	"type": "minecraft:crafting_shapeless",
   "ingredients": [
-    {
-      "item": "minecraft:water_bucket"
-    },
-    {
-      "item": "quickiemod:quickiepowderhoe"
-    }
+    "minecraft:water_bucket",
+    "quickiemod:quickiepowderhoe"
   ],
   "result": {
     "id": "quickiemod:quickiepowderwaterhoe",

src/main/resources/data/quickiemod/recipe/shapeless_salpeter_from_block.json

@@ -1,9 +1,7 @@
 {
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
-    {
-      "item": "quickiemod:blocksalpeter"
-    }
+     "quickiemod:blocksalpeter"
   ],
   "result": {
     "id": "quickiemod:salpeter",

src/main/resources/data/quickiemod/recipe/shapeless_speedpowder.json

@@ -1,12 +1,8 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "minecraft:gunpowder"
-		},
-		{
-			"item": "minecraft:redstone"
-		}
+		"minecraft:gunpowder",
+		"minecraft:redstone"
 	],
 	"result": {
 		"id": "quickiemod:speedpowder",

src/main/resources/data/quickiemod/recipe/shapeless_speedpowder_from_block.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "quickiemod:blockspeedpowder"
-		}
+		"quickiemod:blockspeedpowder"
 	],
 	"result": {
 		"id": "quickiemod:speedpowder",

src/main/resources/data/quickiemod/recipe/shapeless_speedpowderwaterhoe.json

@@ -1,12 +1,8 @@
 {
 	"type": "minecraft:crafting_shapeless",
   "ingredients": [
-    {
-      "item": "minecraft:water_bucket"
-    },
-    {
-      "item": "quickiemod:speedpowderhoe"
-    }
+    "minecraft:water_bucket",
+    "quickiemod:speedpowderhoe"
   ],
   "result": {
     "id": "quickiemod:speedpowderwaterhoe",

src/main/resources/data/quickiemod/recipe/shapeless_string_from_wool.json

@@ -1,9 +1,7 @@
 {
 	"type": "minecraft:crafting_shapeless",
 	"ingredients": [
-		{
-			"item": "minecraft:white_wool"
-		}
+		"minecraft:white_wool"
 	],
 	"result": {
 		"id": "minecraft:string",

src/main/resources/data/quickiemod/recipe/shapeless_stub.json

@@ -1,9 +1,7 @@
 {
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
-    {
-      "item": "minecraft:stick"
-    }
+    "minecraft:stick"
   ],
   "result": {
     "id": "quickiemod:stub",

src/main/resources/data/quickiemod/recipe/shapeless_sulphor_from_block.json

@@ -1,9 +1,7 @@
 {
   "type": "minecraft:crafting_shapeless",
   "ingredients": [
-    {
-      "item": "quickiemod:blocksulphor"
-    }
+    "quickiemod:blocksulphor"
   ],
   "result": {
     "id": "quickiemod:sulphor",

src/main/resources/data/quickiemod/recipe/smelting_salpeter1.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:smelting",
-	"group": "ores",
-	"ingredient": [
-		{
-			"item": "quickiemod:dirtsalpeter"
-		}
-	],
-	"result": {
-	  "id":"quickiemod:salpeter"
-	},
-	"count": 1,
-	"experience": 0.5,
-	"cookingtime": 200
-}

src/main/resources/data/quickiemod/recipe/smelting_salpeter2.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:smelting",
-	"group": "ores",
-	"ingredient": [
-		{
-			"item": "quickiemod:oresalpeter"
-		}
-	],
-	"result": {
-	  "id":"quickiemod:salpeter"
-	},
-	"count": 1,
-	"experience": 0.5,
-	"cookingtime": 200
-}

src/main/resources/data/quickiemod/recipe/smelting_salpeter3.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:smelting",
-	"group": "ores",
-	"ingredient": [
-		{
-			"item": "quickiemod:oresandsalpeter"
-		}
-	],
-	"result": {
-	  "id":"quickiemod:salpeter"
-	},
-	"count": 1,
-	"experience": 0.5,
-	"cookingtime": 200
-}

src/main/resources/data/quickiemod/recipe/smelting_salpeter4.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:smelting",
-	"group": "ores",
-	"ingredient": [
-		{
-			"item": "quickiemod:sandsalpeter"
-		}
-	],
-	"result": {
-	  "id":"quickiemod:salpeter"
-	},
-	"count": 1,
-	"experience": 0.5,
-	"cookingtime": 200
-}

src/main/resources/data/quickiemod/recipe/smelting_sulfur1.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:smelting",
-	"group": "ores",
-	"ingredient": [
-		{
-			"item": "quickiemod:orenethersulphor"
-		}
-	],
-	"result": {
-	  "id":"quickiemod:sulphor"
-	},
-	"count": 1,
-	"experience": 0.5,
-	"cookingtime": 200
-}

src/main/resources/data/quickiemod/recipe/smelting_sulfur2.json

@@ -1,15 +0,0 @@
-{
-	"type": "minecraft:smelting",
-	"group": "ores",
-	"ingredient": [
-		{
-			"item": "quickiemod:oresulphor"
-		}
-	],
-	"result": {
-    "id": "quickiemod:sulphor"
-  },
-	"count": 1,
-	"experience": 0.5,
-	"cookingtime": 200
-}

src/main/resources/data/quickiemod/recipe/smoking_dried_kelpblock.json

@@ -1,8 +1,6 @@
 {
     "type": "minecraft:smoking",
-    "ingredient": {
-        "item": "quickiemod:kelpstack"
-    },
+    "ingredient": "quickiemod:kelpstack",
     "result": {
       "id": "minecraft:dried_kelp_block"
     },

src/main/resources/data/quickiemod/recipe/smoking_leather_from_flesh_stripes.json

@@ -1,8 +1,6 @@
 {
     "type": "minecraft:smoking",
-    "ingredient": {
-        "item": "quickiemod:rotten_flesh_stripes"
-    },
+    "ingredient": "quickiemod:rotten_flesh_stripes",
     "result": {
       "id":"minecraft:leather"
     },

src/main/resources/data/quickiemod/recipe/stonecutting_flesh_stripes.json

@@ -1,8 +1,6 @@
 {
     "type": "minecraft:stonecutting",
-    "ingredient": {
-        "item": "minecraft:rotten_flesh"
-    },
+    "ingredient": "minecraft:rotten_flesh",
     "result": {
       "id": "quickiemod:rotten_flesh_stripes"
     },

src/main/resources/fabric.mod.json

@@ -2,7 +2,7 @@
 	"schemaVersion": 1,
 	"id": "quickiemod",
 	"version": "${version}",
-	"name": "QuickieMod",
+	"name": "Quickiemod",
 	"description": "Speed up daily work in Minecraft.",
 	"authors": [
 		"jottyfan"
@@ -16,25 +16,24 @@
 	"environment": "*",
 	"entrypoints": {
 		"main": [
-			"de.jottyfan.quickiemod.QuickieMod"
+			"de.jottyfan.quickiemod.Quickiemod"
 		],
 		"fabric-datagen": [
-			"de.jottyfan.quickiemod.QuickieModDataGenerator"
+			"de.jottyfan.quickiemod.QuickiemodDataGenerator"
 		],
 		"client": [
-			"de.jottyfan.quickiemod.QuickieModClient"
+			"de.jottyfan.quickiemod.QuickiemodClient"
 		]
 	},
 	"mixins": [
-		"quickiemod.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.15.11",
-		"minecraft": "~1.21.1",
+		"fabricloader": ">=0.16.9",
+		"minecraft": "~1.21.3",
 		"java": ">=21",
 		"fabric-api": "*"
 	},
 	"suggests": {
-		"flamingo": "*"
+		"another-mod": "*"
 	}
 }

src/main/resources/quickiemod.mixins.json

@@ -1,14 +0,0 @@
-{
-	"required": true,
-	"minVersion": "0.8",
-	"package": "de.jottyfan.quickiemod.mixin",
-	"compatibilityLevel": "JAVA_21",
-	"mixins": [
-		"BlockBreakMixin"
-	],
-	"client": [
-    ],
-	"injectors": {
-		"defaultRequire": 1
-	}
-}