diff --git a/build.gradle.kts b/build.gradle.kts index 5fbc0143e..689c8670d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,7 +64,7 @@ neoForge { } configureEach { - systemProperty("forge.logging.markers", "REGISTRIES") + systemProperty("neoforge.logging.markers", "REGISTRIES") logLevel = org.slf4j.event.Level.DEBUG } } diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_blasting.json index 8d3f19e05..d06c6ef49 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_smelting.json index 28862ee0f..f934b58c1 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/aluminum_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json b/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json index 162f1ea2e..74a2084da 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "#forge:ingots/copper" + "items": "#c:ingots/copper" } ] }, diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json b/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json index b8c836909..83dc6c466 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "#forge:ingots/copper" + "items": "#c:ingots/copper" } ] }, diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_blasting.json index 20525eb2b..5fbe08600 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_smelting.json index 134487fcd..d90998630 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/lead_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_blasting.json index cdd76be5e..8e3572a21 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_smelting.json index da602a7ac..27f94da30 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/nickel_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_blasting.json index ce16c37e9..c540d7554 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_smelting.json index 91086de86..bddc35868 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/osmium_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_blasting.json index d942775f0..fff085927 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_smelting.json index d3c9f2c7d..413dfb043 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/silver_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_blasting.json index ad40fc926..1e3822579 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_smelting.json index b14ce2094..d584b8b27 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/tin_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_blasting.json index 5c7d4cb37..28d2a9c6c 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_smelting.json index daba76178..270bac76a 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/uranium_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_blasting.json b/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_blasting.json index c0b0a532e..bdebbdd22 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_blasting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_smelting.json b/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_smelting.json index 14b546010..8769fc794 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_smelting.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/zinc_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_aluminum.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_aluminum.json index 5422b0f23..6396b3cdd 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_aluminum.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_aluminum.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_lead.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_lead.json index 46c7cf314..4bf468b03 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_lead.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_lead.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_nickel.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_nickel.json index 085f2eca7..41a2c4391 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_nickel.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_nickel.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_osmium.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_osmium.json index e97e782c2..5efa7d98b 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_osmium.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_osmium.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_silver.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_silver.json index cef66dcdb..83531184e 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_silver.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_silver.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_tin.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_tin.json index 5a03b8215..ccf0e1114 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_tin.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_tin.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_uranium.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_uranium.json index aecd8bd01..fe22b786a 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_uranium.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_uranium.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" } } ], diff --git a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_zinc.json b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_zinc.json index e6cccaedf..1be8e7629 100644 --- a/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_zinc.json +++ b/src/generated/resources/data/malum/advancement/recipes/spirit_crucible/node_focusing_zinc.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" } } ], diff --git a/src/generated/resources/data/malum/recipe/aluminum_from_node_blasting.json b/src/generated/resources/data/malum/recipe/aluminum_from_node_blasting.json index e60d26ec5..b93266c7f 100644 --- a/src/generated/resources/data/malum/recipe/aluminum_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/aluminum_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/aluminum_from_node_smelting.json b/src/generated/resources/data/malum/recipe/aluminum_from_node_smelting.json index aa8629e5c..5840cade7 100644 --- a/src/generated/resources/data/malum/recipe/aluminum_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/aluminum_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/copper_ingot_from_nugget.json b/src/generated/resources/data/malum/recipe/copper_ingot_from_nugget.json index 80dfa1340..b00f5ec43 100644 --- a/src/generated/resources/data/malum/recipe/copper_ingot_from_nugget.json +++ b/src/generated/resources/data/malum/recipe/copper_ingot_from_nugget.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:nuggets/copper" + "tag": "neoforge:nuggets/copper" } }, "pattern": [ diff --git a/src/generated/resources/data/malum/recipe/copper_nugget_from_ingot.json b/src/generated/resources/data/malum/recipe/copper_nugget_from_ingot.json index 617e77b04..b892e764d 100644 --- a/src/generated/resources/data/malum/recipe/copper_nugget_from_ingot.json +++ b/src/generated/resources/data/malum/recipe/copper_nugget_from_ingot.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" } ], "result": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_aluminum.json b/src/generated/resources/data/malum/recipe/impetus_creation_aluminum.json index 1aef3e157..54465778e 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_aluminum.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_aluminum.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/aluminum" + "tag": "neoforge:ingots/aluminum" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_lead.json b/src/generated/resources/data/malum/recipe/impetus_creation_lead.json index cb45b21f2..d882c8dc3 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_lead.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_lead.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/lead" + "tag": "neoforge:ingots/lead" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_nickel.json b/src/generated/resources/data/malum/recipe/impetus_creation_nickel.json index 6dcaee5d0..d034fbce4 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_nickel.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_nickel.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/nickel" + "tag": "neoforge:ingots/nickel" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_osmium.json b/src/generated/resources/data/malum/recipe/impetus_creation_osmium.json index 519102888..b9bfd5429 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_osmium.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_osmium.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/osmium" + "tag": "neoforge:ingots/osmium" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_silver.json b/src/generated/resources/data/malum/recipe/impetus_creation_silver.json index 813d4fb86..531ba7879 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_silver.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_silver.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/silver" + "tag": "neoforge:ingots/silver" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_tin.json b/src/generated/resources/data/malum/recipe/impetus_creation_tin.json index 5659d6391..58e252bf0 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_tin.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_tin.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/tin" + "tag": "neoforge:ingots/tin" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_uranium.json b/src/generated/resources/data/malum/recipe/impetus_creation_uranium.json index 4fb9d5de5..faa561244 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_uranium.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_uranium.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/uranium" + "tag": "neoforge:ingots/uranium" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/impetus_creation_zinc.json b/src/generated/resources/data/malum/recipe/impetus_creation_zinc.json index 786c377f8..81ad050ed 100644 --- a/src/generated/resources/data/malum/recipe/impetus_creation_zinc.json +++ b/src/generated/resources/data/malum/recipe/impetus_creation_zinc.json @@ -12,7 +12,7 @@ }, { "count": 6, - "tag": "forge:ingots/zinc" + "tag": "neoforge:ingots/zinc" } ], "ingredient": { diff --git a/src/generated/resources/data/malum/recipe/lead_from_node_blasting.json b/src/generated/resources/data/malum/recipe/lead_from_node_blasting.json index 467bb9198..c703babbd 100644 --- a/src/generated/resources/data/malum/recipe/lead_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/lead_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/lead_from_node_smelting.json b/src/generated/resources/data/malum/recipe/lead_from_node_smelting.json index 4edb61de0..2590134e8 100644 --- a/src/generated/resources/data/malum/recipe/lead_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/lead_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/nickel_from_node_blasting.json b/src/generated/resources/data/malum/recipe/nickel_from_node_blasting.json index 8d504dbff..0a9d36b30 100644 --- a/src/generated/resources/data/malum/recipe/nickel_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/nickel_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/nickel_from_node_smelting.json b/src/generated/resources/data/malum/recipe/nickel_from_node_smelting.json index 6cecf1183..5098007d0 100644 --- a/src/generated/resources/data/malum/recipe/nickel_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/nickel_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/node_focusing_aluminum.json b/src/generated/resources/data/malum/recipe/node_focusing_aluminum.json index 487802e79..c825d4d75 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_aluminum.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_aluminum.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/aluminum" + "tag": "neoforge:nuggets/aluminum" } } ], diff --git a/src/generated/resources/data/malum/recipe/node_focusing_lead.json b/src/generated/resources/data/malum/recipe/node_focusing_lead.json index 95d725510..f61ed6fb7 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_lead.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_lead.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/lead" + "tag": "neoforge:nuggets/lead" } } ], diff --git a/src/generated/resources/data/malum/recipe/node_focusing_nickel.json b/src/generated/resources/data/malum/recipe/node_focusing_nickel.json index 59f4389de..7fb1d4374 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_nickel.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_nickel.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/nickel" + "tag": "neoforge:nuggets/nickel" } } ], diff --git a/src/generated/resources/data/malum/recipe/node_focusing_osmium.json b/src/generated/resources/data/malum/recipe/node_focusing_osmium.json index 6eee30d15..b78cc4975 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_osmium.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_osmium.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" } } ], diff --git a/src/generated/resources/data/malum/recipe/node_focusing_silver.json b/src/generated/resources/data/malum/recipe/node_focusing_silver.json index a570fb06e..e26c29046 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_silver.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_silver.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" } } ], diff --git a/src/generated/resources/data/malum/recipe/node_focusing_tin.json b/src/generated/resources/data/malum/recipe/node_focusing_tin.json index ec72335f4..9e0dbf699 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_tin.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_tin.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" } } ], diff --git a/src/generated/resources/data/malum/recipe/node_focusing_uranium.json b/src/generated/resources/data/malum/recipe/node_focusing_uranium.json index da5689ec7..9125090d1 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_uranium.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_uranium.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" } } ], diff --git a/src/generated/resources/data/malum/recipe/node_focusing_zinc.json b/src/generated/resources/data/malum/recipe/node_focusing_zinc.json index a0effdda5..d7b5dec4c 100644 --- a/src/generated/resources/data/malum/recipe/node_focusing_zinc.json +++ b/src/generated/resources/data/malum/recipe/node_focusing_zinc.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" } } ], diff --git a/src/generated/resources/data/malum/recipe/osmium_from_node_blasting.json b/src/generated/resources/data/malum/recipe/osmium_from_node_blasting.json index 332c6c070..a23ca4e76 100644 --- a/src/generated/resources/data/malum/recipe/osmium_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/osmium_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/osmium_from_node_smelting.json b/src/generated/resources/data/malum/recipe/osmium_from_node_smelting.json index 6fa2abb5e..593c88e72 100644 --- a/src/generated/resources/data/malum/recipe/osmium_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/osmium_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/osmium" + "tag": "neoforge:nuggets/osmium" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/silver_from_node_blasting.json b/src/generated/resources/data/malum/recipe/silver_from_node_blasting.json index 4adc56f60..928036ddc 100644 --- a/src/generated/resources/data/malum/recipe/silver_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/silver_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/silver_from_node_smelting.json b/src/generated/resources/data/malum/recipe/silver_from_node_smelting.json index f8defa72a..85643a527 100644 --- a/src/generated/resources/data/malum/recipe/silver_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/silver_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/silver" + "tag": "neoforge:nuggets/silver" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/tin_from_node_blasting.json b/src/generated/resources/data/malum/recipe/tin_from_node_blasting.json index 91a6a0ea2..73c3a3da8 100644 --- a/src/generated/resources/data/malum/recipe/tin_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/tin_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/tin_from_node_smelting.json b/src/generated/resources/data/malum/recipe/tin_from_node_smelting.json index 76b01fd8d..b3467e23b 100644 --- a/src/generated/resources/data/malum/recipe/tin_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/tin_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/tin" + "tag": "neoforge:nuggets/tin" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/uranium_from_node_blasting.json b/src/generated/resources/data/malum/recipe/uranium_from_node_blasting.json index 4003cdc4f..d6c53a7d8 100644 --- a/src/generated/resources/data/malum/recipe/uranium_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/uranium_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/uranium_from_node_smelting.json b/src/generated/resources/data/malum/recipe/uranium_from_node_smelting.json index 2d4e5dd78..f9558a3ec 100644 --- a/src/generated/resources/data/malum/recipe/uranium_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/uranium_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/uranium" + "tag": "neoforge:nuggets/uranium" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/zinc_from_node_blasting.json b/src/generated/resources/data/malum/recipe/zinc_from_node_blasting.json index 5aa0338af..dedf20fcf 100644 --- a/src/generated/resources/data/malum/recipe/zinc_from_node_blasting.json +++ b/src/generated/resources/data/malum/recipe/zinc_from_node_blasting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" } } ], @@ -13,7 +13,7 @@ "cookingtime": 100, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" }, "result": { "count": 1, diff --git a/src/generated/resources/data/malum/recipe/zinc_from_node_smelting.json b/src/generated/resources/data/malum/recipe/zinc_from_node_smelting.json index 0e3086bdc..b57a82031 100644 --- a/src/generated/resources/data/malum/recipe/zinc_from_node_smelting.json +++ b/src/generated/resources/data/malum/recipe/zinc_from_node_smelting.json @@ -4,7 +4,7 @@ "type": "neoforge:not", "value": { "type": "neoforge:tag_empty", - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" } } ], @@ -13,7 +13,7 @@ "cookingtime": 200, "experience": 0.25, "ingredient": { - "tag": "forge:nuggets/zinc" + "tag": "neoforge:nuggets/zinc" }, "result": { "count": 1, diff --git a/src/main/java/com/sammy/malum/MalumMod.java b/src/main/java/com/sammy/malum/MalumMod.java index 05abcb6c2..1312eeb32 100644 --- a/src/main/java/com/sammy/malum/MalumMod.java +++ b/src/main/java/com/sammy/malum/MalumMod.java @@ -5,6 +5,7 @@ import com.sammy.malum.compability.irons_spellbooks.*; import com.sammy.malum.compability.tetra.*; import com.sammy.malum.config.*; +import com.sammy.malum.registry.common.MalumDataComponentRegistry; import com.sammy.malum.registry.common.item.tabs.*; import net.minecraft.resources.*; import net.minecraft.util.*; @@ -58,6 +59,7 @@ public MalumMod() { FEATURE_TYPES.register(modBus); STRUCTURES.register(modBus); CREATIVE_MODE_TABS.register(modBus); + MalumDataComponentRegistry.DATA.register(modBus); TetraCompat.init(); FarmersDelightCompat.init(); diff --git a/src/main/java/com/sammy/malum/common/item/ArcaneElegyMusicDiscItem.java b/src/main/java/com/sammy/malum/common/item/ArcaneElegyMusicDiscItem.java deleted file mode 100644 index caf8c4a9b..000000000 --- a/src/main/java/com/sammy/malum/common/item/ArcaneElegyMusicDiscItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.sammy.malum.common.item; - -import net.minecraft.world.item.*; - -public class ArcaneElegyMusicDiscItem extends Item { - - public ArcaneElegyMusicDiscItem(Properties builder) { - super(builder); - } -} \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/common/item/disc/AestheticaMusicDiscItem.java b/src/main/java/com/sammy/malum/common/item/disc/AestheticaMusicDiscItem.java index d32ab0023..8e87477ad 100644 --- a/src/main/java/com/sammy/malum/common/item/disc/AestheticaMusicDiscItem.java +++ b/src/main/java/com/sammy/malum/common/item/disc/AestheticaMusicDiscItem.java @@ -1,12 +1,13 @@ package com.sammy.malum.common.item.disc; import com.sammy.malum.common.item.*; +import com.sammy.malum.registry.common.SoundRegistry; import net.minecraft.world.item.*; public class AestheticaMusicDiscItem extends Item implements IVoidItem { public AestheticaMusicDiscItem(Properties builder) { - super(builder); + super(builder.jukeboxPlayable(SoundRegistry.AESTHETICA_KEY)); } @Override diff --git a/src/main/java/com/sammy/malum/common/item/disc/ArcaneElegyMusicDiscItem.java b/src/main/java/com/sammy/malum/common/item/disc/ArcaneElegyMusicDiscItem.java index ca46437e1..8fdf23f5b 100644 --- a/src/main/java/com/sammy/malum/common/item/disc/ArcaneElegyMusicDiscItem.java +++ b/src/main/java/com/sammy/malum/common/item/disc/ArcaneElegyMusicDiscItem.java @@ -1,10 +1,11 @@ package com.sammy.malum.common.item.disc; +import com.sammy.malum.registry.common.SoundRegistry; import net.minecraft.world.item.*; public class ArcaneElegyMusicDiscItem extends Item { public ArcaneElegyMusicDiscItem(Properties builder) { - super(builder.jukeboxPlayable(JukeboxSongs.BLOCKS)); + super(builder.jukeboxPlayable(SoundRegistry.ARCANE_ELEGY_KEY)); } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/core/systems/ritual/MalumRitualTier.java b/src/main/java/com/sammy/malum/core/systems/ritual/MalumRitualTier.java index c3d982256..8d47e7ae9 100644 --- a/src/main/java/com/sammy/malum/core/systems/ritual/MalumRitualTier.java +++ b/src/main/java/com/sammy/malum/core/systems/ritual/MalumRitualTier.java @@ -1,5 +1,7 @@ package com.sammy.malum.core.systems.ritual; +import com.mojang.serialization.Codec; +import com.mojang.serialization.DataResult; import com.sammy.malum.common.block.curiosities.ritual_plinth.*; import net.minecraft.resources.*; @@ -18,6 +20,15 @@ public class MalumRitualTier { public static final MalumRitualTier VIVID = create(new MalumRitualTier(malumPath("vivid"), 16384, 5)); public static final MalumRitualTier RADIANT = create(new MalumRitualTier(malumPath("radiant"), 65536, 6)); + public static final Codec CODEC = ResourceLocation.CODEC.flatXmap( + id -> TIERS.stream() + .filter(tier -> tier.identifier.equals(id)) + .findFirst() + .map(DataResult::success) + .orElseThrow(), + tier -> DataResult.success(tier.identifier) + ); + public final ResourceLocation identifier; public final int spiritThreshold; public final int potency; diff --git a/src/main/java/com/sammy/malum/registry/common/MalumDataComponentRegistry.java b/src/main/java/com/sammy/malum/registry/common/MalumDataComponentRegistry.java new file mode 100644 index 000000000..c6fc8de8d --- /dev/null +++ b/src/main/java/com/sammy/malum/registry/common/MalumDataComponentRegistry.java @@ -0,0 +1,19 @@ +package com.sammy.malum.registry.common; + +import com.sammy.malum.MalumMod; +import com.sammy.malum.core.systems.ritual.MalumRitualTier; +import net.minecraft.core.component.DataComponentType; +import net.minecraft.core.registries.Registries; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +public class MalumDataComponentRegistry { + + public static final DeferredRegister> DATA = DeferredRegister.create(Registries.DATA_COMPONENT_TYPE, MalumMod.MALUM); + + public static final DeferredHolder, DataComponentType> RITUAL_TIER = DATA.register("ritual_tier", + () -> DataComponentType.builder() + .persistent(MalumRitualTier.CODEC) + .build() + ); +} \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java b/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java index 374a74da9..07deade4d 100644 --- a/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/SoundRegistry.java @@ -6,12 +6,16 @@ import com.sammy.malum.common.sound.QuartzSoundType; import com.sammy.malum.common.sound.RareEarthSoundType; import net.minecraft.core.registries.*; +import net.minecraft.resources.ResourceKey; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.item.JukeboxSong; import net.minecraft.world.level.block.SoundType; import net.neoforged.neoforge.common.util.*; import net.neoforged.neoforge.registries.*; +import java.util.function.Supplier; + import static com.sammy.malum.MalumMod.MALUM; public class SoundRegistry { @@ -264,6 +268,10 @@ public class SoundRegistry { public static final DeferredHolder ARCANE_ELEGY = register(SoundEvent.createVariableRangeEvent(MalumMod.malumPath("arcane_elegy"))); public static final DeferredHolder AESTHETICA = register(SoundEvent.createVariableRangeEvent(MalumMod.malumPath("aesthetica"))); + public static final ResourceKey ARCANE_ELEGY_KEY = register("arcane_elegy"); + public static final ResourceKey AESTHETICA_KEY = register("aesthetica"); + + public static final SoundType SOULSTONE = new DeferredSoundType(1.0F, 1.0F, SOULSTONE_BREAK, SOULSTONE_STEP, SOULSTONE_PLACE, SOULSTONE_HIT, () -> SoundEvents.STONE_FALL); public static final SoundType DEEPSLATE_SOULSTONE = new DeferredSoundType(1.0F, 1.0F, DEEPSLATE_SOULSTONE_BREAK, DEEPSLATE_SOULSTONE_STEP, DEEPSLATE_SOULSTONE_PLACE, DEEPSLATE_SOULSTONE_HIT, () -> SoundEvents.DEEPSLATE_FALL); public static final SoundType BLAZING_QUARTZ_ORE = new DeferredSoundType(1.0F, 1.0F, BLAZING_QUARTZ_ORE_BREAK, () -> SoundEvents.NETHER_ORE_STEP, BLAZING_QUARTZ_ORE_PLACE, () -> SoundEvents.NETHER_ORE_HIT, () -> SoundEvents.NETHER_GOLD_ORE_FALL); @@ -308,4 +316,8 @@ public class SoundRegistry { public static DeferredHolder register(SoundEvent soundEvent) { return SOUNDS.register(soundEvent.getLocation().getPath(), () -> soundEvent); } + + public static ResourceKey register(String name){ + return ResourceKey.create(Registries.JUKEBOX_SONG, MalumMod.malumPath(name)); + } } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java b/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java index da0ae582b..a8965b420 100644 --- a/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/block/BlockTagRegistry.java @@ -46,6 +46,6 @@ private static TagKey malumTag(String path) { } private static TagKey forgeTag(String name) { - return BlockTags.create(ResourceLocation.fromNamespaceAndPath("forge", name)); + return BlockTags.create(ResourceLocation.fromNamespaceAndPath("neoforge", name)); } } diff --git a/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java index 5b23d962e..bc5913786 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java @@ -10,7 +10,6 @@ import com.sammy.malum.common.block.nature.*; import com.sammy.malum.common.entity.nitrate.*; import com.sammy.malum.common.item.*; -import com.sammy.malum.common.item.ArcaneElegyMusicDiscItem; import com.sammy.malum.common.item.augment.*; import com.sammy.malum.common.item.augment.core.*; import com.sammy.malum.common.item.codex.*; diff --git a/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java index b2f09107b..42f91406c 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ItemTagRegistry.java @@ -79,6 +79,6 @@ private static TagKey malumTag(String path) { } private static TagKey forgeTag(String name) { - return ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", name)); + return ItemTags.create(ResourceLocation.fromNamespaceAndPath("neoforge", name)); } } diff --git a/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java b/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java index 59e60c7fd..cdd73385e 100644 --- a/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/recipe/RecipeSerializerRegistry.java @@ -11,6 +11,7 @@ import com.sammy.malum.common.recipe.void_favor.*; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.crafting.RecipeSerializer; +import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; diff --git a/src/main/resources/assets/malum/models/item/creative_scythe.json b/src/main/resources/assets/malum/models/item/creative_scythe.json index a2621dc5f..646d2bc21 100644 --- a/src/main/resources/assets/malum/models/item/creative_scythe.json +++ b/src/main/resources/assets/malum/models/item/creative_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "base": { "parent": "malum:item/creative_scythe_handheld" }, diff --git a/src/main/resources/assets/malum/models/item/crude_scythe.json b/src/main/resources/assets/malum/models/item/crude_scythe.json index 8b37d75dc..1e24523c4 100644 --- a/src/main/resources/assets/malum/models/item/crude_scythe.json +++ b/src/main/resources/assets/malum/models/item/crude_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "base": { "parent": "malum:item/crude_scythe_handheld" }, diff --git a/src/main/resources/assets/malum/models/item/edge_of_deliverance.json b/src/main/resources/assets/malum/models/item/edge_of_deliverance.json index 7351f31e8..ae7555b71 100644 --- a/src/main/resources/assets/malum/models/item/edge_of_deliverance.json +++ b/src/main/resources/assets/malum/models/item/edge_of_deliverance.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "base": { "parent": "malum:item/edge_of_deliverance_handheld" }, diff --git a/src/main/resources/assets/malum/models/item/soul_of_a_scythe.json b/src/main/resources/assets/malum/models/item/soul_of_a_scythe.json index 6b21263f0..094c058c1 100644 --- a/src/main/resources/assets/malum/models/item/soul_of_a_scythe.json +++ b/src/main/resources/assets/malum/models/item/soul_of_a_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "base": { "parent": "minecraft:item/air" }, diff --git a/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json b/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json index 99b2be176..2fac713a9 100644 --- a/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json +++ b/src/main/resources/assets/malum/models/item/soul_stained_steel_scythe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "base": { "parent": "malum:item/soul_stained_steel_scythe_handheld" }, diff --git a/src/main/resources/assets/malum/models/item/weight_of_worlds.json b/src/main/resources/assets/malum/models/item/weight_of_worlds.json index 6a2464867..2a0480b18 100644 --- a/src/main/resources/assets/malum/models/item/weight_of_worlds.json +++ b/src/main/resources/assets/malum/models/item/weight_of_worlds.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "base": { "parent": "malum:item/weight_of_worlds_handheld" }, diff --git a/src/main/resources/data/malum/advancement/recipes/soul_stained_steel_knife.json b/src/main/resources/data/malum/advancement/recipes/soul_stained_steel_knife.json deleted file mode 100644 index 1a8cb4454..000000000 --- a/src/main/resources/data/malum/advancement/recipes/soul_stained_steel_knife.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "advancements": [ - { - "conditions": [ - { - "modid": "farmersdelight", - "type": "forge:mod_loaded" - } - ], - "advancement": { - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "malum:soul_stained_steel_knife" - ] - }, - "criteria": { - "has_soul_stained_steel": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "malum:soul_stained_steel_ingot" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "malum:soul_stained_steel_knife" - } - } - }, - "requirements": [ - [ - "has_soul_stained_steel", - "has_the_recipe" - ] - ] - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/malum/jukebox_song/aesthetica.json b/src/main/resources/data/malum/jukebox_song/aesthetica.json index 75985e640..85b7e9230 100644 --- a/src/main/resources/data/malum/jukebox_song/aesthetica.json +++ b/src/main/resources/data/malum/jukebox_song/aesthetica.json @@ -4,5 +4,5 @@ "translate": "jukebox_song.malum.aesthetica" }, "length_in_seconds": 7920.0, - "sound_event": "malum:music_disc.malum.aesthetica" + "sound_event": "malum:aesthetica" } \ No newline at end of file diff --git a/src/main/resources/data/malum/jukebox_song/arcane_elegy.json b/src/main/resources/data/malum/jukebox_song/arcane_elegy.json index 52beb156c..01eec9fa1 100644 --- a/src/main/resources/data/malum/jukebox_song/arcane_elegy.json +++ b/src/main/resources/data/malum/jukebox_song/arcane_elegy.json @@ -1,8 +1,8 @@ { - "comparator_output": 62, + "comparator_output": 15, "description": { "translate": "jukebox_song.malum.arcane_elegy" }, "length_in_seconds": 5320.0, - "sound_event": "malum:music_disc.malum.arcane_elegy" + "sound_event": "malum:arcane_elegy" } \ No newline at end of file diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_blazing_quartz.json b/src/main/resources/data/malum/recipe/create/crushing/crush_blazing_quartz.json index 36bf1a484..2052d852a 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_blazing_quartz.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_blazing_quartz.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance.json b/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance.json index 9039b86c5..81bbc9106 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_deepslate.json b/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_deepslate.json index e7b4acf96..2657de856 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_deepslate.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_deepslate.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_stone.json b/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_stone.json index 21d5addd7..aa06613a9 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_stone.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_brilliance_stone.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_deepslate_soulstone.json b/src/main/resources/data/malum/recipe/create/crushing/crush_deepslate_soulstone.json index b8075bde9..a4528df7f 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_deepslate_soulstone.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_deepslate_soulstone.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz.json b/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz.json index 12c5649d2..c61d1cce9 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz_deepslate.json b/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz_deepslate.json index 098c78e51..fda924826 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz_deepslate.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_natural_quartz_deepslate.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths.json b/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths.json index d1c89006b..8662a9b7d 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths_block.json b/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths_block.json index e66f4864c..d39ae44e7 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths_block.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_rare_earths_block.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_raw_soulstone.json b/src/main/resources/data/malum/recipe/create/crushing/crush_raw_soulstone.json index 578fe00ba..a143742c2 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_raw_soulstone.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_raw_soulstone.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/crushing/crush_soulstone.json b/src/main/resources/data/malum/recipe/create/crushing/crush_soulstone.json index 16f994ebd..205c66aab 100644 --- a/src/main/resources/data/malum/recipe/create/crushing/crush_soulstone.json +++ b/src/main/resources/data/malum/recipe/create/crushing/crush_soulstone.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/cutting/cutting_runewood_to_planks.json b/src/main/resources/data/malum/recipe/create/cutting/cutting_runewood_to_planks.json index 494a751b0..5a4170572 100644 --- a/src/main/resources/data/malum/recipe/create/cutting/cutting_runewood_to_planks.json +++ b/src/main/resources/data/malum/recipe/create/cutting/cutting_runewood_to_planks.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/cutting/cutting_soulwood_to_planks.json b/src/main/resources/data/malum/recipe/create/cutting/cutting_soulwood_to_planks.json index 191d87ab6..4deb6a341 100644 --- a/src/main/resources/data/malum/recipe/create/cutting/cutting_soulwood_to_planks.json +++ b/src/main/resources/data/malum/recipe/create/cutting/cutting_soulwood_to_planks.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log.json b/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log.json index 748a9860c..91fbc6cb9 100644 --- a/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log.json +++ b/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log_alt.json b/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log_alt.json index fbc61da0e..aeb003ce3 100644 --- a/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log_alt.json +++ b/src/main/resources/data/malum/recipe/create/cutting/strip_runewood_log_alt.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log.json b/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log.json index 92ddc4358..c2b45774a 100644 --- a/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log.json +++ b/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log_alt.json b/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log_alt.json index 84dbfaee6..77e0794fd 100644 --- a/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log_alt.json +++ b/src/main/resources/data/malum/recipe/create/cutting/strip_soulwood_log_alt.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/washing/copper_node.json b/src/main/resources/data/malum/recipe/create/washing/copper_node.json index d077f306e..00de3c452 100644 --- a/src/main/resources/data/malum/recipe/create/washing/copper_node.json +++ b/src/main/resources/data/malum/recipe/create/washing/copper_node.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/washing/crushed_brilliance.json b/src/main/resources/data/malum/recipe/create/washing/crushed_brilliance.json index 9e690d808..6c97d21c4 100644 --- a/src/main/resources/data/malum/recipe/create/washing/crushed_brilliance.json +++ b/src/main/resources/data/malum/recipe/create/washing/crushed_brilliance.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/washing/crushed_soulstone.json b/src/main/resources/data/malum/recipe/create/washing/crushed_soulstone.json index c013e71fd..b685909be 100644 --- a/src/main/resources/data/malum/recipe/create/washing/crushed_soulstone.json +++ b/src/main/resources/data/malum/recipe/create/washing/crushed_soulstone.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/washing/gold_node.json b/src/main/resources/data/malum/recipe/create/washing/gold_node.json index ad3e5a5a7..d815f4798 100644 --- a/src/main/resources/data/malum/recipe/create/washing/gold_node.json +++ b/src/main/resources/data/malum/recipe/create/washing/gold_node.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/washing/iron_node.json b/src/main/resources/data/malum/recipe/create/washing/iron_node.json index a6eec6960..aa4d26bca 100644 --- a/src/main/resources/data/malum/recipe/create/washing/iron_node.json +++ b/src/main/resources/data/malum/recipe/create/washing/iron_node.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/create/washing/zinc_node.json b/src/main/resources/data/malum/recipe/create/washing/zinc_node.json index f39ecc8cd..a814cfad7 100644 --- a/src/main/resources/data/malum/recipe/create/washing/zinc_node.json +++ b/src/main/resources/data/malum/recipe/create/washing/zinc_node.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/farmersdelight/holy_caramel.json b/src/main/resources/data/malum/recipe/farmersdelight/holy_caramel.json index 58c38c319..10c6e0074 100644 --- a/src/main/resources/data/malum/recipe/farmersdelight/holy_caramel.json +++ b/src/main/resources/data/malum/recipe/farmersdelight/holy_caramel.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "farmersdelight" } ], diff --git a/src/main/resources/data/malum/recipe/farmersdelight/unholy_caramel.json b/src/main/resources/data/malum/recipe/farmersdelight/unholy_caramel.json index 799246da5..7ecad05a7 100644 --- a/src/main/resources/data/malum/recipe/farmersdelight/unholy_caramel.json +++ b/src/main/resources/data/malum/recipe/farmersdelight/unholy_caramel.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "farmersdelight" } ], diff --git a/src/main/resources/data/malum/recipe/jeed/aethers_charm.json b/src/main/resources/data/malum/recipe/jeed/aethers_charm.json index 2641fc0b8..cb1a74325 100644 --- a/src/main/resources/data/malum/recipe/jeed/aethers_charm.json +++ b/src/main/resources/data/malum/recipe/jeed/aethers_charm.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:aethers_charm" - }, + "effect": "malum:aethers_charm", "providers": [ { "item": "malum:soulwood_totem_base" diff --git a/src/main/resources/data/malum/recipe/jeed/anglers_lure.json b/src/main/resources/data/malum/recipe/jeed/anglers_lure.json index 808ddd5eb..7a0565b0f 100644 --- a/src/main/resources/data/malum/recipe/jeed/anglers_lure.json +++ b/src/main/resources/data/malum/recipe/jeed/anglers_lure.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:anglers_lure" - }, + "effect": "malum:anglers_lure", "providers": [ { "item": "malum:soulwood_totem_base" diff --git a/src/main/resources/data/malum/recipe/jeed/earthen_might.json b/src/main/resources/data/malum/recipe/jeed/earthen_might.json index 3a4e2d0bc..59271f6a9 100644 --- a/src/main/resources/data/malum/recipe/jeed/earthen_might.json +++ b/src/main/resources/data/malum/recipe/jeed/earthen_might.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:earthen_might" - }, + "effect":"malum:earthen_might", "providers": [ { "item": "malum:soulwood_totem_base" diff --git a/src/main/resources/data/malum/recipe/jeed/gaias_bulwark.json b/src/main/resources/data/malum/recipe/jeed/gaias_bulwark.json index 0a40b4a7a..bb70e68f1 100644 --- a/src/main/resources/data/malum/recipe/jeed/gaias_bulwark.json +++ b/src/main/resources/data/malum/recipe/jeed/gaias_bulwark.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:gaias_bulwark" - }, + "effect":"malum:gaias_bulwark", "providers": [ { "item": "malum:runewood_totem_base" diff --git a/src/main/resources/data/malum/recipe/jeed/gluttony.json b/src/main/resources/data/malum/recipe/jeed/gluttony.json index 3948fff0d..896186c4c 100644 --- a/src/main/resources/data/malum/recipe/jeed/gluttony.json +++ b/src/main/resources/data/malum/recipe/jeed/gluttony.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:gluttony" - }, + "effect": "malum:gluttony", "providers": [ { "item": "malum:belt_of_the_starved" diff --git a/src/main/resources/data/malum/recipe/jeed/ifrits_embrace.json b/src/main/resources/data/malum/recipe/jeed/ifrits_embrace.json index a7a68eef0..dc8c292b3 100644 --- a/src/main/resources/data/malum/recipe/jeed/ifrits_embrace.json +++ b/src/main/resources/data/malum/recipe/jeed/ifrits_embrace.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:ifrits_embrace" - }, + "effect": "malum:ifrits_embrace", "providers": [ { "item": "malum:soulwood_totem_base" diff --git a/src/main/resources/data/malum/recipe/jeed/miners_rage.json b/src/main/resources/data/malum/recipe/jeed/miners_rage.json index bb4a8df5e..8d4d15909 100644 --- a/src/main/resources/data/malum/recipe/jeed/miners_rage.json +++ b/src/main/resources/data/malum/recipe/jeed/miners_rage.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:miners_rage" - }, + "effect": "malum:miners_rage", "providers": [ { "item": "malum:runewood_totem_base" diff --git a/src/main/resources/data/malum/recipe/jeed/poseidons_grasp.json b/src/main/resources/data/malum/recipe/jeed/poseidons_grasp.json index e4ea7e415..8a4002dd9 100644 --- a/src/main/resources/data/malum/recipe/jeed/poseidons_grasp.json +++ b/src/main/resources/data/malum/recipe/jeed/poseidons_grasp.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:poseidons_grasp" - }, + "effect": "malum:poseidons_grasp", "providers": [ { "item": "malum:runewood_totem_base" diff --git a/src/main/resources/data/malum/recipe/jeed/zephyrs_courage.json b/src/main/resources/data/malum/recipe/jeed/zephyrs_courage.json index c02f6d6af..33fddb69c 100644 --- a/src/main/resources/data/malum/recipe/jeed/zephyrs_courage.json +++ b/src/main/resources/data/malum/recipe/jeed/zephyrs_courage.json @@ -1,8 +1,6 @@ { "type": "jeed:effect_provider", - "effect":{ - "id": "malum:zephyrs_courage" - }, + "effect": "malum:zephyrs_courage", "providers": [ { "item": "malum:runewood_totem_base" diff --git a/src/main/resources/data/malum/recipe/malum/soul_stained_steel_knife.json b/src/main/resources/data/malum/recipe/malum/soul_stained_steel_knife.json deleted file mode 100644 index 1316dfcb1..000000000 --- a/src/main/resources/data/malum/recipe/malum/soul_stained_steel_knife.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "modid": "farmersdelight", - "type": "forge:mod_loaded" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "# " - ], - "key": { - "#": { - "tag": "forge:rods/wooden" - }, - "X": { - "item": "malum:soul_stained_steel_ingot" - } - }, - "result": { - "id": "malum:soul_stained_steel_knife" - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/alfsteel.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/alfsteel.json index 3136fa30e..aa1594e5b 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/alfsteel.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/alfsteel.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "mythicbotany" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/elementium.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/elementium.json index f55b1f9bd..9c33536e7 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/elementium.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/elementium.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "botania" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/manasteel.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/manasteel.json index 05b8a370f..1d6360ec7 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/manasteel.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/manasteel.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "botania" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/terrasteel.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/terrasteel.json index d17f9c6f1..7c62368e4 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/terrasteel.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/botania/terrasteel.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "botania" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminium.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminium.json index b4349867e..dacd7eba0 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminium.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminium.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/aluminium", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/aluminium", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/aluminium", + "tag": "neoforge:ingots/aluminium", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminum.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminum.json index 7e73fab48..24c663220 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminum.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/aluminum.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/aluminum", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/aluminum", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/aluminum", + "tag": "neoforge:ingots/aluminum", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/brass.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/brass.json index 771627d66..675911b16 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/brass.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/brass.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/brass", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/brass", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/brass", + "tag": "neoforge:ingots/brass", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/bronze.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/bronze.json index 68ccaf1e0..7c2ac75d6 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/bronze.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/bronze.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/bronze", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/bronze", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/bronze", + "tag": "neoforge:ingots/bronze", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/electrum.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/electrum.json index c4c4f044f..6c6c6ad67 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/electrum.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/electrum.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/electrum", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/electrum", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/electrum", + "tag": "neoforge:ingots/electrum", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/lead.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/lead.json index 70bd4dc18..836b6b210 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/lead.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/lead.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/lead", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/lead", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/lead", + "tag": "neoforge:ingots/lead", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/nickel.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/nickel.json index a82cff886..5d7891c64 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/nickel.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/nickel.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/nickel", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/nickel", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/nickel", + "tag": "neoforge:ingots/nickel", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/osmium.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/osmium.json index 4ec25cc0f..3775780b7 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/osmium.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/osmium.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/osmium", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/osmium", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/osmium", + "tag": "neoforge:ingots/osmium", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/platinum.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/platinum.json index f5becfd05..6466ce1e1 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/platinum.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/platinum.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/platinum", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/platinum", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/platinum", + "tag": "neoforge:ingots/platinum", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/silver.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/silver.json index e2dfbc49e..d2dbe1d79 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/silver.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/silver.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/silver", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/silver", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/silver", + "tag": "neoforge:ingots/silver", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/steel.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/steel.json index 1bc8849ea..4d5638d4e 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/steel.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/steel.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/steel", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/steel", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/steel", + "tag": "neoforge:ingots/steel", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/tin.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/tin.json index bc32f6e25..b4cd2620e 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/tin.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/tin.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/tin", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/tin", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/tin", + "tag": "neoforge:ingots/tin", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/zinc.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/zinc.json index 0dbf7f05a..66ee3a431 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/zinc.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/common/zinc.json @@ -1,11 +1,11 @@ { - "conditions": [ + "neoforge:conditions": [ { "value": { - "tag": "forge:ingots/zinc", - "type": "forge:tag_empty" + "tag": "neoforge:ingots/zinc", + "type": "neoforge:tag_empty" }, - "type": "forge:not" + "type": "neoforge:not" } ], "type": "malum:spirit_repair", @@ -15,7 +15,7 @@ "inputs": [ ], "repairMaterial": { - "tag": "forge:ingots/zinc", + "tag": "neoforge:ingots/zinc", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/diving_gear.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/diving_gear.json index 598138809..1d45270c6 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/diving_gear.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/diving_gear.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/broom.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/broom.json index 2a969cee8..c6dcd55c1 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/broom.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/broom.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "hexerei" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/witch_armor.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/witch_armor.json index fab33906c..d79b8715d 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/witch_armor.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/hexerei/witch_armor.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "hexerei" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/gold_chalk.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/gold_chalk.json index b0bae83c1..91e87d3ca 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/gold_chalk.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/gold_chalk.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "occultism" } ], @@ -13,7 +13,7 @@ "occultism:chalk_gold" ], "repairMaterial": { - "tag": "forge:dusts/gold", + "tag": "neoforge:dusts/gold", "count": 1 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/purple_chalk.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/purple_chalk.json index 51eb01440..6233f5bcb 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/purple_chalk.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/purple_chalk.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "occultism" } ], @@ -13,7 +13,7 @@ "occultism:chalk_purple" ], "repairMaterial": { - "tag": "forge:dusts/obsidian", + "tag": "neoforge:dusts/obsidian", "count": 2 }, "spirits": [ diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/red_chalk.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/red_chalk.json index 3b29a8d60..155fa28d6 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/red_chalk.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/red_chalk.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "occultism" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/white_chalk.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/white_chalk.json index ab704b14d..d445714a3 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/white_chalk.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/occultism/white_chalk.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "occultism" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/scuba_gear.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/scuba_gear.json index e24dd52d2..71ff2d557 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/scuba_gear.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/scuba_gear.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "scuba_gear" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/skillet.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/skillet.json index 903f2c6ea..57586e8aa 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/skillet.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/skillet.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "farmersdelight" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/cloggrum.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/cloggrum.json index 0a5f58722..623469d5d 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/cloggrum.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/cloggrum.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "undergarden" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/forgotten.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/forgotten.json index 117260df4..7c5997bde 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/forgotten.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/forgotten.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "undergarden" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/froststeel.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/froststeel.json index cfed07c1b..99cb4df85 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/froststeel.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/froststeel.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "undergarden" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/slingshot.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/slingshot.json index c7bbf9cfb..f6e217c78 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/slingshot.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/slingshot.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "undergarden" } ], diff --git a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/utherium.json b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/utherium.json index 550f5e708..bb914fbc9 100644 --- a/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/utherium.json +++ b/src/main/resources/data/malum/recipe/malum/spirit_crucible/repair/undergarden/utherium.json @@ -1,7 +1,7 @@ { - "conditions": [ + "neoforge:conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "undergarden" } ], diff --git a/src/main/resources/data/malum/ritual_recipes/cthonic_conversion.json b/src/main/resources/data/malum/ritual_recipes/cthonic_conversion.json deleted file mode 100644 index 0d7a9b0ee..000000000 --- a/src/main/resources/data/malum/ritual_recipes/cthonic_conversion.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "ritual_identifier": "malum:cthonic_conversion", - "input": { - "count": 2, - "item": "minecraft:raw_gold_block" - }, - "extra_items": [ - { - "count": 8, - "item": "minecraft:gold_nugget" - }, - { - "count": 4, - "item": "malum:cursed_grit" - }, - { - "count": 4, - "item": "minecraft:blaze_powder" - }, - { - "count": 2, - "item": "minecraft:gold_ingot" - }, - { - "count": 1, - "item": "minecraft:gold_block" - } - ] -} \ No newline at end of file