diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 75504cd05e..a0159ebb80 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -1289,6 +1289,7 @@ "create.item_attributes.smokable.inverted": "pǝʞoɯS ǝq ʇouuɐɔ", "create.item_attributes.washable": "pǝɥsɐM ǝq uɐɔ", "create.item_attributes.washable.inverted": "pǝɥsɐM ǝq ʇouuɐɔ", + "create.keyinfo.ponder": "ɹǝpuoԀ", "create.keyinfo.scrolldown": ")pןɹoʍuı( uʍoᗡ ןǝǝɥʍǝsnoW ǝʇɐןnɯıS", "create.keyinfo.scrollup": ")pןɹoʍuı( d∩ ןǝǝɥʍǝsnoW ǝʇɐןnɯıS", "create.keyinfo.toolbelt": "sǝxoqןoo⟘ ʎqɹɐǝN ssǝɔɔⱯ", @@ -1781,7 +1782,7 @@ "create.ponder.mechanical_arm_redstone.text_1": "ǝʇɐʌıʇɔɐ ʇou ןןıʍ sɯɹⱯ ןɐɔıuɐɥɔǝW 'ǝuoʇspǝᴚ ʎq pǝɹǝʍod uǝɥM", "create.ponder.mechanical_arm_redstone.text_2": "sǝןɔʎɔ pǝʇɹɐʇs ʎuɐ ɥsıuıɟ ןןıʍ ʇı 'buıddoʇs ǝɹoɟǝᗺ", "create.ponder.mechanical_arm_redstone.text_3": "ǝןɔʎɔ uoıʇɐʌıʇɔɐ ǝuo ʎןʇɔɐxǝ ɹǝbbıɹʇ oʇ pǝsn ǝq uɐɔ ǝsןnd ǝʌıʇɐbǝu ɐ 'snɥ⟘", - "create.ponder.mechanical_bearing.header": "buıɹɐǝᗺ ןɐɔıuɐɥɔǝW ǝɥʇ buısn sǝɹnʇɔnɹʇS sbuıʌoW", + "create.ponder.mechanical_bearing.header": "buıɹɐǝᗺ ןɐɔıuɐɥɔǝW ǝɥʇ buısn sǝɹnʇɔnɹʇS buıʌoW", "create.ponder.mechanical_bearing.text_1": "ɯǝɥʇ ɟo ʇuoɹɟ uı ʞɔoןq ǝɥʇ oʇ ɥɔɐʇʇɐ sbuıɹɐǝᗺ ןɐɔıuɐɥɔǝW", "create.ponder.mechanical_bearing.text_2": "uoıʇdɐɹʇuoƆ buıʇɐʇoᴚ ɐ oʇuı ʇı ǝןqɯǝssɐ ןןıʍ ʇı 'ǝɔɹoℲ ןɐuoıʇɐʇoᴚ buıʌıǝɔǝɹ uod∩", "create.ponder.mechanical_crafter.header": "sɹǝʇɟɐɹƆ ןɐɔıuɐɥɔǝW dn buıʇʇǝS", @@ -2519,6 +2520,7 @@ "create.subtitle.schematicannon_launch_block": "sǝɹıɟ uouuɐɔıʇɐɯǝɥɔS", "create.subtitle.scroll_value": "sʞɔıןɔ ʇnduı-ןןoɹɔS", "create.subtitle.slime_added": "sǝɥsınbs ǝɯıןS", + "create.subtitle.spout": "sʇɹnds ʇnodS", "create.subtitle.steam": "sǝsıou ɯɐǝʇS", "create.subtitle.train": "ǝןqɯnɹ sןǝǝɥʍ ʎǝboᗺ", "create.subtitle.train3": "pǝןɟɟnɯ ǝןqɯnɹ sןǝǝɥʍ ʎǝboᗺ", diff --git a/src/generated/resources/assets/create/sounds.json b/src/generated/resources/assets/create/sounds.json index 557bdb9e1c..dc904af682 100644 --- a/src/generated/resources/assets/create/sounds.json +++ b/src/generated/resources/assets/create/sounds.json @@ -19,16 +19,16 @@ "clipboard_check": { "sounds": [ { - "name": "create:clipboard_check", - "type": "file" + "type": "file", + "name": "create:clipboard_check" } ] }, "clipboard_erase": { "sounds": [ { - "name": "create:clipboard_erase", - "type": "file" + "type": "file", + "name": "create:clipboard_erase" } ] }, @@ -407,20 +407,20 @@ "spout": { "sounds": [ { - "name": "create:spout", - "type": "file" + "type": "file", + "name": "create:spout" }, { - "name": "create:spout_1", - "type": "file" + "type": "file", + "name": "create:spout_1" }, { - "name": "create:spout_2", - "type": "file" + "type": "file", + "name": "create:spout_2" }, { - "name": "create:spout_3", - "type": "file" + "type": "file", + "name": "create:spout_3" } ], "subtitle": "create.subtitle.spout" diff --git a/src/generated/resources/data/c/tags/items/dusts/obsidian.json b/src/generated/resources/data/c/tags/items/dusts/obsidian.json index 547c14cadb..1e14f253ca 100644 --- a/src/generated/resources/data/c/tags/items/dusts/obsidian.json +++ b/src/generated/resources/data/c/tags/items/dusts/obsidian.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "create:powdered_obsidian" ] diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_ic2.json index 8d7973e25f..7dd5fb6e9c 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/ingot_aluminum_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/ingot_aluminum_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/ingot_aluminum_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_ic2.json index aa10091337..698a0b8172 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/ingot_silver_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/ingot_silver_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/ingot_silver_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_ic2.json index 05cf29bc20..e31e62c8d5 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/ingot_tin_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/ingot_tin_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/ingot_tin_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_ic2.json index 74f39ade13..2d3b2a40da 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/ingot_uranium_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/ingot_uranium_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/ingot_uranium_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_oreganized.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_oreganized.json index 470677cf6e..3e85c568d4 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_oreganized.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_oreganized.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/lead_ingot_compat_oreganized" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/lead_ingot_compat_oreganized" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/lead_ingot_compat_oreganized" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_galosphere.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_galosphere.json index e467055ac7..520fa394ec 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_galosphere.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_galosphere.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/silver_ingot_compat_galosphere" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/silver_ingot_compat_galosphere" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/silver_ingot_compat_galosphere" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json index 1de079c85c..798e23c4c3 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/silver_ingot_compat_iceandfire" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/silver_ingot_compat_iceandfire" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/silver_ingot_compat_iceandfire" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_oreganized.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_oreganized.json index bd890e4783..d67cf02f23 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_oreganized.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_oreganized.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/silver_ingot_compat_oreganized" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/silver_ingot_compat_oreganized" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/silver_ingot_compat_oreganized" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_ic2.json index abf18f1400..609d256aeb 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/ingot_aluminum_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/ingot_aluminum_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/ingot_aluminum_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_ic2.json index 9b2b7665e3..75162b24d1 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/ingot_silver_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/ingot_silver_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/ingot_silver_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_ic2.json index 0f9bc1e88c..bbc4dceed8 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/ingot_tin_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/ingot_tin_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/ingot_tin_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_ic2.json index 1b7c115149..5dc2f03185 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/ingot_uranium_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/ingot_uranium_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/ingot_uranium_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_oreganized.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_oreganized.json index dd81cc4479..f0e81b4472 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_oreganized.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_oreganized.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/lead_ingot_compat_oreganized" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/lead_ingot_compat_oreganized" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/lead_ingot_compat_oreganized" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_galosphere.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_galosphere.json index 172f0db60a..f21ce7b553 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_galosphere.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_galosphere.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/silver_ingot_compat_galosphere" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/silver_ingot_compat_galosphere" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/silver_ingot_compat_galosphere" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json index ea4f6baff5..f57a2495ec 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/silver_ingot_compat_iceandfire" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/silver_ingot_compat_iceandfire" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/silver_ingot_compat_iceandfire" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_oreganized.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_oreganized.json index c06096bb36..cfa3dec8df 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_oreganized.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_oreganized.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/silver_ingot_compat_oreganized" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/silver_ingot_compat_oreganized" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/silver_ingot_compat_oreganized" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearbox.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearbox.json index 8b4f25fccf..0b0e2dfe5b 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearbox.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearbox.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/kinetics/vertical_gearbox" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:crafting/kinetics/vertical_gearbox" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:crafting/kinetics/vertical_gearbox" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json index e67e55551e..e47485e5cb 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting///tree_fertilizer" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:crafting///tree_fertilizer" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:crafting///tree_fertilizer" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/vertical_gearbox.json b/src/generated/resources/data/create/recipes/crafting/kinetics/vertical_gearbox.json index 41ca8a86ff..b00c6fa8c7 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/vertical_gearbox.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/vertical_gearbox.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "C C", - " B ", - "C C" - ], "key": { - "C": { - "item": "create:cogwheel" - }, "B": { "item": "create:andesite_casing" + }, + "C": { + "item": "create:cogwheel" } }, + "pattern": [ + "C C", + " B ", + "C C" + ], "result": { "item": "create:vertical_gearbox" } diff --git a/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json b/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json index 677a99daaf..6ba51e0fc1 100644 --- a/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json +++ b/src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json @@ -15,7 +15,7 @@ } ], "result": { - "item": "create:tree_fertilizer", - "count": 2 + "count": 2, + "item": "create:tree_fertilizer" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/diorite.json b/src/generated/resources/data/create/recipes/crushing/diorite.json index b6aa817a93..aa35df5d59 100644 --- a/src/generated/resources/data/create/recipes/crushing/diorite.json +++ b/src/generated/resources/data/create/recipes/crushing/diorite.json @@ -1,5 +1,14 @@ { "type": "create:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "exnihilosequentia" + } + } + ], "ingredients": [ { "item": "minecraft:diorite" diff --git a/src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json b/src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json index df163c327f..96d2d4b331 100644 --- a/src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json +++ b/src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json @@ -5,19 +5,19 @@ "item": "minecraft:gilded_blackstone" } ], + "processingTime": 400, "results": [ { - "item": "minecraft:gold_nugget", - "count": 18 + "count": 18, + "item": "minecraft:gold_nugget" }, { - "item": "create:experience_nugget", - "chance": 0.75 + "chance": 0.75, + "item": "create:experience_nugget" }, { - "item": "minecraft:blackstone", - "chance": 0.125 + "chance": 0.125, + "item": "minecraft:blackstone" } - ], - "processingTime": 400 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/netherrack.json b/src/generated/resources/data/create/recipes/crushing/netherrack.json index d51f72e635..4d021a25c1 100644 --- a/src/generated/resources/data/create/recipes/crushing/netherrack.json +++ b/src/generated/resources/data/create/recipes/crushing/netherrack.json @@ -1,5 +1,14 @@ { "type": "create:crushing", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "exnihilosequentia" + } + } + ], "ingredients": [ { "item": "minecraft:netherrack" diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json similarity index 73% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json index 426ba3e4a6..21b0003a0e 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_log.json @@ -10,13 +10,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:cherrywood" + "item": "forbidden_arcanus:aurum_log" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_cherrywood" + "item": "forbidden_arcanus:stripped_aurum_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json similarity index 72% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json index f268155418..6d180b9687 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/aurum_wood.json @@ -10,13 +10,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:mysterywood" + "item": "forbidden_arcanus:aurum_wood" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_mysterywood" + "item": "forbidden_arcanus:stripped_aurum_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json similarity index 71% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json index 7518ea3207..37caf429fa 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_log.json @@ -10,13 +10,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:cherrywood_log" + "item": "forbidden_arcanus:cherry_log" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_cherrywood_log" + "item": "forbidden_arcanus:stripped_cherry_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_wood.json similarity index 71% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_wood.json index 8243c03171..c67e3c24d2 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/cherry_wood.json @@ -10,13 +10,13 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:mysterywood_log" + "item": "forbidden_arcanus:cherry_wood" } ], "processingTime": 50, "results": [ { - "item": "forbidden_arcanus:stripped_mysterywood_log" + "item": "forbidden_arcanus:stripped_cherry_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_log.json similarity index 72% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_log.json index 6802fcdf69..63e07415eb 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_log.json @@ -10,14 +10,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_cherrywood" + "item": "forbidden_arcanus:stripped_aurum_log" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:cherrywood_planks" + "item": "forbidden_arcanus:aurum_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_wood.json similarity index 72% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_wood.json index 27912dbac8..479fc0d71a 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_aurum_wood.json @@ -10,14 +10,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_mysterywood" + "item": "forbidden_arcanus:stripped_aurum_wood" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:mysterywood_planks" + "item": "forbidden_arcanus:aurum_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_log.json similarity index 72% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_log.json index 6fcfd5627e..2535804844 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherrywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_log.json @@ -10,14 +10,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_cherrywood_log" + "item": "forbidden_arcanus:stripped_cherry_log" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:cherrywood_planks" + "item": "forbidden_arcanus:cherry_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_wood.json similarity index 71% rename from src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json rename to src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_wood.json index 65d7553580..59ff052bf5 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_mysterywood_log.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/forbidden_arcanus/stripped_cherry_wood.json @@ -10,14 +10,14 @@ ], "ingredients": [ { - "item": "forbidden_arcanus:stripped_mysterywood_log" + "item": "forbidden_arcanus:stripped_cherry_wood" } ], "processingTime": 50, "results": [ { "count": 6, - "item": "forbidden_arcanus:mysterywood_planks" + "item": "forbidden_arcanus:cherry_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_log.json new file mode 100644 index 0000000000..9bf7bae194 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:cypress_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_cypress_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_wood.json new file mode 100644 index 0000000000..a79fd9ee4e --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/cypress_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:cypress_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_cypress_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_log.json new file mode 100644 index 0000000000..f51850831e --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:muddy_oak_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_muddy_oak_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json new file mode 100644 index 0000000000..d4b59beafe --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/muddy_oak_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:muddy_oak_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "goodending:stripped_muddy_oak_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json new file mode 100644 index 0000000000..9cf45d2bd6 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_cypress_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:cypress_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json new file mode 100644 index 0000000000..627e3bbbac --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_cypress_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_cypress_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:cypress_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json new file mode 100644 index 0000000000..b87c794689 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_muddy_oak_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:muddy_oak_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json new file mode 100644 index 0000000000..fa4e87410f --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/goodending/stripped_muddy_oak_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "goodending" + } + ], + "ingredients": [ + { + "item": "goodending:stripped_muddy_oak_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "goodending:muddy_oak_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_log.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_log.json new file mode 100644 index 0000000000..f8c7732a1c --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:ancient_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "quark:stripped_ancient_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_wood.json new file mode 100644 index 0000000000..79654adb92 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/ancient_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:ancient_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "quark:stripped_ancient_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_log.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_log.json new file mode 100644 index 0000000000..75de73d79e --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:stripped_ancient_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "quark:ancient_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json new file mode 100644 index 0000000000..7cdcf9a09b --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/quark/stripped_ancient_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "quark" + } + ], + "ingredients": [ + { + "item": "quark:stripped_ancient_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "quark:ancient_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_log.json new file mode 100644 index 0000000000..ec333925e7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:chestnut_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_chestnut_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_wood.json new file mode 100644 index 0000000000..965afa048f --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/chestnut_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:chestnut_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_chestnut_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_log.json new file mode 100644 index 0000000000..65e94f9382 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_log.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:holly_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_holly_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_wood.json new file mode 100644 index 0000000000..a82a608d40 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/holly_wood.json @@ -0,0 +1,20 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:holly_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "windswept:stripped_holly_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json new file mode 100644 index 0000000000..01780d0c08 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_chestnut_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:chestnut_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json new file mode 100644 index 0000000000..d37badef6f --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_chestnut_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_chestnut_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:chestnut_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_log.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_log.json new file mode 100644 index 0000000000..167c4f8507 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_log.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_holly_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:holly_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json new file mode 100644 index 0000000000..316c524efd --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/compat/windswept/stripped_holly_wood.json @@ -0,0 +1,21 @@ +{ + "type": "create:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "windswept" + } + ], + "ingredients": [ + { + "item": "windswept:stripped_holly_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "windswept:holly_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json index 6322f23f11..66f3fe09da 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/black_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/black" } ], + "processingTime": 50, "results": [ { "item": "minecraft:black_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json index 8fec52ee86..d47e820231 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/blue_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/blue" } ], + "processingTime": 50, "results": [ { "item": "minecraft:blue_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json index ac67a9302d..d1f3eb4953 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/brown_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/brown" } ], + "processingTime": 50, "results": [ { "item": "minecraft:brown_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json index bcbbecdf91..05fe7d87b3 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/cyan_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/cyan" } ], + "processingTime": 50, "results": [ { "item": "minecraft:cyan_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json index 8262838dfa..9bb0bcd245 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/gray_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/gray" } ], + "processingTime": 50, "results": [ { "item": "minecraft:gray_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json index 188afb497d..ed4641482c 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/green_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/green" } ], + "processingTime": 50, "results": [ { "item": "minecraft:green_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json index 2344910e8b..595e18953b 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/light_blue_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/light_blue" } ], + "processingTime": 50, "results": [ { "item": "minecraft:light_blue_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json index 7386d75cbe..5b9a6bd523 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/light_gray_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/light_gray" } ], + "processingTime": 50, "results": [ { "item": "minecraft:light_gray_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json index 0da4355537..51bac8733f 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/lime_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/lime" } ], + "processingTime": 50, "results": [ { "item": "minecraft:lime_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json index c490738b01..8001d8fd7d 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/magenta_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/magenta" } ], + "processingTime": 50, "results": [ { "item": "minecraft:magenta_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json index ebd6319d6d..b0d9957e13 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/orange_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/orange" } ], + "processingTime": 50, "results": [ { "item": "minecraft:orange_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json index 409515883d..c875d311e4 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/pink_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/pink" } ], + "processingTime": 50, "results": [ { "item": "minecraft:pink_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json index 60c45cf52a..13ad6984ca 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/purple_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/purple" } ], + "processingTime": 50, "results": [ { "item": "minecraft:purple_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json index 7bb05952ec..0fee034697 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/red_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/red" } ], + "processingTime": 50, "results": [ { "item": "minecraft:red_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json index 2b853c8114..0b8c714a92 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/white_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/white" } ], + "processingTime": 50, "results": [ { "item": "minecraft:white_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json b/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json index e14a644c20..ea71b8e719 100644 --- a/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json +++ b/src/generated/resources/data/create/recipes/milling/compat/botania/yellow_petal.json @@ -5,10 +5,10 @@ "tag": "botania:petals/yellow" } ], + "processingTime": 50, "results": [ { "item": "minecraft:yellow_dye" } - ], - "processingTime": 50 + ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/corals.json b/src/generated/resources/data/create/tags/blocks/corals.json index 34ac4de416..42f3bf11ff 100644 --- a/src/generated/resources/data/create/tags/blocks/corals.json +++ b/src/generated/resources/data/create/tags/blocks/corals.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:dead_tube_coral", "minecraft:dead_brain_coral", diff --git a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json index 0ed0338711..8814565862 100644 --- a/src/generated/resources/data/create/tags/items/modded_stripped_wood.json +++ b/src/generated/resources/data/create/tags/items/modded_stripped_wood.json @@ -26,11 +26,11 @@ "required": false }, { - "id": "forbidden_arcanus:stripped_cherrywood", + "id": "forbidden_arcanus:stripped_cherrywood_wood", "required": false }, { - "id": "forbidden_arcanus:stripped_mysterywood", + "id": "forbidden_arcanus:stripped_mysterywood_wood", "required": false }, { diff --git a/src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json b/src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json index 2bbe91cdce..ebcb8d0bcb 100644 --- a/src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json +++ b/src/generated/resources/data/create/tags/items/stone_types/galosphere/allurite.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "galosphere:allurite_block", diff --git a/src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json b/src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json index c15c61c835..0441638e5c 100644 --- a/src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json +++ b/src/generated/resources/data/create/tags/items/stone_types/galosphere/amethyst.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "galosphere:amethyst_block", diff --git a/src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json b/src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json index d654a12ba4..8a41e85b66 100644 --- a/src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json +++ b/src/generated/resources/data/create/tags/items/stone_types/galosphere/lumiere.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "galosphere:lumiere_block", diff --git a/src/generated/resources/data/create/tags/items/tracks.json b/src/generated/resources/data/create/tags/items/tracks.json index ef33e72efb..259661af42 100644 --- a/src/generated/resources/data/create/tags/items/tracks.json +++ b/src/generated/resources/data/create/tags/items/tracks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "create:track" ] diff --git a/src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json b/src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json index 2826d42552..8caf90a4a3 100644 --- a/src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json +++ b/src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "upgrade_aquatic:acan_coral", diff --git a/src/generated/resources/data/curios/tags/items/head.json b/src/generated/resources/data/curios/tags/items/head.json index fa60b07ba8..0117e7aa37 100644 --- a/src/generated/resources/data/curios/tags/items/head.json +++ b/src/generated/resources/data/curios/tags/items/head.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "create:goggles" ] diff --git a/src/main/java/com/simibubi/create/AllKeys.java b/src/main/java/com/simibubi/create/AllKeys.java index fce9fcc775..331b98212a 100644 --- a/src/main/java/com/simibubi/create/AllKeys.java +++ b/src/main/java/com/simibubi/create/AllKeys.java @@ -9,8 +9,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; -import org.lwjgl.opengl.GL; - +@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD) public enum AllKeys { TOOL_MENU("toolmenu", GLFW.GLFW_KEY_LEFT_ALT), diff --git a/src/main/java/com/simibubi/create/compat/Mods.java b/src/main/java/com/simibubi/create/compat/Mods.java index 1e8ea0822d..a22081fdbe 100644 --- a/src/main/java/com/simibubi/create/compat/Mods.java +++ b/src/main/java/com/simibubi/create/compat/Mods.java @@ -4,6 +4,7 @@ import java.util.function.Supplier; import com.simibubi.create.foundation.utility.Lang; +import com.simibubi.create.foundation.utility.RegisteredObjects; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.core.Registry; @@ -72,7 +73,7 @@ public boolean contains(ItemLike entry) { if (!isLoaded()) return false; Item asItem = entry.asItem(); - return asItem != null && asItem.getRegistryName() + return asItem != null && RegisteredObjects.getKeyOrThrow(asItem) .getNamespace() .equals(id); } diff --git a/src/main/java/com/simibubi/create/compat/framedblocks/FramedBlocksInSchematics.java b/src/main/java/com/simibubi/create/compat/framedblocks/FramedBlocksInSchematics.java index 100a07e7e8..6490943cb5 100644 --- a/src/main/java/com/simibubi/create/compat/framedblocks/FramedBlocksInSchematics.java +++ b/src/main/java/com/simibubi/create/compat/framedblocks/FramedBlocksInSchematics.java @@ -9,6 +9,7 @@ import com.simibubi.create.content.schematics.requirement.ItemRequirement.StackRequirement; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtUtils; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.entity.BlockEntity; @@ -17,7 +18,7 @@ public class FramedBlocksInSchematics { static final List KEYS_TO_RETAIN = - List.of("intangible", "glowing", "reinforced", "camo_stack", "camo_stack_two", "camo_state", "camo_state_two"); + List.of("intangible", "glowing", "reinforced", "camo", "camo_two"); public static CompoundTag prepareBlockEntityData(BlockState blockState, BlockEntity blockEntity) { CompoundTag data = null; @@ -32,6 +33,14 @@ public static CompoundTag prepareBlockEntityData(BlockState blockState, BlockEnt keysToRemove.add(key); for (String key : keysToRemove) data.remove(key); + + if (data.getCompound("camo") + .contains("fluid")) + data.remove("camo"); + + if (data.getCompound("camo_two") + .contains("fluid")) + data.remove("camo_two"); return data; } @@ -53,17 +62,20 @@ public static ItemRequirement getRequiredItems(BlockState blockState, BlockEntit list.add(new StackRequirement(new ItemStack(Mods.FRAMEDBLOCKS.getItem("framed_reinforcement")), ItemUseType.CONSUME)); - if (data.contains("camo_stack")) - addCamoStack(data.getCompound("camo_stack"), list); + if (data.contains("camo")) + addCamoStack(data.getCompound("camo"), list); - if (data.contains("camo_stack_two")) - addCamoStack(data.getCompound("camo_stack_two"), list); + if (data.contains("camo_two")) + addCamoStack(data.getCompound("camo_two"), list); return new ItemRequirement(list); } private static void addCamoStack(CompoundTag tag, List list) { - ItemStack itemStack = ItemStack.of(tag); + if (!tag.contains("state")) + return; + BlockState blockState = NbtUtils.readBlockState(tag.getCompound("state")); + ItemStack itemStack = new ItemStack(blockState.getBlock()); if (!itemStack.isEmpty()) list.add(new StackRequirement(itemStack, ItemUseType.CONSUME)); } diff --git a/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java b/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java index ce96931340..833e0b844f 100644 --- a/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java +++ b/src/main/java/com/simibubi/create/compat/thresholdSwitch/FunctionalStorage.java @@ -1,6 +1,7 @@ package com.simibubi.create.compat.thresholdSwitch; //import com.simibubi.create.compat.Mods; +//import com.simibubi.create.foundation.utility.RegisteredObjects; // //import net.minecraft.world.level.block.entity.BlockEntity; //import net.minecraftforge.items.IItemHandler; @@ -10,8 +11,7 @@ // @Override // public boolean isFromThisMod(BlockEntity blockEntity) { // return blockEntity != null && Mods.FUNCTIONALSTORAGE.id() -// .equals(blockEntity.getType() -// .getRegistryName() +// .equals(RegisteredObjects.getKeyOrThrow(blockEntity.getType()) // .getNamespace()); // } // diff --git a/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java b/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java index f238a1c61a..923e2ea1ce 100644 --- a/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java +++ b/src/main/java/com/simibubi/create/compat/thresholdSwitch/SophisticatedStorage.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.thresholdSwitch; -// fabric: https://modrinth.com/mod/sophisticated-storage-(unofficial-fabric-port) isn't on 1.19.2 //import com.simibubi.create.compat.Mods; +//import com.simibubi.create.foundation.utility.RegisteredObjects; // //import net.minecraft.world.level.block.entity.BlockEntity; //import net.minecraftforge.items.IItemHandler; @@ -13,8 +13,7 @@ // if (be == null) // return false; // -// String namespace = be.getType() -// .getRegistryName() +// String namespace = RegisteredObjects.getKeyOrThrow(be.getType()) // .getNamespace(); // // return diff --git a/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java b/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java index 40b98ef47c..0c91c9da85 100644 --- a/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java +++ b/src/main/java/com/simibubi/create/compat/thresholdSwitch/StorageDrawers.java @@ -1,6 +1,7 @@ package com.simibubi.create.compat.thresholdSwitch; //import com.simibubi.create.compat.Mods; +//import com.simibubi.create.foundation.utility.RegisteredObjects; // //import net.minecraft.world.level.block.entity.BlockEntity; //import net.minecraftforge.items.IItemHandler; @@ -10,8 +11,7 @@ // @Override // public boolean isFromThisMod(BlockEntity blockEntity) { // return blockEntity != null && Mods.STORAGEDRAWERS.id() -// .equals(blockEntity.getType() -// .getRegistryName() +// .equals(RegisteredObjects.getKeyOrThrow(blockEntity.getType()) // .getNamespace()); // } // diff --git a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java index e4c6127c41..715a4be4e3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueEntity.java @@ -38,7 +38,6 @@ import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LightningBolt; -import net.minecraft.world.entity.Marker; import net.minecraft.world.entity.MoverType; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.player.Player; @@ -309,6 +308,7 @@ public PushReaction getPistonPushReaction() { public void setPortalEntrancePos() { portalEntrancePos = blockPosition(); } + @Override public PortalInfo findDimensionEntryPoint(ServerLevel pDestination) { return super.findDimensionEntryPoint(pDestination); diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java index 199fd60cef..8d2d8cd26b 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java @@ -29,7 +29,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; @@ -115,10 +114,10 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt if (stack == null) return; withBlockEntityDo(worldIn, pos, be -> { - int level = EnchantmentHelper.getItemEnchantmentLevel(AllEnchantments.CAPACITY.get(), stack); - be.setCapacityEnchantLevel(level); + be.setCapacityEnchantLevel(stack.getEnchantmentLevel(AllEnchantments.CAPACITY.get())); + be.setAirLevel(stack.getOrCreateTag() + .getInt("Air")); CompoundTag vanillaTag = stack.getOrCreateTag(); - be.setAirLevel(vanillaTag.getInt("Air")); if (stack.hasCustomHoverName()) be.setCustomName(stack.getHoverName()); diff --git a/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java index 476f5e5a43..c6e996aedf 100644 --- a/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java +++ b/src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java @@ -41,7 +41,7 @@ public class PotionFluidHandler { public static boolean isPotionItem(ItemStack stack) { - return stack.getItem() instanceof PotionItem && !(stack.getRecipeRemainder() + return stack.getItem() instanceof PotionItem && !(stack.getCraftingRemainingItem() .getItem() instanceof BucketItem); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java index e480f47450..8db042c564 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java @@ -22,6 +22,7 @@ import net.fabricmc.api.Environment; import net.minecraft.core.BlockPos; import net.minecraft.network.Connection; +import net.minecraft.network.PacketSendListener; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.PacketFlow; import net.minecraft.server.level.ServerLevel; @@ -131,6 +132,11 @@ protected boolean doesEmitEquipEvent(EquipmentSlot p_217035_) { return false; } + @Override + protected boolean doesEmitEquipEvent(EquipmentSlot p_217035_) { + return false; + } + @Override protected void playEquipSound(ItemStack p_217042_) {} diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index 0be503fd66..535c975f7d 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -55,8 +55,8 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { BTN_5 = stripAndMakePlanks(Mods.BTN, "glimmering_dreamwood", "glimmering_stripped_dreamwood", "dreamwood_planks"), - // Forbidden Arcanus (no _wood suffix) - FA = cuttingCompat(Mods.FA, "cherrywood", "mysterywood"), + // Forbidden Arcanus + FA = cuttingCompat(Mods.FA, "cherry", "aurum"), // Hexcasting (stripped is a suffix here) HEX = cuttingCompat(Mods.HEX, "edified"), @@ -92,7 +92,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { AP = cuttingCompat(Mods.AP, "twisted"), // Quark - Q = cuttingCompat(Mods.Q, "azalea", "blossom"), + Q = cuttingCompat(Mods.Q, "azalea", "blossom", "ancient"), // Ecologics ECO = cuttingCompat(Mods.ECO, "coconut", "walnut", "azalea"), @@ -158,7 +158,16 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { // Environmental - ENV = cuttingCompat(Mods.ENV, "willow", "cherry", "wisteria") + ENV = cuttingCompat(Mods.ENV, "willow", "cherry", "wisteria"), + + // Windswept + + WSP = cuttingCompat(Mods.WSP, "holly", "chestnut"), + + // Good Ending + + GOOD = cuttingCompat(Mods.GOOD, "muddy_oak", "cypress") + ; GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java index 6d49475f13..52ca0e76e0 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java @@ -10,6 +10,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java index ed4f40df9f..ae38b90299 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java @@ -13,7 +13,7 @@ public enum Mods { ARS_N("ars_nouveau"), BSK("blue_skies"), BTN("botania", b -> b.omitWoodSuffix()), - FA("forbidden_arcanus", b -> b.omitWoodSuffix()), + FA("forbidden_arcanus"), HEX("hexcasting"), ID("integrateddynamics", b -> b.strippedWoodIsSuffix()), BYG("byg"), @@ -56,6 +56,7 @@ public enum Mods { AET("aether"), HH("hauntedharvest"), VMP("vampirism"), + WSP("windswept"), // Fabric Mods TR("techreborn"),