diff --git a/config/cobblegenrandomizer-common.toml b/config/cobblegenrandomizer-common.toml index a6de145..e1932f7 100644 --- a/config/cobblegenrandomizer-common.toml +++ b/config/cobblegenrandomizer-common.toml @@ -37,6 +37,10 @@ ["cobblestone", "minecraft:polished_deepslate", ["minecraft:cobbled_deeplsate"]], ["stone", "minecraft:polished_deepslate", ["minecraft:deepslate"]], ["cobblestone", "create:limestone", ["minecraft:calcite"]], - ["stone", "create:limestone", ["minecraft:calcite"]] + ["stone", "create:limestone", ["minecraft:calcite"]], + ["cobblestone", "minecraft:calcite", ["minecraft:diorite"]], + ["stone", "minecraft:calcite", ["minecraft:diorite"]], + ["cobblestone", "minecraft:diorite", ["minecraft:andesite"]], + ["stone", "minecraft:diorite", ["minecraft:andesite"]] ] diff --git a/index.toml b/index.toml index 999ab99..67121eb 100644 --- a/index.toml +++ b/index.toml @@ -80,7 +80,7 @@ hash = "25b2539bcd6545c4065e2dd3633e34da74bb7a43255f8821f68c012ddc22f140" [[files]] file = "config/cobblegenrandomizer-common.toml" -hash = "cc0769c94241a5edcebf1630f7e9527609f9d35b6443dd27f0f88de416a3989d" +hash = "86c097a2628609378492755d4abe8317589cf612a5c6fafbdc243f47ae1a676d" [[files]] file = "config/connectivity.json" @@ -377,7 +377,7 @@ hash = "02186858dba534fe236aa03ac704144781ee2f00070e10219f1b04f6c8f4b1dd" [[files]] file = "kubejs/server_scripts/sands.js" -hash = "09fdbd5aadc9a855d0f92faddd5409aed4ff46ab079d0a8c2abf071ba5cb7965" +hash = "753c70ae7b21f4df4ffd89efbb87d2d0d9141d58ca329ae46a1c65a88eb40b41" [[files]] file = "kubejs/server_scripts/sheets.js" @@ -389,7 +389,7 @@ hash = "a5b8711446521f8567ff3d5f3a18af09a6c8c78e2e020ec1f55d0754cd940363" [[files]] file = "kubejs/server_scripts/stones.js" -hash = "574e2cea901c42d7c28f7a41b64ccba39fa8c88c22a853e237a302a00a6d15ea" +hash = "cbfb8342414c57b706aff876958f571dd93a189ae521aba412f010db8fa8285b" [[files]] file = "mods/additional-lights.pw.toml" @@ -986,11 +986,6 @@ file = "mods/curious-lanterns.pw.toml" hash = "08a2db404abdeeddd99346716bdf566705112db412566f2bde7c5780e62f5c2e" metafile = true -[[files]] -file = "mods/cursery.pw.toml" -hash = "2994e9f5cb4f258694f4704ef96eb1ebcf2b1799cd8d9361341c359660cb6744" -metafile = true - [[files]] file = "mods/cut-through.pw.toml" hash = "b64e0bcd7299d5f773d7e7937d141c1c55803a3077de6f242db972853b11990b" @@ -2106,6 +2101,11 @@ file = "mods/resourcepackcached.pw.toml" hash = "23f7a6f94c573aa57558e5c06c1ffc4169c0dcd8f13d88c54003a910b5bf02b7" metafile = true +[[files]] +file = "mods/responsiveshields.pw.toml" +hash = "002c65a532ae2a0f4b7808f4340ef8c4359b636c8b233e7e74f5f2a7426acf5e" +metafile = true + [[files]] file = "mods/retro-damage-indicators.pw.toml" hash = "ba76693f55482df48a233d1429477b6aee8cb3e191af8a2e8e7d290017ae839c" diff --git a/kubejs/server_scripts/sands.js b/kubejs/server_scripts/sands.js index 4c2fd22..7ac093d 100644 --- a/kubejs/server_scripts/sands.js +++ b/kubejs/server_scripts/sands.js @@ -45,11 +45,11 @@ ServerEvents.recipes((event) => { Item.of("biomesoplenty:orange_sand"), Item.of("quark:jasper") ); - // Lead nugget from black sand + // Nickel nugget from black sand event.recipes.create.splashing( [ Item.of("minecraft:clay_ball").withChance(0.2), -// Item.of("cgs:lead_nugget",3).withChance(0.12), + Item.of("jaopca:nuggets.nickel",3).withChance(0.12), ], Item.of("biomesoplenty:black_sand") ); @@ -65,7 +65,7 @@ ServerEvents.recipes((event) => { // Zinc nugget from white sand event.recipes.create.splashing( [ - Item.of("minecraft:clay").withChance(0.2), + 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 d8b1a2d..8f4c6d8 100644 --- a/kubejs/server_scripts/stones.js +++ b/kubejs/server_scripts/stones.js @@ -1 +1,51 @@ -// priority: 0 \ No newline at end of file +// 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"); + + event.recipes.create_mechanical_extruder + .extruding(Item.of("minecraft:deeplsate"), [ + BlockPredicate.of("minecraft:lava"), + BlockPredicate.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"); + + event.recipes.create_mechanical_extruder + .extruding(Item.of("minecraft:diorite"), [ + BlockPredicate.of("minecraft:lava"), + BlockPredicate.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"); +}); diff --git a/mods/cursery.pw.toml b/mods/cursery.pw.toml deleted file mode 100644 index 89d3a3d..0000000 --- a/mods/cursery.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Cursery[Forge/Fabric]" -filename = "cursery-1.20.1-4.2.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "6649ae844c2fcd2fb848e8b419e9dfb33220661a" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4767585 -project-id = 476545 diff --git a/mods/responsiveshields.pw.toml b/mods/responsiveshields.pw.toml new file mode 100644 index 0000000..07fbe22 --- /dev/null +++ b/mods/responsiveshields.pw.toml @@ -0,0 +1,13 @@ +name = "Responsive Shields" +filename = "responsiveshields-2.3-mc1.18-19-20.x.jar" +side = "server" + +[download] +url = "https://cdn.modrinth.com/data/MBmh0f9A/versions/6vuwab6O/responsiveshields-2.3-mc1.18-19-20.x.jar" +hash-format = "sha512" +hash = "e154e2dea3a31564b5d88c430069ca2e376141ed0994d275fa22507f4fb6abc51f44d272f88a682f36d8ce3f8269d2aa31b713a909582c37a7eacb0d24790a4e" + +[update] +[update.modrinth] +mod-id = "MBmh0f9A" +version = "6vuwab6O" diff --git a/pack.toml b/pack.toml index 44f291c..ed49c8c 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 = "91edf41c76a1248861048b3dc385c93b8bb8038991a9efd8aa00a9233305fd0c" +hash = "9966b11361d7ec474bfac9b9f2b07316f5b87b0c1ed2c0f12382adcdef12981b" [versions] forge = "47.4.4"