diff --git a/.packwizignore b/.packwizignore index 83d50ea..1163672 100644 --- a/.packwizignore +++ b/.packwizignore @@ -55,3 +55,11 @@ xaero-migration-kit/ # files we deliberately author and want enforced on install. !config/petprotect.json !config/akashictome-common.toml +# Paxi global datapack with cross-mod recipe/tag fixes (generated by +# analysis/audit/gen_fixes.py). Paxi's runtime load-order files stay ignored. +!config/paxi +config/paxi/* +!config/paxi/datapacks +config/paxi/datapacks/* +!config/paxi/datapacks/onion-fixes +!config/paxi/datapacks/onion-fixes/** diff --git a/config/paxi/datapacks/onion-fixes/data/adorablehamsterpets/recipe/cucumber_crate.json b/config/paxi/datapacks/onion-fixes/data/adorablehamsterpets/recipe/cucumber_crate.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/adorablehamsterpets/recipe/cucumber_crate.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/coffee/cooked.json b/config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/coffee/cooked.json new file mode 100644 index 0000000..a76100b --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/coffee/cooked.json @@ -0,0 +1,7 @@ +{ + "replace": true, + "values": [ + "extradelight:coffee_beans", + "rusticdelight:roasted_coffee_beans" + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/potato.json b/config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/potato.json new file mode 100644 index 0000000..ff7b1ad --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/potato.json @@ -0,0 +1,11 @@ +{ + "replace": true, + "values": [ + "minecraft:potato", + "veggiesdelight:sweet_potato", + { + "id": "#forge:crops/potato", + "required": false + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_iron_knife.json b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_iron_knife.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_iron_knife.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_knife.json b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_knife.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_knife.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/ironwood_knife.json b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/ironwood_knife.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/ironwood_knife.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/knightmetal_knife.json b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/knightmetal_knife.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/knightmetal_knife.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/steeleaf_knife.json b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/steeleaf_knife.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/steeleaf_knife.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_beans_to_block.json b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_beans_to_block.json new file mode 100644 index 0000000..2655d63 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_beans_to_block.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + }, + { + "item": "extradelight:coffee_beans" + } + ], + "result": { + "count": 1, + "id": "extradelight:coffee_bean_sack" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_cherries_to_block.json b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_cherries_to_block.json new file mode 100644 index 0000000..45f6386 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_cherries_to_block.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + }, + { + "item": "extradelight:coffee_cherries" + } + ], + "result": { + "count": 1, + "id": "extradelight:coffee_cherry_crate" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/bread_knife.json b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/bread_knife.json new file mode 100644 index 0000000..bfdfe45 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/bread_knife.json @@ -0,0 +1,19 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "tag": "c:foods/bread" + } + ], + "result": [ + { + "item": { + "count": 4, + "id": "extradelight:bread_slice" + } + } + ], + "tool": { + "tag": "c:tools/knife" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/sliced_potato.json b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/sliced_potato.json new file mode 100644 index 0000000..db2566a --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/sliced_potato.json @@ -0,0 +1,19 @@ +{ + "type": "farmersdelight:cutting", + "ingredients": [ + { + "item": "rusticdelight:potato_slices" + } + ], + "result": [ + { + "item": { + "id": "extradelight:sliced_potato", + "count": 2 + } + } + ], + "tool": { + "tag": "c:tools/knife" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/farmersdelight/recipe/cooking/beef_stew.json b/config/paxi/datapacks/onion-fixes/data/farmersdelight/recipe/cooking/beef_stew.json new file mode 100644 index 0000000..28fdded --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/farmersdelight/recipe/cooking/beef_stew.json @@ -0,0 +1,20 @@ +{ + "type": "farmersdelight:cooking", + "experience": 1.0, + "ingredients": [ + { + "tag": "c:foods/raw_beef" + }, + { + "tag": "c:foods/carrot" + }, + { + "tag": "c:foods/potato" + } + ], + "recipe_book_tab": "meals", + "result": { + "count": 1, + "id": "farmersdelight:beef_stew" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/fishermans_haven/recipe/recipe_worms_aquaculture.json b/config/paxi/datapacks/onion-fixes/data/fishermans_haven/recipe/recipe_worms_aquaculture.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/fishermans_haven/recipe/recipe_worms_aquaculture.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/fruitsdelight/recipe/apple_crate.json b/config/paxi/datapacks/onion-fixes/data/fruitsdelight/recipe/apple_crate.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/fruitsdelight/recipe/apple_crate.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/black_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/black_sheet.json new file mode 100644 index 0000000..d53890e --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/black_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:black_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:black_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/blue_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/blue_sheet.json new file mode 100644 index 0000000..47a14b5 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/blue_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:blue_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:blue_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/brown_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/brown_sheet.json new file mode 100644 index 0000000..7e3a993 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/brown_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:brown_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:brown_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/cyan_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/cyan_sheet.json new file mode 100644 index 0000000..45087c2 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/cyan_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:cyan_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:cyan_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/gray_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/gray_sheet.json new file mode 100644 index 0000000..6ebd559 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/gray_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:gray_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:gray_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/green_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/green_sheet.json new file mode 100644 index 0000000..a6cf407 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/green_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:green_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:green_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_blue_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_blue_sheet.json new file mode 100644 index 0000000..3bad326 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_blue_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:light_blue_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:light_blue_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_gray_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_gray_sheet.json new file mode 100644 index 0000000..106fbda --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_gray_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:light_gray_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:light_gray_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/lime_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/lime_sheet.json new file mode 100644 index 0000000..e5f8b13 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/lime_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:lime_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:lime_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/magenta_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/magenta_sheet.json new file mode 100644 index 0000000..2895835 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/magenta_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:magenta_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:magenta_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/orange_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/orange_sheet.json new file mode 100644 index 0000000..5e16fbb --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/orange_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:orange_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:orange_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/pink_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/pink_sheet.json new file mode 100644 index 0000000..431b58c --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/pink_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:pink_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:pink_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/purple_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/purple_sheet.json new file mode 100644 index 0000000..93ca77d --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/purple_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:purple_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:purple_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/red_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/red_sheet.json new file mode 100644 index 0000000..f1676b3 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/red_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:red_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:red_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/white_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/white_sheet.json new file mode 100644 index 0000000..4a5cd4e --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/white_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:white_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:white_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/wood_plate.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/wood_plate.json new file mode 100644 index 0000000..28a5629 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/wood_plate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "minecraft:wooden_slabs" + } + }, + "pattern": [ + "##" + ], + "result": { + "count": 2, + "id": "handcrafted:wood_plate" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/yellow_sheet.json b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/yellow_sheet.json new file mode 100644 index 0000000..33013d2 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/yellow_sheet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:yellow_wool" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 8, + "id": "handcrafted:yellow_sheet" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/minecraft/recipe/poisonous_potato_crate.json b/config/paxi/datapacks/onion-fixes/data/minecraft/recipe/poisonous_potato_crate.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/minecraft/recipe/poisonous_potato_crate.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/minecraft/recipe/rotten_tomato_crate.json b/config/paxi/datapacks/onion-fixes/data/minecraft/recipe/rotten_tomato_crate.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/minecraft/recipe/rotten_tomato_crate.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/bread_slice.json b/config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/bread_slice.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/bread_slice.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/diced_potatoes.json b/config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/diced_potatoes.json new file mode 100644 index 0000000..cdbe524 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/diced_potatoes.json @@ -0,0 +1,7 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:false" + } + ] +} diff --git a/config/paxi/datapacks/onion-fixes/data/onion/recipe/aquaculture_worm_from_fishermans_haven_worm.json b/config/paxi/datapacks/onion-fixes/data/onion/recipe/aquaculture_worm_from_fishermans_haven_worm.json new file mode 100644 index 0000000..ab19152 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/onion/recipe/aquaculture_worm_from_fishermans_haven_worm.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "fishermans_haven:worm" + } + ], + "result": { + "id": "aquaculture:worm", + "count": 1 + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/onion/recipe/diced_potatoes_from_potato_slices.json b/config/paxi/datapacks/onion-fixes/data/onion/recipe/diced_potatoes_from_potato_slices.json new file mode 100644 index 0000000..c6a61e1 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/onion/recipe/diced_potatoes_from_potato_slices.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "rusticdelight:potato_slices" + }, + { + "item": "rusticdelight:potato_slices" + } + ], + "result": { + "id": "moredelight:diced_potatoes", + "count": 1 + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/onion/recipe/fishermans_haven_worm_from_aquaculture_worm.json b/config/paxi/datapacks/onion-fixes/data/onion/recipe/fishermans_haven_worm_from_aquaculture_worm.json new file mode 100644 index 0000000..64dc396 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/onion/recipe/fishermans_haven_worm_from_aquaculture_worm.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "aquaculture:worm" + } + ], + "result": { + "id": "fishermans_haven:worm", + "count": 1 + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/rainbow_ice_cream.json b/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/rainbow_ice_cream.json new file mode 100644 index 0000000..687f989 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/rainbow_ice_cream.json @@ -0,0 +1,34 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "neapolitan" + } + ], + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "twilightdelight:aurora_ice_cream" + }, + { + "item": "neapolitan:banana_ice_cream" + }, + { + "item": "neapolitan:adzuki_ice_cream" + }, + { + "item": "minecraft:bowl" + }, + { + "item": "minecraft:bowl" + }, + { + "item": "minecraft:bowl" + } + ], + "result": { + "count": 3, + "id": "twilightdelight:rainbow_ice_cream" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/refreshing_ice_cream.json b/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/refreshing_ice_cream.json new file mode 100644 index 0000000..cbda9dd --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/refreshing_ice_cream.json @@ -0,0 +1,34 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "neapolitan" + } + ], + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "twilightdelight:glacier_ice_cream" + }, + { + "item": "neapolitan:mint_ice_cream" + }, + { + "item": "twilightdelight:phytochemical_ice_cream" + }, + { + "item": "minecraft:bowl" + }, + { + "item": "minecraft:bowl" + }, + { + "item": "minecraft:bowl" + } + ], + "result": { + "count": 3, + "id": "twilightdelight:refreshing_ice_cream" + } +} diff --git a/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/twilight_ice_cream.json b/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/twilight_ice_cream.json new file mode 100644 index 0000000..fe839b1 --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/twilight_ice_cream.json @@ -0,0 +1,34 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "neapolitan" + } + ], + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "twilightdelight:torchberry_ice_cream" + }, + { + "item": "neapolitan:chocolate_ice_cream" + }, + { + "item": "neapolitan:strawberry_ice_cream" + }, + { + "item": "minecraft:bowl" + }, + { + "item": "minecraft:bowl" + }, + { + "item": "minecraft:bowl" + } + ], + "result": { + "count": 3, + "id": "twilightdelight:twilight_ice_cream" + } +} diff --git a/config/paxi/datapacks/onion-fixes/pack.mcmeta b/config/paxi/datapacks/onion-fixes/pack.mcmeta new file mode 100644 index 0000000..818f42e --- /dev/null +++ b/config/paxi/datapacks/onion-fixes/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 48, + "description": "Onion MC cross-mod recipe/tag fixes" + } +} diff --git a/index.toml b/index.toml index fcc1258..8ff27cf 100644 --- a/index.toml +++ b/index.toml @@ -4,6 +4,178 @@ hash-format = "sha256" file = "config/akashictome-common.toml" hash = "4e479c86ddfec0c5e28f07034f033a10abae404309f38ccc4bfc15da9de2dfa2" +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/adorablehamsterpets/recipe/cucumber_crate.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/coffee/cooked.json" +hash = "750399c462051fdec4b1ee27a01fd7130d5a28834c927833e81b34464e48e929" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/c/tags/item/crops/potato.json" +hash = "48056ee529a4d40cb91c5aebb14d8dab5fd54604e51107cb21d90609d75cacc4" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_iron_knife.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/fiery_knife.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/ironwood_knife.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/knightmetal_knife.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/dungeonsdelight/recipe/integration/twilightforest/crafting_table/steeleaf_knife.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_beans_to_block.json" +hash = "c028eca6ab80800a0c4dd7569a0a641c73c230711871254876f9e1b9cb21878e" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/extradelight/recipe/coffee_cherries_to_block.json" +hash = "1b368c824243c5b757b049da6fed17dbc1d262d793e85b9a35316f7daa6d8d63" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/bread_knife.json" +hash = "73975fc4c18f2ff06aa9a90052d6afc084cc6c07c5a5671a0a8f8e2ea75bd05a" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/extradelight/recipe/cutting/sliced_potato.json" +hash = "935c2f1b2bb974c8037e0e33a2af81dd02e135eac2a8e1b07b6b4c1fbbae0ffe" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/farmersdelight/recipe/cooking/beef_stew.json" +hash = "0e3b7d910136917476eb3958e505907aa0bcbefebc0f368fca975203ce949005" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/fishermans_haven/recipe/recipe_worms_aquaculture.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/fruitsdelight/recipe/apple_crate.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/black_sheet.json" +hash = "e266710590753285e0258cfa3ea66c4c9ab0a28a43c9e9cfcc76670d8cbc6e93" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/blue_sheet.json" +hash = "99efd9cc8105d934cdd25d48ccf09ce7439e4a7dd2d67ea0781000e40a4fff49" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/brown_sheet.json" +hash = "f63da9c1bb8fb4f6f5f780d6fc77a4d051c78582e1402c58db2019599477d76b" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/cyan_sheet.json" +hash = "c567c822f7762ca6a4253272b0088736514029413c188d6717911661e693593a" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/gray_sheet.json" +hash = "6a77722cc4bd9e5678d5f12b0215b3419cd026525d67eb193c86b739cd72d30d" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/green_sheet.json" +hash = "2e2d37b1566ac57c96c07defb72533f4aab005af11b3530672951521442069ed" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_blue_sheet.json" +hash = "5e230590f854eec5e8952d54fda915c5f9114a0ff1e9b73ffd012a2402d30b17" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/light_gray_sheet.json" +hash = "06cf6ec1b2f6ddc7c0bd244599e129665c11a33c665824b730fe40d7b3516f22" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/lime_sheet.json" +hash = "b309bd5a0ecf931f1983751b69c9f13301c8b8f73ae3de2ff9083d938a963e9b" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/magenta_sheet.json" +hash = "5207fcdb2efede2aca2c49f44d5ca45e94ef7aa4319d672028a9896653858b88" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/orange_sheet.json" +hash = "013b2b4debaeedf5520b2b2f5c3bcafef75880d108da39264a0b927088057c11" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/pink_sheet.json" +hash = "f2f572081254dd259c29b451b02589acbdefb1ec36a94f5fbd4cf4bef3fdc378" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/purple_sheet.json" +hash = "0b53d79fe177eb6b11bad50fd966d19ea91301413f53a81c6d07900beee5253b" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/red_sheet.json" +hash = "8da4dce07b36a36f2e0454d56036d805d8c0bed0aa53675094bcdbb6dc6c6eb8" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/white_sheet.json" +hash = "2ee947bf06ee2d2281ec9c87da3f3c0c48c59c4d8a48dda51c563b6482234f2e" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/wood_plate.json" +hash = "65d09382a917269af87a010735d2f1430692ce7130591fcf7d6f4ad5f6ca9309" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/handcrafted/recipe/yellow_sheet.json" +hash = "bcaee873d31768b3843136f296e0e7f64a766d95aad7cec0c5fdee72455944ec" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/minecraft/recipe/poisonous_potato_crate.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/minecraft/recipe/rotten_tomato_crate.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/bread_slice.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/moredelight/recipe/cutting/diced_potatoes.json" +hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/onion/recipe/aquaculture_worm_from_fishermans_haven_worm.json" +hash = "0a9dceff758fdb5d188cce51c9006c03100ef0d4a6f933fd9b274aaab9732360" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/onion/recipe/diced_potatoes_from_potato_slices.json" +hash = "25616476af2742956819ac3c2a3a664a97254d32afd4a198ff8ca2e0a8704744" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/onion/recipe/fishermans_haven_worm_from_aquaculture_worm.json" +hash = "42e5a3466e4c64c3db7f5bd87406ba03932dd0a83b9288f7072f65740461b277" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/rainbow_ice_cream.json" +hash = "93039e17b8976222bc6fc331f536335c546397f367578ede991bf06e097fffab" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/refreshing_ice_cream.json" +hash = "b70c6128b19b920e0169baf37b170fa3bb55ccee1237e53cc4410484c07d379e" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/data/twilightdelight/recipe/twilight_ice_cream.json" +hash = "adb8a56a180d50170b62e531461e8a4d1bede709a0e16134918d86f07ad93725" + +[[files]] +file = "config/paxi/datapacks/onion-fixes/pack.mcmeta" +hash = "6f0f28262e3adebb46902f265bec117f24820df9b70ba30e23bc9e708c22681a" + [[files]] file = "config/petprotect.json" hash = "de9aefb0a05ee60c880c4c3d51e06d00f1a63b50b686ea740a70979323854637" @@ -718,6 +890,11 @@ file = "mods/patchouli.pw.toml" hash = "d7f360ebb9f009d6dc0b368cd8fa399bdff70c0f6ef931687b2a35137f72715d" metafile = true +[[files]] +file = "mods/paxi.pw.toml" +hash = "215d597764d5c5db89e700fc3495b72dc0a7f09c975de19dc8c580bde3469a5e" +metafile = true + [[files]] file = "mods/perception.pw.toml" hash = "378f188dd4dd616783418b9169e6016d5eff359a13c6debeb64c82093637e8e9" diff --git a/mods/paxi.pw.toml b/mods/paxi.pw.toml new file mode 100644 index 0000000..2b0f018 --- /dev/null +++ b/mods/paxi.pw.toml @@ -0,0 +1,13 @@ +name = "Paxi" +filename = "Paxi-1.21.1-NeoForge-5.1.3.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/CU0PAyzb/versions/CLZfFbCx/Paxi-1.21.1-NeoForge-5.1.3.jar" +hash-format = "sha512" +hash = "ed6a33eb9a4ac6ce4dd0cd03a45aba6068536121ab89cd4040d8c53964d59a7a8ceaee2f3bae13a3df3813eaf8d4fc4f82883e28ac4577b53aa26b750a181699" + +[update] +[update.modrinth] +mod-id = "CU0PAyzb" +version = "CLZfFbCx" diff --git a/pack.toml b/pack.toml index 6d81c57..bc50e6d 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "65215ee765ac7e8321c232dd2624f7453aed4900384a18b004410d77158f7b6d" +hash = "15d26f616992420bbeb8c4c17bb7ce207d3c2dff9d3624a5ad73c2f98357b381" [versions] minecraft = "1.21.1"