From 5e4d181bd102bd4ea9c6f474595376433ec759f0 Mon Sep 17 00:00:00 2001 From: Vihri Date: Sat, 18 Jul 2026 19:51:45 +0200 Subject: [PATCH 1/2] Adds noxcap stripping. --- .../cutting/chestnut_noxcap_stem.json | 37 +++++++++++++++++++ .../cutting/ebony_noxcap_stem.json | 37 +++++++++++++++++++ .../cutting/ivory_noxcap_stem.json | 37 +++++++++++++++++++ .../cutting/slate_noxcap_stem.json | 37 +++++++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/chestnut_noxcap_stem.json create mode 100644 src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ebony_noxcap_stem.json create mode 100644 src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ivory_noxcap_stem.json create mode 100644 src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/slate_noxcap_stem.json diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/chestnut_noxcap_stem.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/chestnut_noxcap_stem.json new file mode 100644 index 0000000000..9a9c8c7f59 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/chestnut_noxcap_stem.json @@ -0,0 +1,37 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "spectrum:chestnut_noxcap_stem" + } + ], + "result": [ + { + "item": { + "count": 1, + "id": "spectrum:stripped_chestnut_noxcap_stem" + } + }, + { + "item": { + "count": 1, + "id": "spectrum:myceylon" + } + } + ], + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "axe_strip" + }, + { + "tag": "minecraft:axes" + } + ], + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "farmersdelight" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ebony_noxcap_stem.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ebony_noxcap_stem.json new file mode 100644 index 0000000000..a78d05308d --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ebony_noxcap_stem.json @@ -0,0 +1,37 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "spectrum:ebony_noxcap_stem" + } + ], + "result": [ + { + "item": { + "count": 1, + "id": "spectrum:stripped_ebony_noxcap_stem" + } + }, + { + "item": { + "count": 1, + "id": "spectrum:myceylon" + } + } + ], + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "axe_strip" + }, + { + "tag": "minecraft:axes" + } + ], + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "farmersdelight" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ivory_noxcap_stem.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ivory_noxcap_stem.json new file mode 100644 index 0000000000..b66b270c5a --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/ivory_noxcap_stem.json @@ -0,0 +1,37 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "spectrum:ivory_noxcap_stem" + } + ], + "result": [ + { + "item": { + "count": 1, + "id": "spectrum:stripped_ivory_noxcap_stem" + } + }, + { + "item": { + "count": 1, + "id": "spectrum:myceylon" + } + } + ], + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "axe_strip" + }, + { + "tag": "minecraft:axes" + } + ], + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "farmersdelight" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/slate_noxcap_stem.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/slate_noxcap_stem.json new file mode 100644 index 0000000000..26443e4044 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/slate_noxcap_stem.json @@ -0,0 +1,37 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "spectrum:slate_noxcap_stem" + } + ], + "result": [ + { + "item": { + "count": 1, + "id": "spectrum:stripped_slate_noxcap_stem" + } + }, + { + "item": { + "count": 1, + "id": "spectrum:myceylon" + } + } + ], + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "axe_strip" + }, + { + "tag": "minecraft:axes" + } + ], + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "farmersdelight" + } + ] +} \ No newline at end of file From 5b2be667045e204fdc864f0195e6929a34841897 Mon Sep 17 00:00:00 2001 From: Vihri Date: Sat, 18 Jul 2026 19:52:00 +0200 Subject: [PATCH 2/2] Fixes gemstone cutting not accepting multitools --- .../farmersdelight/cutting/citrine_block.json | 13 +++++++++---- .../farmersdelight/cutting/moonstone_block.json | 13 +++++++++---- .../farmersdelight/cutting/onyx_block.json | 13 +++++++++---- .../farmersdelight/cutting/topaz_block.json | 13 +++++++++---- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/citrine_block.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/citrine_block.json index 2cd231cc04..f26c9a094d 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/citrine_block.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/citrine_block.json @@ -13,10 +13,15 @@ } } ], - "tool": { - "type": "farmersdelight:item_ability", - "action": "pickaxe_dig" - }, + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "pickaxe:dig" + }, + { + "tag": "minecraft:pickaxes" + } + ], "neoforge:conditions": [ { "type": "neoforge:mod_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/moonstone_block.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/moonstone_block.json index 069382e147..22ee8b1055 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/moonstone_block.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/moonstone_block.json @@ -13,10 +13,15 @@ } } ], - "tool": { - "type": "farmersdelight:item_ability", - "action": "pickaxe_dig" - }, + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "pickaxe:dig" + }, + { + "tag": "minecraft:pickaxes" + } + ], "neoforge:conditions": [ { "type": "neoforge:mod_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/onyx_block.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/onyx_block.json index aeca4ab025..c34fad5a3a 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/onyx_block.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/onyx_block.json @@ -13,10 +13,15 @@ } } ], - "tool": { - "type": "farmersdelight:item_ability", - "action": "pickaxe_dig" - }, + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "pickaxe:dig" + }, + { + "tag": "minecraft:pickaxes" + } + ], "neoforge:conditions": [ { "type": "neoforge:mod_loaded", diff --git a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/topaz_block.json b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/topaz_block.json index 81ac43a1bb..75e0f786aa 100644 --- a/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/topaz_block.json +++ b/src/main/resources/data/spectrum/recipe/mod_integration/farmersdelight/cutting/topaz_block.json @@ -13,10 +13,15 @@ } } ], - "tool": { - "type": "farmersdelight:item_ability", - "action": "pickaxe_dig" - }, + "tool": [ + { + "type": "farmersdelight:item_ability", + "action": "pickaxe:dig" + }, + { + "tag": "minecraft:pickaxes" + } + ], "neoforge:conditions": [ { "type": "neoforge:mod_loaded",