From 5836ad4b82f288bbe31c1ef208165f649a01efcc Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 29 Jan 2023 23:42:08 +0100 Subject: [PATCH] Compatulations - Fixed AE2 ore crushing compat recipes not using up-to-date modid/blocks - Added Enchantment Descriptions --- src/generated/resources/.cache/cache | 2 +- .../resources/assets/create/lang/en_us.json | 3 ++ .../assets/create/lang/default/interface.json | 5 ++- .../ae2/crushing/charged_certus_ore.json | 31 ---------------- .../ae2/crushing/deepslate_quartz_ore.json | 35 +++++++++++++++++++ .../{certus_ore.json => quartz_ore.json} | 16 +++++---- 6 files changed, 53 insertions(+), 39 deletions(-) delete mode 100644 src/main/resources/data/create/recipes/compat/ae2/crushing/charged_certus_ore.json create mode 100644 src/main/resources/data/create/recipes/compat/ae2/crushing/deepslate_quartz_ore.json rename src/main/resources/data/create/recipes/compat/ae2/crushing/{certus_ore.json => quartz_ore.json} (56%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 446f8e950..d50c09db9 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -559,7 +559,7 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json f85edc574ee6de0de7693ffb031266643db6724a assets/create/lang/en_ud.json -7e9712249a13bd4760d58e041473487ada1326ba assets/create/lang/en_us.json +eb624aafc91b284143c3a0cc7d9bbb8de66e8950 assets/create/lang/en_us.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index e096e7fe6..2603c07fc 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1751,6 +1751,9 @@ "create.contraption.minecart_contraption_too_big": "This Cart Contraption seems too big to pick up", "create.contraption.minecart_contraption_illegal_pickup": "A mystical force is binding this Cart Contraption to the world", + "enchantment.create.capacity.desc": "Increases Backtank air capacity.", + "enchantment.create.potato_recovery.desc": "Potato Cannon projectiles have a chance to be reused.", + "_": "->------------------------] Subtitles [------------------------<-", diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index af6879a3a..86e0d8237 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -919,6 +919,9 @@ "create.command.killTPSCommand.argument.tickTime": "tickTime", "create.contraption.minecart_contraption_too_big": "This Cart Contraption seems too big to pick up", - "create.contraption.minecart_contraption_illegal_pickup": "A mystical force is binding this Cart Contraption to the world" + "create.contraption.minecart_contraption_illegal_pickup": "A mystical force is binding this Cart Contraption to the world", + + "enchantment.create.capacity.desc": "Increases Backtank air capacity.", + "enchantment.create.potato_recovery.desc": "Potato Cannon projectiles have a chance to be reused." } diff --git a/src/main/resources/data/create/recipes/compat/ae2/crushing/charged_certus_ore.json b/src/main/resources/data/create/recipes/compat/ae2/crushing/charged_certus_ore.json deleted file mode 100644 index 0f82a5e55..000000000 --- a/src/main/resources/data/create/recipes/compat/ae2/crushing/charged_certus_ore.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "appliedenergistics2" - } - ], - "type": "create:crushing", - "ingredients": [ - { - "item": "appliedenergistics2:charged_quartz_ore" - } - ], - "results": [ - { - "item": "appliedenergistics2:charged_certus_quartz_crystal", - "count": 2 - }, - { - "item": "appliedenergistics2:certus_quartz_dust", - "count": 1, - "chance": 0.25 - }, - { - "item": "minecraft:cobblestone", - "count": 1, - "chance": 0.125 - } - ], - "processingTime": 300 -} diff --git a/src/main/resources/data/create/recipes/compat/ae2/crushing/deepslate_quartz_ore.json b/src/main/resources/data/create/recipes/compat/ae2/crushing/deepslate_quartz_ore.json new file mode 100644 index 000000000..0bb8739ee --- /dev/null +++ b/src/main/resources/data/create/recipes/compat/ae2/crushing/deepslate_quartz_ore.json @@ -0,0 +1,35 @@ +{ + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "type": "create:crushing", + "ingredients": [ + { + "item": "ae2:deepslate_quartz_ore" + } + ], + "results": [ + { + "item": "ae2:certus_quartz_crystal", + "count": 1 + }, + { + "item": "ae2:certus_quartz_dust", + "count": 4 + }, + { + "item": "ae2:certus_quartz_dust", + "count": 1, + "chance": 0.5 + }, + { + "item": "minecraft:cobbled_deepslate", + "count": 1, + "chance": 0.125 + } + ], + "processingTime": 300 +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/compat/ae2/crushing/certus_ore.json b/src/main/resources/data/create/recipes/compat/ae2/crushing/quartz_ore.json similarity index 56% rename from src/main/resources/data/create/recipes/compat/ae2/crushing/certus_ore.json rename to src/main/resources/data/create/recipes/compat/ae2/crushing/quartz_ore.json index 973dd4630..956a57025 100644 --- a/src/main/resources/data/create/recipes/compat/ae2/crushing/certus_ore.json +++ b/src/main/resources/data/create/recipes/compat/ae2/crushing/quartz_ore.json @@ -2,24 +2,28 @@ "conditions": [ { "type": "forge:mod_loaded", - "modid": "appliedenergistics2" + "modid": "ae2" } ], "type": "create:crushing", "ingredients": [ { - "item": "appliedenergistics2:quartz_ore" + "item": "ae2:quartz_ore" } ], "results": [ { - "item": "appliedenergistics2:certus_quartz_crystal", - "count": 2 + "item": "ae2:certus_quartz_crystal", + "count": 1 }, { - "item": "appliedenergistics2:certus_quartz_dust", + "item": "ae2:certus_quartz_dust", + "count": 4 + }, + { + "item": "ae2:certus_quartz_dust", "count": 1, - "chance": 0.25 + "chance": 0.5 }, { "item": "minecraft:cobblestone",