diff --git a/.gitignore b/.gitignore index 512e84e..8f84e8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/server-mods .vscode /src/kubejs/probe +/icon-exports-x32 diff --git a/src/index.toml b/src/index.toml index 31e8551..b908cb8 100644 --- a/src/index.toml +++ b/src/index.toml @@ -67,6 +67,10 @@ hash = "fc4faf74ae1bad06020a187ba3c699b259eab7da780bff3c48916c520aef910f" file = "kubejs/server_scripts/clearlag.js" hash = "1a405c6cff718d67f7fe5303bf16df5ed5946d3cfaffd31dab7a9875171c0532" +[[files]] +file = "kubejs/server_scripts/recipe_overrides.js" +hash = "095acfebbd9df9dcbaceb2bcd5bf9980956fb9d0dedea3fb6671e95039f6e0ed" + [[files]] file = "kubejs/server_scripts/test.js" hash = "698d489a6bec11eafe725433e11c9d1733313c6c617834ca216c92a3c6c5acfd" @@ -91,6 +95,11 @@ file = "mods/aeinfinitybooster.pw.toml" hash = "7ec07fbf8bd444722601e8acedc7ea199a40edc9a37c4c5df1e449712d0e3dc4" metafile = true +[[files]] +file = "mods/anvil-restoration.pw.toml" +hash = "ca8a8b9a5c0c48100da7988feba0a83a078056c1e45a457d0142ec90c5f7e9e0" +metafile = true + [[files]] file = "mods/applied-energistics-2-wireless-terminals.pw.toml" hash = "2c05c84665d23533f34b8cbc68ced8ea84eed2b566f7c63c804c2f38431d0a6a" @@ -211,6 +220,11 @@ file = "mods/comforts.pw.toml" hash = "fbfe78fc2ee5344d22a88a41dc69027002ac86eebf1c9401f93b22876c8f8ed3" metafile = true +[[files]] +file = "mods/compact-help-command.pw.toml" +hash = "b7bb74dc357d51598dec47adaa3cf08c3eb028d13be20422c6ac9a3b3fd94b2f" +metafile = true + [[files]] file = "mods/controlling.pw.toml" hash = "2a50d21837bba88e3c9490c6bb8e0a9b44b052645d5c1481b48a060439c20a3c" @@ -356,6 +370,11 @@ file = "mods/grindstone-sharper-tools.pw.toml" hash = "ba8c4031b9a670f380ddb27e88eed72ee7ee1adff3307dcecf0f8352bba5e171" metafile = true +[[files]] +file = "mods/healing-campfire.pw.toml" +hash = "3d171249b5ac8930afa358cf8717e6240edd9d7cd94fc67faf5ff05a6a579bfd" +metafile = true + [[files]] file = "mods/iconexporter.pw.toml" hash = "e9570c9db5f578d2837d4d225254717a7a7b72e6c00e4b022fafb4a9dab73a70" @@ -771,6 +790,16 @@ file = "mods/toast-control.pw.toml" hash = "1195cdfa90ac4ef4d5ebed8dbca1df990cf58b0a0fe3b9b965ccefa0cfd5a2e3" metafile = true +[[files]] +file = "mods/toms-storage.pw.toml" +hash = "ed9f3adc51548afe0756eb9e527a1272dda6b407e27f00457659c283edea14ea" +metafile = true + +[[files]] +file = "mods/toms-trading-network.pw.toml" +hash = "8593cbba259bfd8500c20c4e8188e574a5f022f8719de9e0150941fd9f7019e9" +metafile = true + [[files]] file = "mods/tool-belt.pw.toml" hash = "fc609c2c8e3d9ce340a79e7cc1c81da7168e982f1c5a37705bbe4fcf89d06d47" diff --git a/src/kubejs/server_scripts/recipe_overrides.js b/src/kubejs/server_scripts/recipe_overrides.js new file mode 100644 index 0000000..01f6845 --- /dev/null +++ b/src/kubejs/server_scripts/recipe_overrides.js @@ -0,0 +1,43 @@ +// 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/mods/anvil-restoration.pw.toml b/src/mods/anvil-restoration.pw.toml new file mode 100644 index 0000000..cd87564 --- /dev/null +++ b/src/mods/anvil-restoration.pw.toml @@ -0,0 +1,13 @@ +name = "Anvil Restoration" +filename = "anvilrestoration-1.20.1-2.1.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/bd8nwTGy/versions/YE08ghDV/anvilrestoration-1.20.1-2.1.jar" +hash-format = "sha1" +hash = "109ced9c72d9aa33c0e3d46a02783c0901ef691d" + +[update] +[update.modrinth] +mod-id = "bd8nwTGy" +version = "YE08ghDV" diff --git a/src/mods/compact-help-command.pw.toml b/src/mods/compact-help-command.pw.toml new file mode 100644 index 0000000..90eafb1 --- /dev/null +++ b/src/mods/compact-help-command.pw.toml @@ -0,0 +1,13 @@ +name = "Compact Help Command" +filename = "compacthelpcommand-1.20.1-2.4.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/XdiGl7ZL/versions/bnudVzaO/compacthelpcommand-1.20.1-2.4.jar" +hash-format = "sha1" +hash = "203b10bd4427a2daef244c376a037270b579b341" + +[update] +[update.modrinth] +mod-id = "XdiGl7ZL" +version = "bnudVzaO" diff --git a/src/mods/healing-campfire.pw.toml b/src/mods/healing-campfire.pw.toml new file mode 100644 index 0000000..ec856b6 --- /dev/null +++ b/src/mods/healing-campfire.pw.toml @@ -0,0 +1,13 @@ +name = "Healing Campfire" +filename = "healingcampfire-1.20.1-5.2.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/kOuPUitF/versions/WlipzkEX/healingcampfire-1.20.1-5.2.jar" +hash-format = "sha1" +hash = "03e4f1416fc834aefaac59f5a349ad91d27b8fe2" + +[update] +[update.modrinth] +mod-id = "kOuPUitF" +version = "WlipzkEX" diff --git a/src/mods/toms-storage.pw.toml b/src/mods/toms-storage.pw.toml new file mode 100644 index 0000000..2a296a7 --- /dev/null +++ b/src/mods/toms-storage.pw.toml @@ -0,0 +1,13 @@ +name = "Tom's Simple Storage Mod" +filename = "toms_storage-1.20-1.6.5.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/XZNI4Cpy/versions/taaU7hQG/toms_storage-1.20-1.6.5.jar" +hash-format = "sha1" +hash = "abcd33998c1baec7e429c705bdbdf9d3c9b377e7" + +[update] +[update.modrinth] +mod-id = "XZNI4Cpy" +version = "taaU7hQG" diff --git a/src/mods/toms-trading-network.pw.toml b/src/mods/toms-trading-network.pw.toml new file mode 100644 index 0000000..df69d01 --- /dev/null +++ b/src/mods/toms-trading-network.pw.toml @@ -0,0 +1,13 @@ +name = "Tom's Trading Network" +filename = "toms_trading_network-1.20-0.2.2.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/x5iQ3NM5/versions/PfmGbxy4/toms_trading_network-1.20-0.2.2.jar" +hash-format = "sha1" +hash = "8127098965a4902a6c1a530ec10a129ce46a9467" + +[update] +[update.modrinth] +mod-id = "x5iQ3NM5" +version = "PfmGbxy4" diff --git a/src/pack.toml b/src/pack.toml index 4fb637c..46167cf 100644 --- a/src/pack.toml +++ b/src/pack.toml @@ -1,12 +1,12 @@ name = "GalacticFactory" author = "GalacticFactory" -version = "0.5.4" +version = "0.5.5" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "6b36668b7d9488e4deef16b5236df690cf653b8f561971b6404af56de1606296" +hash = "ce85f1d770dfd6b22adb62cb3186ffb6a472e5da9985a6ce4ac8335a6e0294ff" [versions] forge = "47.2.0"