From 715667537454d2342381c4672a68bb55805da974 Mon Sep 17 00:00:00 2001 From: materus Date: Fri, 1 Aug 2025 23:15:02 +0200 Subject: [PATCH] Fix config of stones --- config/cobblegenrandomizer-common.toml | 2 +- index.toml | 4 +- kubejs/server_scripts/stones.js | 71 ++++++++++++-------------- pack.toml | 2 +- 4 files changed, 37 insertions(+), 42 deletions(-) diff --git a/config/cobblegenrandomizer-common.toml b/config/cobblegenrandomizer-common.toml index e1932f7..e94cb93 100644 --- a/config/cobblegenrandomizer-common.toml +++ b/config/cobblegenrandomizer-common.toml @@ -34,7 +34,7 @@ ["stone", "minecraft:coal_block", ["minecraft:blackstone|100","minecraft:glided_blackstone|5"]], ["cobblestone", "minecraft:quartz_block", ["minecraft:granite"]], ["stone", "minecraft:quartz_block", ["minecraft:granite"]], - ["cobblestone", "minecraft:polished_deepslate", ["minecraft:cobbled_deeplsate"]], + ["cobblestone", "minecraft:polished_deepslate", ["minecraft:cobbled_deepslate"]], ["stone", "minecraft:polished_deepslate", ["minecraft:deepslate"]], ["cobblestone", "create:limestone", ["minecraft:calcite"]], ["stone", "create:limestone", ["minecraft:calcite"]], diff --git a/index.toml b/index.toml index 67121eb..65c25d2 100644 --- a/index.toml +++ b/index.toml @@ -80,7 +80,7 @@ hash = "25b2539bcd6545c4065e2dd3633e34da74bb7a43255f8821f68c012ddc22f140" [[files]] file = "config/cobblegenrandomizer-common.toml" -hash = "86c097a2628609378492755d4abe8317589cf612a5c6fafbdc243f47ae1a676d" +hash = "622b3f4187cb05c9c1f4d2750225db06cb11a27df2c2df956f06afa857551e0e" [[files]] file = "config/connectivity.json" @@ -389,7 +389,7 @@ hash = "a5b8711446521f8567ff3d5f3a18af09a6c8c78e2e020ec1f55d0754cd940363" [[files]] file = "kubejs/server_scripts/stones.js" -hash = "cbfb8342414c57b706aff876958f571dd93a189ae521aba412f010db8fa8285b" +hash = "cfd4cf6413d08ce96f3c23ee9c7c3da091e13f6ffd51b6728b3cd53c07473ad6" [[files]] file = "mods/additional-lights.pw.toml" diff --git a/kubejs/server_scripts/stones.js b/kubejs/server_scripts/stones.js index 8f4c6d8..4e417f6 100644 --- a/kubejs/server_scripts/stones.js +++ b/kubejs/server_scripts/stones.js @@ -1,51 +1,46 @@ // priority: 0 ServerEvents.recipes((event) => { - event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:blackstone"), [ - BlockPredicate.of("minecraft:lava"), - BlockPredicate.of("minecraft:water"), - ]) - .catalyst("minecraft:coal_block"); - - event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:granite"), [ - BlockPredicate.of("minecraft:lava"), - BlockPredicate.of("minecraft:water"), - ]) - .catalyst("minecraft:quartz_block"); event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:cobbled_deeplsate"), [ - BlockPredicate.of("minecraft:lava"), - BlockPredicate.of("minecraft:water"), - ]) - .catalyst("minecraft:polished_deepslate"); + .extruding(Item.of("minecraft:granite"), [ + BlockStatePredicate.of("minecraft:lava"), + BlockStatePredicate.of("minecraft:water"), + ]) + .catalyst("minecraft:quartz_block"); + event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:deeplsate"), [ - BlockPredicate.of("minecraft:lava"), - BlockPredicate.of("minecraft:water"), - ]) - .catalyst("minecraft:polished_deepslate"); + .extruding(Item.of("minecraft:deepslate"), [ + BlockStatePredicate.of("minecraft:lava"), + BlockStatePredicate.of("minecraft:water"), + ]).catalyst("minecraft:polished_deepslate");; + event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:calcite"), [ - BlockPredicate.of("minecraft:lava"), - BlockPredicate.of("minecraft:water"), - ]) - .catalyst("create:limestone"); + .extruding(Item.of("minecraft:cobbled_deepslate"), [ + BlockPredicate.of("minecraft:lava"), + BlockPredicate.of("minecraft:water"), + ]) + .catalyst("minecraft:polished_deepslate"); + + event.recipes.create_mechanical_extruder + .extruding(Item.of("minecraft:calcite"), [ + BlockStatePredicate.of("minecraft:lava"), + BlockStatePredicate.of("minecraft:water"), + ]) + .catalyst("create:limestone"); event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:diorite"), [ - BlockPredicate.of("minecraft:lava"), - BlockPredicate.of("minecraft:water"), - ]) - .catalyst("minecraft:calcite"); + .extruding(Item.of("minecraft:diorite"), [ + BlockStatePredicate.of("minecraft:lava"), + BlockStatePredicate.of("minecraft:water"), + ]) + .catalyst("minecraft:calcite"); event.recipes.create_mechanical_extruder - .extruding(Item.of("minecraft:andesite"), [ - BlockPredicate.of("minecraft:lava"), - BlockPredicate.of("minecraft:water"), - ]) - .catalyst("minecraft:diorite"); + .extruding(Item.of("minecraft:andesite"), [ + BlockStatePredicate.of("minecraft:lava"), + BlockStatePredicate.of("minecraft:water"), + ]) + .catalyst("minecraft:diorite"); }); diff --git a/pack.toml b/pack.toml index ed49c8c..7426f6c 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 = "9966b11361d7ec474bfac9b9f2b07316f5b87b0c1ed2c0f12382adcdef12981b" +hash = "1c604e43f386b75b6342ef39ace522bda40722f33930fd487f8b79ec563982df" [versions] forge = "47.4.4"