diff --git a/index.toml b/index.toml index 320e4de..669f66e 100644 --- a/index.toml +++ b/index.toml @@ -463,9 +463,13 @@ hash = "0dd80e31efcb3c53e3a150ca7cf6c9de9cbefcc19613958dec743205bd647006" file = "kubejs/server_scripts/ars_nouveau_remove.js" hash = "02186858dba534fe236aa03ac704144781ee2f00070e10219f1b04f6c8f4b1dd" +[[files]] +file = "kubejs/server_scripts/flowers.js" +hash = "0549f7d9b5e121b9ece89f1f222fd7f1ac82f6fbd417c1db598ebbcaad577036" + [[files]] file = "kubejs/server_scripts/sands.js" -hash = "753c70ae7b21f4df4ffd89efbb87d2d0d9141d58ca329ae46a1c65a88eb40b41" +hash = "5309171437f5c087fb76e967a4c8779e8af318221750e3454fa2642ad0925c5f" [[files]] file = "kubejs/server_scripts/sheets.js" @@ -477,7 +481,7 @@ hash = "a5b8711446521f8567ff3d5f3a18af09a6c8c78e2e020ec1f55d0754cd940363" [[files]] file = "kubejs/server_scripts/stones.js" -hash = "8a7c18181a8a1d502b6de889558bcae6bb2467f3749d0ad0f86657b37af9d85c" +hash = "cb96a548a9b8c3313246ac4a84279846d0a898edf6cdc7de51238d6042b8b0f4" [[files]] file = "mods/Compat_AlexsMobs-Naturalist.jar" diff --git a/kubejs/server_scripts/flowers.js b/kubejs/server_scripts/flowers.js new file mode 100644 index 0000000..b63914f --- /dev/null +++ b/kubejs/server_scripts/flowers.js @@ -0,0 +1,82 @@ +ServerEvents.recipes((event) => { + // Allium + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:blue_allium"), + ["minecraft:allium", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:white_allium"), + ["fabulous_flowers:blue_allium", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless(Item.of("minecraft:allium"), [ + "fabulous_flowers:white_allium", + "ars_nouveau:manipulation_essence", + ]); + // Tulip + event.recipes.minecraft.crafting_shapeless( + Item.of("minecraft:orange_tulip"), + ["minecraft:red_tulip", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless(Item.of("minecraft:white_tulip"), [ + "minecraft:orange_tulip", + "ars_nouveau:manipulation_essence", + ]); + event.recipes.minecraft.crafting_shapeless(Item.of("minecraft:pink_tulip"), [ + "minecraft:white_tulip", + "ars_nouveau:manipulation_essence", + ]); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:yellow_tulip"), + ["minecraft:pink_tulip", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:purple_tulip"), + ["fabulous_flowers:yellow_tulip", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:blue_tulip"), + ["fabulous_flowers:purple_tulip", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:black_tulip"), + ["fabulous_flowers:blue_tulip", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless(Item.of("minecraft:red_tulip"), [ + "fabulous_flowers:black_tulip", + "ars_nouveau:manipulation_essence", + ]); + // Poppy + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:orange_poppy"), + ["minecraft:poppy", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:yellow_poppy"), + ["fabulous_flowers:orange_poppy", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:white_poppy"), + ["fabulous_flowers:yellow_poppy", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:pink_poppy"), + ["fabulous_flowers:white_poppy", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless(Item.of("minecraft:poppy"), [ + "fabulous_flowers:pink_poppy", + "ars_nouveau:manipulation_essence", + ]); + // Daisy + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:aster_daisy"), + ["minecraft:oxeye_daisy", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless( + Item.of("fabulous_flowers:gloriosa_daisy"), + ["fabulous_flowers:aster_daisy", "ars_nouveau:manipulation_essence"] + ); + event.recipes.minecraft.crafting_shapeless(Item.of("minecraft:oxeye_daisy"), [ + "fabulous_flowers:gloriosa_daisy", + "ars_nouveau:manipulation_essence", + ]); +}); diff --git a/kubejs/server_scripts/sands.js b/kubejs/server_scripts/sands.js index 7ac093d..3f5a8d8 100644 --- a/kubejs/server_scripts/sands.js +++ b/kubejs/server_scripts/sands.js @@ -45,18 +45,9 @@ ServerEvents.recipes((event) => { Item.of("biomesoplenty:orange_sand"), Item.of("quark:jasper") ); - // Nickel nugget from black sand - event.recipes.create.splashing( - [ - Item.of("minecraft:clay_ball").withChance(0.2), - Item.of("jaopca:nuggets.nickel",3).withChance(0.12), - ], - Item.of("biomesoplenty:black_sand") - ); // Copper nugget from orange sand event.recipes.create.splashing( [ - Item.of("minecraft:clay_ball").withChance(0.2), Item.of("create:copper_nugget",3).withChance(0.12), ], Item.of("biomesoplenty:orange_sand") @@ -65,7 +56,6 @@ ServerEvents.recipes((event) => { // Zinc nugget from white sand event.recipes.create.splashing( [ - Item.of("minecraft:clay_ball").withChance(0.2), Item.of("create:zinc_nugget",3).withChance(0.12), ], Item.of("biomesoplenty:white_sand") diff --git a/kubejs/server_scripts/stones.js b/kubejs/server_scripts/stones.js index ca24930..262d316 100644 --- a/kubejs/server_scripts/stones.js +++ b/kubejs/server_scripts/stones.js @@ -1,5 +1,16 @@ // priority: 0 ServerEvents.recipes((event) => { + event.remove({ + output: "minecraft:smooth_stone", + input: "minecraft:stone", + type: "minecraft:smelting", + }); + event.remove({ + output: "minecraft:smooth_stone", + input: "minecraft:stone", + type: "minecraft:blasting", + }); + event.recipes.create_mechanical_extruder .extruding(Item.of("minecraft:granite"), [ "minecraft:lava", @@ -7,19 +18,12 @@ ServerEvents.recipes((event) => { ]) .catalyst("minecraft:quartz_block"); - event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:deepslate"), [ - "minecraft:lava", - "minecraft:water", - ]) - .max_height(8); - event.recipes.create_mechanical_extruder .extruding(Item.of("minecraft:cobbled_deepslate"), [ "minecraft:lava", "minecraft:water", ]) - .max_height(8); + .catalyst("minecraft:deepslate"); event.recipes.create_mechanical_extruder .extruding(Item.of("minecraft:calcite"), [ @@ -41,4 +45,15 @@ ServerEvents.recipes((event) => { "minecraft:water", ]) .catalyst("minecraft:diorite"); + + event.recipes.create_mechanical_extruder + .extruding(Item.of("quark:jasper"), ["minecraft:lava", "create:honey"]) + .catalyst("minecraft:granite"); + + event.recipes.create_mechanical_extruder + .extruding(Item.of("minecraft:netherrack"), [ + "minecraft:lava", + "minecraft:blue_ice", + ]) + .catalyst("minecraft:nether_brick"); }); diff --git a/pack.toml b/pack.toml index 7ec930b..aa027dc 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 = "051c7b1809e78ae81d646162b7c4ac34eeb14ccba766318899bda2756cea0b25" +hash = "ececf599526b84adbaa78237ba02e95537b03e05eb8d8b0255ef6b3b320b19c6" [versions] forge = "47.4.8"