From 29ed2d050771f93b7d09d5ab4c14fb6f75d2d118 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Thu, 16 Nov 2023 01:21:30 -0500 Subject: [PATCH] Version bump to 0.5.9 KubeJS script changes: - clearlag.js disabled - recipe_overrides.js split out into its own recipes folder - Added recipe overrides for the following mods: - Applied Energistics 2 - Immersive Engineering - Industrial Foregoing - Iron Jetpacks - Mekanism - Mekanism Weapons --- src/index.toml | 26 +++++++++-- .../{clearlag.js => clearlag.js.disabled} | 0 src/kubejs/server_scripts/recipe_overrides.js | 43 ------------------- src/kubejs/server_scripts/recipes/ae2.js | 14 ++++++ .../recipes/immersiveengineering.js | 4 ++ .../recipes/industrialforegoing.js | 18 ++++++++ .../server_scripts/recipes/ironjetpacks.js | 14 ++++++ src/kubejs/server_scripts/recipes/mekanism.js | 21 +++++++++ .../server_scripts/recipes/mekaweapons.js | 32 ++++++++++++++ src/pack.toml | 4 +- 10 files changed, 128 insertions(+), 48 deletions(-) rename src/kubejs/server_scripts/{clearlag.js => clearlag.js.disabled} (100%) delete mode 100644 src/kubejs/server_scripts/recipe_overrides.js create mode 100644 src/kubejs/server_scripts/recipes/ae2.js create mode 100644 src/kubejs/server_scripts/recipes/immersiveengineering.js create mode 100644 src/kubejs/server_scripts/recipes/industrialforegoing.js create mode 100644 src/kubejs/server_scripts/recipes/ironjetpacks.js create mode 100644 src/kubejs/server_scripts/recipes/mekanism.js create mode 100644 src/kubejs/server_scripts/recipes/mekaweapons.js diff --git a/src/index.toml b/src/index.toml index 076fd55..8490eed 100644 --- a/src/index.toml +++ b/src/index.toml @@ -68,12 +68,32 @@ file = "kubejs/server_scripts/cardboard_box_blacklist.js" hash = "fc4faf74ae1bad06020a187ba3c699b259eab7da780bff3c48916c520aef910f" [[files]] -file = "kubejs/server_scripts/clearlag.js" +file = "kubejs/server_scripts/clearlag.js.disabled" hash = "1a405c6cff718d67f7fe5303bf16df5ed5946d3cfaffd31dab7a9875171c0532" [[files]] -file = "kubejs/server_scripts/recipe_overrides.js" -hash = "095acfebbd9df9dcbaceb2bcd5bf9980956fb9d0dedea3fb6671e95039f6e0ed" +file = "kubejs/server_scripts/recipes/ae2.js" +hash = "bcf3c45ad159d8825654ef5af1bf32d894a45a62dac422a9f59f2524e1110a58" + +[[files]] +file = "kubejs/server_scripts/recipes/immersiveengineering.js" +hash = "1f5e1baf6616c815215c9a5fb6e4ef00409ace878547a69235059b0707bc5f95" + +[[files]] +file = "kubejs/server_scripts/recipes/industrialforegoing.js" +hash = "35936469b821ea684b484361a827ee0adb6c8357d646f9cd24deee9f93eb0deb" + +[[files]] +file = "kubejs/server_scripts/recipes/ironjetpacks.js" +hash = "d3e25b22ec8302c68fec0e0b7830b4983a8078b2790039dbb85e89e8e827799d" + +[[files]] +file = "kubejs/server_scripts/recipes/mekanism.js" +hash = "b89b9a0091061ea3c05f2b28ff81922c157df0bf100f20f6153b1a2afeef3d24" + +[[files]] +file = "kubejs/server_scripts/recipes/mekaweapons.js" +hash = "fb87db3c4a2091b61c7d18866f826a0035138cfd981003dd818b4b7aeaf79a69" [[files]] file = "kubejs/server_scripts/test.js" diff --git a/src/kubejs/server_scripts/clearlag.js b/src/kubejs/server_scripts/clearlag.js.disabled similarity index 100% rename from src/kubejs/server_scripts/clearlag.js rename to src/kubejs/server_scripts/clearlag.js.disabled diff --git a/src/kubejs/server_scripts/recipe_overrides.js b/src/kubejs/server_scripts/recipe_overrides.js deleted file mode 100644 index 01f6845..0000000 --- a/src/kubejs/server_scripts/recipe_overrides.js +++ /dev/null @@ -1,43 +0,0 @@ -// priority: 0 - -ServerEvents.recipes(event => { - // Remove Industrial Foregoing's Latex Processing Unit recipe and add a progression-based one - event.remove({ output: "industrialforegoing:latex_processing_unit" }) - - event.shaped("industrialforegoing:latex_processing_unit", [ - 'ABC', - 'DEF', - 'CGA' - ], { - A: "immersiveengineering:plate_aluminum", - B: "minecraft:redstone_block", - C: "create:iron_sheet", - D: "minecraft:water_bucket", - E: "industrialforegoing:machine_frame_pity", - F: "industrialforegoing:latex_bucket", - G: "minecraft:furnace" - }) - - // Remove Immersive Engineering's Hammer's shapeless crafting recipe for the Aluminum Plate - event.remove({ output: "immersiveengineering:plate_aluminum", type: 'minecraft:crafting_shapeless' }) - - // Remove the Mekanism Metallurgic Infuser recipe and add a progression-based one - event.remove({ output: "mekanism:metallurgic_infuser" }) - - event.custom({ - "type": "industrialforegoing:dissolution_chamber", - "input": [ - {"item": "industrialforegoing:plastic"}, - {"item": "minecraft:furnace"}, - {"item": "immersiveengineering:plate_aluminum"}, - {"item": "immersiveengineering:slag"}, - {"item": "immersiveengineering:slag"}, - {"item": "immersiveengineering:plate_aluminum"}, - {"item": "industrialforegoing:machine_frame_advanced"}, - {"item": "industrialforegoing:plastic"} - ], - "inputFluid": "{Amount:500,FluidName:\"industrialforegoing:pink_slime\"}", - "output": { item: "mekanism:metallurgic_infuser" }, - "processingTime": 300 - }) -}) diff --git a/src/kubejs/server_scripts/recipes/ae2.js b/src/kubejs/server_scripts/recipes/ae2.js new file mode 100644 index 0000000..281fb11 --- /dev/null +++ b/src/kubejs/server_scripts/recipes/ae2.js @@ -0,0 +1,14 @@ +ServerEvents.recipes((event) => { + // Remove the Applied Energistics 2 Inscriber recipe and add a progression-based one + event.remove({ output: "ae2:inscriber" }) + + event.shaped("ae2:inscriber", [ + 'ABA', + 'C A', + 'ABA' + ], { + A: "minecraft:iron_ingot", + B: "minecraft:sticky_piston", + C: "mekanism:alloy_infused" + }) +}) diff --git a/src/kubejs/server_scripts/recipes/immersiveengineering.js b/src/kubejs/server_scripts/recipes/immersiveengineering.js new file mode 100644 index 0000000..4a190c6 --- /dev/null +++ b/src/kubejs/server_scripts/recipes/immersiveengineering.js @@ -0,0 +1,4 @@ +ServerEvents.recipes(event => { + // Remove Immersive Engineering's Hammer's shapeless crafting recipe for the Aluminum Plate + event.remove({ output: "immersiveengineering:plate_aluminum", type: 'minecraft:crafting_shapeless' }) +}) diff --git a/src/kubejs/server_scripts/recipes/industrialforegoing.js b/src/kubejs/server_scripts/recipes/industrialforegoing.js new file mode 100644 index 0000000..83afda6 --- /dev/null +++ b/src/kubejs/server_scripts/recipes/industrialforegoing.js @@ -0,0 +1,18 @@ +ServerEvents.recipes(event => { + // Remove Industrial Foregoing's Latex Processing Unit recipe and add a progression-based one + event.remove({ output: "industrialforegoing:latex_processing_unit" }) + + event.shaped("industrialforegoing:latex_processing_unit", [ + 'ABC', + 'DEF', + 'CGA' + ], { + A: "immersiveengineering:plate_aluminum", + B: "minecraft:redstone_block", + C: "create:iron_sheet", + D: "minecraft:water_bucket", + E: "industrialforegoing:machine_frame_pity", + F: "industrialforegoing:latex_bucket", + G: "minecraft:furnace" + }) +}) diff --git a/src/kubejs/server_scripts/recipes/ironjetpacks.js b/src/kubejs/server_scripts/recipes/ironjetpacks.js new file mode 100644 index 0000000..070c82b --- /dev/null +++ b/src/kubejs/server_scripts/recipes/ironjetpacks.js @@ -0,0 +1,14 @@ +ServerEvents.recipes((event) => { + // Remove the Iron Jetpack Basic Coil recipe and add a progression-based one + event.remove({ output: "ironjetpacks:basic_coil" }) + + event.shaped("ironjetpacks:basic_coil", [ + ' AB', + 'ACA', + 'BA ' + ], { + A: "minecraft:iron_ingot", + B: "minecraft:redstone", + C: "immersiveengineering:stick_steel" + }) +}) diff --git a/src/kubejs/server_scripts/recipes/mekanism.js b/src/kubejs/server_scripts/recipes/mekanism.js new file mode 100644 index 0000000..12f8aa3 --- /dev/null +++ b/src/kubejs/server_scripts/recipes/mekanism.js @@ -0,0 +1,21 @@ +ServerEvents.recipes((event) => { + // Remove the Mekanism Metallurgic Infuser recipe and add a progression-based one + event.remove({ output: "mekanism:metallurgic_infuser" }) + + event.custom({ + "type": "industrialforegoing:dissolution_chamber", + "input": [ + {"item": "industrialforegoing:plastic"}, + {"item": "minecraft:furnace"}, + {"item": "immersiveengineering:plate_aluminum"}, + {"item": "immersiveengineering:slag"}, + {"item": "immersiveengineering:slag"}, + {"item": "immersiveengineering:plate_aluminum"}, + {"item": "industrialforegoing:machine_frame_advanced"}, + {"item": "industrialforegoing:plastic"} + ], + "inputFluid": "{Amount:500,FluidName:\"industrialforegoing:pink_slime\"}", + "output": { item: "mekanism:metallurgic_infuser" }, + "processingTime": 300 + }) +}) diff --git a/src/kubejs/server_scripts/recipes/mekaweapons.js b/src/kubejs/server_scripts/recipes/mekaweapons.js new file mode 100644 index 0000000..1d11cce --- /dev/null +++ b/src/kubejs/server_scripts/recipes/mekaweapons.js @@ -0,0 +1,32 @@ +ServerEvents.recipes(event => { + // Remove Mekaweapon's Meka-Tana recipe and replace it with a more expensive one + event.remove({ output: "mekaweapons:mekatana" }) + + event.shaped("mekaweapons:mekatana", [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: "mekanism:ultimate_control_circuit", + B: "mekaweapons:katana_blade", + C: "mekanism:hdpe_sheet", + D: "mekanism:pellet_antimatter", + E: "mekanism:pellet_polonium", + F: "mekanism:ultimate_induction_cell", + }) + + // Remove Mekaweapon's Meka-Bow recipe and replace it with a more expensive one + event.remove({ output: "mekaweapons:mekabow" }) + + event.shaped("mekaweapons:mekabow", [ + 'ABA', + 'CDC', + 'CEC' + ], { + A: "mekanism:pellet_polonium", + B: "mekaweapons:bow_riser", + C: "mekanism:ingot_refined_obsidian", + D: "mekanism:pellet_antimatter", + E: "mekaweapons:bow_limb" + }) +}) diff --git a/src/pack.toml b/src/pack.toml index 3da9587..3a5705b 100644 --- a/src/pack.toml +++ b/src/pack.toml @@ -1,12 +1,12 @@ name = "GalacticFactory" author = "GalacticFactory" -version = "0.5.8" +version = "0.5.9" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "8a633d6ce57966fa709d77bbe5dab61cd5d37028e58e39a82bce1af85d19b27e" +hash = "1486eb36a3c8e88b4c8f32fe7e705a2fc0046d49275cb5233ca29bd9f4a0643d" [versions] forge = "47.2.0"