diff --git a/.gitignore b/.gitignore index c476faf..43d9709 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,7 @@ hs_err_*.log replay_*.log *.hprof *.jfr + +# datagen + +src/main/generated diff --git a/gradle.properties b/gradle.properties index ed06bb4..df03063 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop minecraft_version=1.19.4 yarn_mappings=1.19.4+build.2 -loader_version=0.15.6 +loader_version=0.16.10 # Mod Properties mod_version=1.0.0 diff --git a/src/main/generated/.cache/dd419ce83adff4c006331c5797ed62eb34ba299f b/src/main/generated/.cache/dd419ce83adff4c006331c5797ed62eb34ba299f deleted file mode 100644 index 8fd37b0..0000000 --- a/src/main/generated/.cache/dd419ce83adff4c006331c5797ed62eb34ba299f +++ /dev/null @@ -1,27 +0,0 @@ -// 1.19.4 2025-01-30T13:00:21.8905452 Cursed Iron/Recipes -c73d8975511cbed9e1940fdcd614747d4e3827a5 data\cursed-iron\advancements\recipes\tools\cursed_iron_axe.json -21a0bc3141a7fe283a2d038788c7eeb1340d0cf3 data\cursed-iron\advancements\recipes\tools\cursed_iron_hoe.json -9fdae065d8d0a43952d388f06935423dff572c18 data\cursed-iron\advancements\recipes\building_blocks\cursed_iron_block_item.json -c3da1a08f75cbc343f9a8a3b7be0a154bdb70e82 data\cursed-iron\advancements\recipes\combat\cursed_iron_chestplate.json -0fec1ffbaf15ba6ab4d770e3fa0d700204133f2e data\cursed-iron\recipes\cursed_iron_axe.json -ee0f3b6a6bb52e0588c25869b98aba354015a597 data\cursed-iron\recipes\cursed_iron_hoe.json -ae07cc1280c2533411c43d616b880461473090bc data\cursed-iron\recipes\cursed_iron_boots.json -75231a971173bd859f8ba33dc33ae13ad8421ed6 data\cursed-iron\recipes\cursed_iron_block_item.json -b6d6262ebdf56adc992b9b67511fc4e17dcc4baa data\cursed-iron\advancements\recipes\combat\cursed_iron_helmet.json -8c0844a667e49d28658a3dc3bde776f9521a828b data\cursed-iron\recipes\cursed_iron_chestplate.json -c725a764dcf017d85e58d67ce5a2a69502adfe57 data\cursed-iron\recipes\cursed_iron_nugget.json -c79f0140cf3576aa397e250b6a2540a06d9367bb data\cursed-iron\advancements\recipes\combat\cursed_iron_boots.json -b517f030523df6a21f9405e71ad38169b1ff0d7a data\cursed-iron\recipes\cursed_iron_shovel.json -0a26fd92f982ecadab75155137cdfdbff72c1654 data\cursed-iron\advancements\recipes\misc\iron_ingot_from_smelting_cursed_iron_ingot.json -055a916e322715c6880481b45dfdc160788f2573 data\cursed-iron\recipes\cursed_iron_leggings.json -1b19511b0aeaea054fce37733aec614cec831650 data\cursed-iron\advancements\recipes\tools\cursed_iron_shovel.json -17bf61115eb0914516be5da8d2d6d0f36f7fc095 data\cursed-iron\advancements\recipes\misc\cursed_iron_ingot.json -40a0ca71e7449fc530e59c68afe9908eb56fe8c5 data\cursed-iron\recipes\cursed_iron_sword.json -027dd09ee0d66023121c7fd910fcb4ca117f8cbc data\cursed-iron\recipes\cursed_iron_helmet.json -b3f8c4400aa42da773a3a9b08a64890c52e82213 data\cursed-iron\advancements\recipes\misc\cursed_iron_nugget.json -0151efeea204642062b181202b0108c6742be24f data\cursed-iron\recipes\iron_ingot_from_smelting_cursed_iron_ingot.json -ce73fe4ef0115705e45b51b1b3dbf96175c89f21 data\cursed-iron\recipes\cursed_iron_ingot.json -49f92fd3912cc7c3fb1b6a69374e6da49af0f760 data\cursed-iron\advancements\recipes\combat\cursed_iron_leggings.json -7d1f95dca91a6bf59821e6d558c7acfaf912ad2a data\cursed-iron\recipes\cursed_iron_pickaxe.json -91afeb019d068b5aafd6987a573da95e41d65ba1 data\cursed-iron\advancements\recipes\tools\cursed_iron_pickaxe.json -585fc9bbf329636a99b831faac229eb824ae82b5 data\cursed-iron\advancements\recipes\combat\cursed_iron_sword.json diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/building_blocks/cursed_iron_block_item.json b/src/main/generated/data/cursed-iron/advancements/recipes/building_blocks/cursed_iron_block_item.json deleted file mode 100644 index 608da1f..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/building_blocks/cursed_iron_block_item.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_block_item" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_block_item" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_boots.json b/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_boots.json deleted file mode 100644 index 0b1bdaa..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_boots.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_boots" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_boots" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_chestplate.json b/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_chestplate.json deleted file mode 100644 index 9a8b333..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_chestplate.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_chestplate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_chestplate" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_helmet.json b/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_helmet.json deleted file mode 100644 index 6f4d5f0..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_helmet.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_helmet" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_helmet" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_leggings.json b/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_leggings.json deleted file mode 100644 index 9babf79..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_leggings.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_leggings" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_leggings" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_sword.json b/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_sword.json deleted file mode 100644 index fd1be55..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/combat/cursed_iron_sword.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_stick": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:stick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_sword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_stick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_sword" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/misc/cursed_iron_ingot.json b/src/main/generated/data/cursed-iron/advancements/recipes/misc/cursed_iron_ingot.json deleted file mode 100644 index b8351b9..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/misc/cursed_iron_ingot.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_nugget": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_nugget" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_nugget", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_ingot" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/misc/cursed_iron_nugget.json b/src/main/generated/data/cursed-iron/advancements/recipes/misc/cursed_iron_nugget.json deleted file mode 100644 index 67a122b..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/misc/cursed_iron_nugget.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_nugget" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/misc/iron_ingot_from_smelting_cursed_iron_ingot.json b/src/main/generated/data/cursed-iron/advancements/recipes/misc/iron_ingot_from_smelting_cursed_iron_ingot.json deleted file mode 100644 index 370c51d..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/misc/iron_ingot_from_smelting_cursed_iron_ingot.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:iron_ingot_from_smelting_cursed_iron_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:iron_ingot_from_smelting_cursed_iron_ingot" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_axe.json b/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_axe.json deleted file mode 100644 index 4864e98..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_axe.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_stick": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:stick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_axe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_stick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_axe" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_hoe.json b/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_hoe.json deleted file mode 100644 index 626b410..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_hoe.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_stick": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:stick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_hoe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_stick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_hoe" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_pickaxe.json b/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_pickaxe.json deleted file mode 100644 index 6db9248..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_pickaxe.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_stick": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:stick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_pickaxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_stick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_pickaxe" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_shovel.json b/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_shovel.json deleted file mode 100644 index f95f699..0000000 --- a/src/main/generated/data/cursed-iron/advancements/recipes/tools/cursed_iron_shovel.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cursed_iron_ingot": { - "conditions": { - "items": [ - { - "items": [ - "cursed-iron:cursed_iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_stick": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:stick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "cursed-iron:cursed_iron_shovel" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_cursed_iron_ingot", - "has_stick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "cursed-iron:cursed_iron_shovel" - ] - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_axe.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_axe.json deleted file mode 100644 index 0d43154..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_axe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - }, - "s": { - "item": "minecraft:stick" - } - }, - "pattern": [ - " ii", - " si", - " s " - ], - "result": { - "item": "cursed-iron:cursed_iron_axe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_block_item.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_block_item.json deleted file mode 100644 index 3c7f858..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_block_item.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - } - }, - "pattern": [ - "iii", - "iii", - "iii" - ], - "result": { - "item": "cursed-iron:cursed_iron_block_item" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_boots.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_boots.json deleted file mode 100644 index 713ccbc..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_boots.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - } - }, - "pattern": [ - "i i", - "i i" - ], - "result": { - "item": "cursed-iron:cursed_iron_boots" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_chestplate.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_chestplate.json deleted file mode 100644 index f6ab58b..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_chestplate.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - } - }, - "pattern": [ - "i i", - "iii", - "iii" - ], - "result": { - "item": "cursed-iron:cursed_iron_chestplate" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_helmet.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_helmet.json deleted file mode 100644 index 6ec224f..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_helmet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - } - }, - "pattern": [ - "iii", - "i i" - ], - "result": { - "item": "cursed-iron:cursed_iron_helmet" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_hoe.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_hoe.json deleted file mode 100644 index f51ee59..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_hoe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - }, - "s": { - "item": "minecraft:stick" - } - }, - "pattern": [ - " ii", - " s ", - " s " - ], - "result": { - "item": "cursed-iron:cursed_iron_hoe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_ingot.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_ingot.json deleted file mode 100644 index 0c2f15b..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_ingot.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "n": { - "item": "cursed-iron:cursed_iron_nugget" - } - }, - "pattern": [ - "nnn", - "nnn", - "nnn" - ], - "result": { - "item": "cursed-iron:cursed_iron_ingot" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_leggings.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_leggings.json deleted file mode 100644 index 363f1d0..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_leggings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - } - }, - "pattern": [ - "iii", - "i i", - "i i" - ], - "result": { - "item": "cursed-iron:cursed_iron_leggings" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_nugget.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_nugget.json deleted file mode 100644 index 14a9e64..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_nugget.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "cursed-iron:cursed_iron_ingot" - } - ], - "result": { - "count": 9, - "item": "cursed-iron:cursed_iron_nugget" - } -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_pickaxe.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_pickaxe.json deleted file mode 100644 index e6e638d..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_pickaxe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - }, - "s": { - "item": "minecraft:stick" - } - }, - "pattern": [ - "iii", - " s ", - " s " - ], - "result": { - "item": "cursed-iron:cursed_iron_pickaxe" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_shovel.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_shovel.json deleted file mode 100644 index cda84bd..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_shovel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - }, - "s": { - "item": "minecraft:stick" - } - }, - "pattern": [ - " i ", - " s ", - " s " - ], - "result": { - "item": "cursed-iron:cursed_iron_shovel" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/cursed_iron_sword.json b/src/main/generated/data/cursed-iron/recipes/cursed_iron_sword.json deleted file mode 100644 index 6bd5c38..0000000 --- a/src/main/generated/data/cursed-iron/recipes/cursed_iron_sword.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "key": { - "i": { - "item": "cursed-iron:cursed_iron_ingot" - }, - "s": { - "item": "minecraft:stick" - } - }, - "pattern": [ - " i ", - " i ", - " s " - ], - "result": { - "item": "cursed-iron:cursed_iron_sword" - }, - "show_notification": true -} \ No newline at end of file diff --git a/src/main/generated/data/cursed-iron/recipes/iron_ingot_from_smelting_cursed_iron_ingot.json b/src/main/generated/data/cursed-iron/recipes/iron_ingot_from_smelting_cursed_iron_ingot.json deleted file mode 100644 index 188772c..0000000 --- a/src/main/generated/data/cursed-iron/recipes/iron_ingot_from_smelting_cursed_iron_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "misc", - "cookingtime": 300, - "experience": 3.0, - "group": "Recipes", - "ingredient": { - "item": "cursed-iron:cursed_iron_ingot" - }, - "result": "minecraft:iron_ingot" -} \ No newline at end of file diff --git a/src/main/java/dev/williamknowleskellett/cursed_iron/CursedIronDataGenerator.java b/src/main/java/dev/williamknowleskellett/cursed_iron/CursedIronDataGenerator.java index c103d6b..952b73f 100644 --- a/src/main/java/dev/williamknowleskellett/cursed_iron/CursedIronDataGenerator.java +++ b/src/main/java/dev/williamknowleskellett/cursed_iron/CursedIronDataGenerator.java @@ -14,7 +14,8 @@ import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.recipe.book.RecipeCategory; - +import net.minecraft.util.Identifier; + public class CursedIronDataGenerator implements DataGeneratorEntrypoint { @Override @@ -53,13 +54,34 @@ public void generate(Consumer exporter) { // FabricRecipeProvider.conditionsFromItem(stick)) // .offerTo(exporter); - //BLOCK + //BLOCK from INGOT ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, CursedIronMod.CURSED_IRON_BLOCK_ITEM).pattern("iii").pattern("iii").pattern("iii") .input('i', ingot) .criterion(FabricRecipeProvider.hasItem(ingot), FabricRecipeProvider.conditionsFromItem(ingot)) .offerTo(exporter); + //INGOT from NUGGET + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ingot).pattern("nnn").pattern("nnn").pattern("nnn") + .input('n', CursedIronMod.CURSED_IRON_NUGGET) + .criterion(FabricRecipeProvider.hasItem(CursedIronMod.CURSED_IRON_NUGGET), + FabricRecipeProvider.conditionsFromItem(CursedIronMod.CURSED_IRON_NUGGET)) + .offerTo(exporter); + + //NUGGET from INGOT + ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, CursedIronMod.CURSED_IRON_NUGGET, 9) + .input(ingot) + .criterion(FabricRecipeProvider.hasItem(ingot), + FabricRecipeProvider.conditionsFromItem(ingot)) + .offerTo(exporter); + + //INGOT from BLOCK + ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, ingot, 9) + .input(CursedIronMod.CURSED_IRON_BLOCK_ITEM) + .criterion(FabricRecipeProvider.hasItem(CursedIronMod.CURSED_IRON_BLOCK_ITEM), + FabricRecipeProvider.conditionsFromItem(CursedIronMod.CURSED_IRON_BLOCK_ITEM)) + .offerTo(exporter, new Identifier(CursedIronMod.MODID, "cursed_iron_ingot2")); + //BOOTS ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, CursedIronMod.CURSED_IRON_BOOTS).pattern("i i").pattern("i i") .input('i', ingot) @@ -100,13 +122,6 @@ public void generate(Consumer exporter) { // FabricRecipeProvider.conditionsFromItem(stick)) // .offerTo(exporter); - //INGOT - ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ingot).pattern("nnn").pattern("nnn").pattern("nnn") - .input('n', CursedIronMod.CURSED_IRON_NUGGET) - .criterion(FabricRecipeProvider.hasItem(CursedIronMod.CURSED_IRON_NUGGET), - FabricRecipeProvider.conditionsFromItem(CursedIronMod.CURSED_IRON_NUGGET)) - .offerTo(exporter); - //LEGGINGS ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, CursedIronMod.CURSED_IRON_LEGGINGS).pattern("iii").pattern("i i").pattern("i i") .input('i', ingot) @@ -114,13 +129,6 @@ public void generate(Consumer exporter) { FabricRecipeProvider.conditionsFromItem(ingot)) .offerTo(exporter); - //NUGGET - ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, CursedIronMod.CURSED_IRON_NUGGET, 9) - .input(ingot) - .criterion(FabricRecipeProvider.hasItem(ingot), - FabricRecipeProvider.conditionsFromItem(ingot)) - .offerTo(exporter); - //PICKAXE ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, CursedIronMod.CURSED_IRON_PICKAXE).pattern("iii").pattern(" s ").pattern(" s ") .input('i', ingot)