diff --git a/kubejs/client_scripts/immersive_engineering.js b/kubejs/client_scripts/hide/immersive_engineering.js similarity index 100% rename from kubejs/client_scripts/immersive_engineering.js rename to kubejs/client_scripts/hide/immersive_engineering.js diff --git a/kubejs/client_scripts/copper_tools_and_armor.js b/kubejs/client_scripts/hide/unification/copper_tools_and_armor.js similarity index 100% rename from kubejs/client_scripts/copper_tools_and_armor.js rename to kubejs/client_scripts/hide/unification/copper_tools_and_armor.js diff --git a/kubejs/client_scripts/rope.js b/kubejs/client_scripts/hide/unification/rope.js similarity index 100% rename from kubejs/client_scripts/rope.js rename to kubejs/client_scripts/hide/unification/rope.js diff --git a/kubejs/client_scripts/sawdust.js b/kubejs/client_scripts/hide/unification/sawdust.js similarity index 100% rename from kubejs/client_scripts/sawdust.js rename to kubejs/client_scripts/hide/unification/sawdust.js diff --git a/kubejs/client_scripts/simple_unification.js b/kubejs/client_scripts/hide/unification/simple_unification.js similarity index 100% rename from kubejs/client_scripts/simple_unification.js rename to kubejs/client_scripts/hide/unification/simple_unification.js diff --git a/kubejs/client_scripts/slag.js b/kubejs/client_scripts/hide/unification/slag.js similarity index 100% rename from kubejs/client_scripts/slag.js rename to kubejs/client_scripts/hide/unification/slag.js diff --git a/kubejs/client_scripts/storage_blocks.js b/kubejs/client_scripts/hide/unification/storage_blocks.js similarity index 100% rename from kubejs/client_scripts/storage_blocks.js rename to kubejs/client_scripts/hide/unification/storage_blocks.js diff --git a/kubejs/client_scripts/sulfur.js b/kubejs/client_scripts/hide/unification/sulfur.js similarity index 100% rename from kubejs/client_scripts/sulfur.js rename to kubejs/client_scripts/hide/unification/sulfur.js diff --git a/kubejs/server_scripts/recipes/pressure_plates_use_slabs.js b/kubejs/server_scripts/recipes/essentials/pressure_plates_use_slabs.js similarity index 100% rename from kubejs/server_scripts/recipes/pressure_plates_use_slabs.js rename to kubejs/server_scripts/recipes/essentials/pressure_plates_use_slabs.js diff --git a/kubejs/server_scripts/recipes/slabs.js b/kubejs/server_scripts/recipes/essentials/slabs.js similarity index 76% rename from kubejs/server_scripts/recipes/slabs.js rename to kubejs/server_scripts/recipes/essentials/slabs.js index 9ddbf5c..0b1fff8 100644 --- a/kubejs/server_scripts/recipes/slabs.js +++ b/kubejs/server_scripts/recipes/essentials/slabs.js @@ -1,17 +1,18 @@ // priority: 0 onEvent("recipes", event => { - let ieSlabRegex = /^immersiveengineering:slab_storage_/; - // For each slab crafting recipe that outputs 6x slabs, ... event.forEachRecipe({ id: /_slab/, type: "minecraft:crafting_shaped" }, recipe => { if (recipe.outputItems[0].getCount() != 6) return; - // We disable the Immersive Engineering storage block slabs in "immersive_engineering.js" - if (ieSlabRegex.test(recipe.outputItems[0].getId())) return; let input = recipe.inputItems[0]; let output = recipe.outputItems[0].getId(); + // We disable the Immersive Engineering storage block slabs in "immersive_engineering.js". + if (/^immersiveengineering:slab_storage_/.test(output)) return; + // Quark limestone is disabled but some recipes still linger. + if (/^quark:.*limestone.*$/.test(output)) return; + // ... add a recipe to craft slabs in 2x2 crafting grid. event.shaped("4x " + output, [ "SS" ], { S: input }); // For this to work, "pressure_plates_use_stabs.json" must also be present. diff --git a/kubejs/server_scripts/recipes/stairs.js b/kubejs/server_scripts/recipes/essentials/stairs.js similarity index 85% rename from kubejs/server_scripts/recipes/stairs.js rename to kubejs/server_scripts/recipes/essentials/stairs.js index 2109291..7ea4e78 100644 --- a/kubejs/server_scripts/recipes/stairs.js +++ b/kubejs/server_scripts/recipes/essentials/stairs.js @@ -8,6 +8,9 @@ onEvent("recipes", event => { let input = recipe.inputItems[0]; let output = recipe.outputItems[0].getId(); + // Quark limestone is disabled but some recipes still linger. + if (/^quark:.*limestone.*$/.test(output)) return; + // ... modify the output to return 6x instead of 4x. recipe.replaceOutput(output, "6x " + output, false, (out, orig) => out); diff --git a/kubejs/server_scripts/recipes/vertical_slabs.js b/kubejs/server_scripts/recipes/essentials/vertical_slabs.js similarity index 78% rename from kubejs/server_scripts/recipes/vertical_slabs.js rename to kubejs/server_scripts/recipes/essentials/vertical_slabs.js index 43e750a..8426cc7 100644 --- a/kubejs/server_scripts/recipes/vertical_slabs.js +++ b/kubejs/server_scripts/recipes/essentials/vertical_slabs.js @@ -8,6 +8,10 @@ onEvent("recipes", event => { event.forEachRecipe({ id: /_vertical_slab_revert/ }, recipe => { let input = recipe.inputItems[0]; let output = recipe.outputItems[0].getId(); + + // Quark limestone is disabled but some recipes still linger. + if (/^quark:.*limestone.*$/.test(output)) return; + event.shapeless(input, [ output ]); }); });