From 2d1a2f14e5a4993d69878398b771edfab9b5a764 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 13 Nov 2022 07:51:29 +0100 Subject: [PATCH 1/7] Add ore indicators as items placed on the ground Item placing on the ground is added by Draconic Evolution, I used a janky way to setblock generated indicator to that tile. That tile needs nbt so I had to set a block using execute as setblock command, which is bad, because it spams logs and operators chat --- config/oreveins/ore_veins.json | 16 ++++++- index.toml | 10 ++++- pack.toml | 2 +- scripts/ore_veins/indicators.1.zs | 71 +++++++++++++++++++++++++++++++ scripts/ore_veins/indicators.2.zs | 5 +++ 5 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 scripts/ore_veins/indicators.1.zs create mode 100644 scripts/ore_veins/indicators.2.zs diff --git a/config/oreveins/ore_veins.json b/config/oreveins/ore_veins.json index f5cd122..fb23352 100644 --- a/config/oreveins/ore_veins.json +++ b/config/oreveins/ore_veins.json @@ -5,6 +5,12 @@ "block": "thermalfoundation:ore", "meta": 0 }, + "indicator": { + "blocks": "contenttweaker:juice/internal/indicator/copper", + "ignore_vegatation": false, + "ignore_liquids": false, + "rarity": 24 + }, "stone": "minecraft:stone", "rarity": 160, "min_y": 8, @@ -20,6 +26,12 @@ "block": "forestry:resources", "meta": 0 }, + "indicator": { + "blocks": "contenttweaker:juice/internal/indicator/apatite", + "ignore_vegatation": false, + "ignore_liquids": false, + "rarity": 24 + }, "stone": "minecraft:stone", "rarity": "100", "min_y": -10, @@ -35,9 +47,9 @@ "ore": "minecraft:gold_ore", "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:gold_ore", + "blocks": "contenttweaker:juice/internal/indicator/gold", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 170, diff --git a/index.toml b/index.toml index a5991da..024a896 100644 --- a/index.toml +++ b/index.toml @@ -302,7 +302,7 @@ hash = "5046cde3673ccd62ba2209aaab9a917b3e1b0da7f521477e89f68bdba1648187" [[files]] file = "config/oreveins/ore_veins.json" -hash = "214f7142f586483b47112fa0e39fc24a693e512634a71f3851e5cefbd4dbf6bb" +hash = "44c43ee20b7998d261565da99b0a54ad268eaa1f44bc14d323489a885a5a246c" [[files]] file = "config/sereneseasons/biome_info.json" @@ -1539,3 +1539,11 @@ hash = "b4aea7892748ecfa5cf775fb0a18f0909795c0b025666ecaea88bb3a923b4194" [[files]] file = "scripts/nc_script_addons/MoarRealisticRadiation/rad_qmd.zs" hash = "a07879875ad20ae8e285c3cb39beeee648bd080ec12985b76583ad707a3de3ee" + +[[files]] +file = "scripts/ore_veins/indicators.1.zs" +hash = "eee1737869c3a9a2d2261894b32f09d8dee48df55f07393eec54ba8748a13d79" + +[[files]] +file = "scripts/ore_veins/indicators.2.zs" +hash = "08d456f730c1a797aab31811ba5a24e319ce35d000c4af80348a964a6c471898" diff --git a/pack.toml b/pack.toml index bc18b45..4f20fe7 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 = "1d97754f0f1410e1990d6465b9d99ad55e152fa11804dd642f72013a1acb0503" +hash = "dadadd056bd26d8a241d36194b27f48fe13db960074ae4a2475f8afe66af4ba6" [versions] forge = "14.23.5.2860" diff --git a/scripts/ore_veins/indicators.1.zs b/scripts/ore_veins/indicators.1.zs new file mode 100644 index 0000000..f0cee4f --- /dev/null +++ b/scripts/ore_veins/indicators.1.zs @@ -0,0 +1,71 @@ +#loader contenttweaker + +import mods.contenttweaker.Block; +import mods.contenttweaker.DropHandler; +import mods.contenttweaker.ResourceLocation; +import mods.contenttweaker.VanillaFactory; + +var nugget_table as string[][] = [ + # [name, id, meta] + ["copper", "thermalfoundation:ore", "0"], + ["apatite", "forestry:resources", "0"], + ["gold", "minecraft:gold_ore", "0"] +]; + +function replaceCommand(blockName as string, item as string, meta as string, blockPos as mods.contenttweaker.BlockPos) as string { + return "execute @a " + + blockPos.getX() as string + " " + + blockPos.getY() as string + " " + + blockPos.getZ() as string + " " + + "detect " + + blockPos.getX() as string + " " + + blockPos.getY() as string + " " + + blockPos.getZ() as string + " " + + "contenttweaker:" + blockName + " * " + + "setblock " + + blockPos.getX() as string + " " + + blockPos.getY() as string + " " + + blockPos.getZ() as string + " " + + "draconicevolution:placed_item " + + "0 " + + "replace " + + "{InventoryStacks: [{ id: \"" + item + "\", Count: 1, Damage: " + meta as string + " }]}"; +} + +for i in nugget_table { + var blockName as string = "juice/internal/indicator/" + i[0]; + var item as string = i[1]; + var meta as string = i[2]; + print("Adding internal ore indicator block: " + i[0]); + var block = VanillaFactory.createBlock(blockName, ); + block.setTextureLocation(ResourceLocation.create("contenttweaker:blocks/ore_nugget")); + block.setToolLevel(0); + # block.setAxisAlignedBB(mods.contenttweaker.AxisAlignedBB.create(0.375f, 0.0f, 0.375f, 0.625f, 0.125f, 0.625f)); + block.setEnumBlockRenderType("MODEL"); + block.setBlockHardness(0.1); + block.setBlockLayer("CUTOUT"); + block.setBlockResistance(0); + block.setDropHandler(function(drops, world, position, state, fortune) { drops.clear(); }); + block.setFullBlock(false); + block.setLightOpacity(0); + block.setPassable(true); + block.setReplaceable(true); + + # janky hack, mate + block.setOnBlockPlace(function(world, blockPos, blockState) { + var command as string = replaceCommand(blockName, item, meta, blockPos); + server.commandManager.executeCommand(server, command); + }); + + block.setOnRandomTick(function(world, blockPos, blockState) { + var command as string = replaceCommand(blockName, item, meta, blockPos); + server.commandManager.executeCommand(server, command); + }); + + block.setOnUpdateTick(function(world, blockPos, blockState) { + var command as string = replaceCommand(blockName, item, meta, blockPos); + server.commandManager.executeCommand(server, command); + }); + + block.register(); +} diff --git a/scripts/ore_veins/indicators.2.zs b/scripts/ore_veins/indicators.2.zs new file mode 100644 index 0000000..fb1c711 --- /dev/null +++ b/scripts/ore_veins/indicators.2.zs @@ -0,0 +1,5 @@ +for i in loadedMods["contenttweaker"].items { + if (i.definition.name.contains("internal")) { + mods.jei.JEI.hide(i); + } +} From f1ac9603769e0fb22b58f2e9cd953b14a7695e20 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 13 Nov 2022 18:04:42 +0100 Subject: [PATCH 2/7] Use indicators from contenttweaker script in ore veins --- config/oreveins/ore_veins.json | 165 ++++++++++-------------------- index.toml | 4 +- pack.toml | 2 +- scripts/ore_veins/indicators.1.zs | 30 +++++- 4 files changed, 83 insertions(+), 118 deletions(-) diff --git a/config/oreveins/ore_veins.json b/config/oreveins/ore_veins.json index 9b7159b..b09b871 100644 --- a/config/oreveins/ore_veins.json +++ b/config/oreveins/ore_veins.json @@ -69,12 +69,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 2 - }, + "blocks": "contenttweaker:juice/internal/indicator/silver", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 240, @@ -93,12 +90,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 6 - }, + "blocks": "contenttweaker:juice/internal/indicator/platinium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 300, @@ -117,12 +111,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "mekanism:oreblock", - "meta": 2 - }, + "blocks": "contenttweaker:juice/internal/indicator/tin", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 180, @@ -142,12 +133,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 4 - }, + "blocks": "contenttweaker:juice/internal/indicator/aluminium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 190, @@ -166,12 +154,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 5 - }, + "blocks": "contenttweaker:juice/internal/indicator/nickel", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 210, @@ -190,12 +175,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "minecraft:redstone_ore", - "meta": 0 - }, + "blocks": "contenttweaker:juice/internal/indicator/redstone", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 170, @@ -213,9 +195,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "mekanism:oreblock", + "blocks": "contenttweaker:juice/internal/indicator/osmium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 190, @@ -234,12 +216,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "nuclearcraft:ore", - "meta": 7 - }, + "blocks": "contenttweaker:juice/internal/indicator/magnesium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 255, @@ -258,12 +237,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "nuclearcraft:ore", - "meta": 5 - }, + "blocks": "contenttweaker:juice/internal/indicator/boron", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 280, @@ -282,10 +258,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "nuclearcraft:ore", - "meta": 6, + "blocks": "contenttweaker:juice/internal/indicator/lithium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 255, @@ -304,12 +279,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "nuclearcraft:ore", - "meta": 4 - }, + "blocks": "contenttweaker:juice/internal/indicator/uranium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 260, @@ -327,9 +299,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:coal_ore", + "blocks": "contenttweaker:juice/internal/indicator/coal", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 90, @@ -348,9 +320,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:iron_ore", + "blocks": "contenttweaker:juice/internal/indicator/iron", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 160, @@ -368,9 +340,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:diamond_ore", + "blocks": "contenttweaker:juice/internal/indicator/diamond", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 300, @@ -388,9 +360,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "minecraft:lapis_ore", + "blocks": "contenttweaker:juice/internal/indicator/lapis", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 150, @@ -409,12 +381,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "galacticraftcore:basic_block_core", - "meta": 8 - }, + "blocks": "contenttweaker:juice/internal/indicator/silicon", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 210, @@ -432,12 +401,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/lead", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 185, @@ -455,12 +421,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "thermalfoundation:ore", - "meta": 7 - }, + "blocks": "contenttweaker:juice/internal/indicator/iridium", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 360, @@ -479,12 +442,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "actuallyadditions:block_misc", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/blackquartz", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 265, @@ -503,12 +463,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 1 - }, + "blocks": "contenttweaker:juice/internal/indicator/ruby", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 310, @@ -526,12 +483,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 7 - }, + "blocks": "contenttweaker:juice/internal/indicator/amber", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 275, @@ -549,12 +503,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 6 - }, + "blocks": "contenttweaker:juice/internal/indicator/sapphire", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 310, @@ -572,12 +523,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 2 - }, + "blocks": "contenttweaker:juice/internal/indicator/peridot", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 300, @@ -595,12 +543,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 5 - }, + "blocks": "contenttweaker:juice/internal/indicator/malachite", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 270, @@ -618,12 +563,9 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/tanzite", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 295, @@ -647,12 +589,9 @@ ], "stone": "minecraft:stone", "indicator": { - "blocks": { - "block": "biomesoplenty:gem_ore", - "meta": 3 - }, + "blocks": "contenttweaker:juice/internal/indicator/certus_quartz", "ignore_vegatation": false, - "ignore_liquids": true, + "ignore_liquids": false, "rarity": 24 }, "rarity": 330, diff --git a/index.toml b/index.toml index b997bbe..c3de786 100644 --- a/index.toml +++ b/index.toml @@ -1146,7 +1146,7 @@ hash = "5046cde3673ccd62ba2209aaab9a917b3e1b0da7f521477e89f68bdba1648187" [[files]] file = "config/oreveins/ore_veins.json" -hash = "6aef59bcddb88b84152ccb47e6ebcb1933782a4dbfb498e7a8fb7c13cf3f77a2" +hash = "e1b2b9e15458917be388f68454e78dec70d299e82525f35233d817ea9e2b03cf" [[files]] file = "config/sereneseasons/biome_info.json" @@ -2396,7 +2396,7 @@ hash = "a07879875ad20ae8e285c3cb39beeee648bd080ec12985b76583ad707a3de3ee" [[files]] file = "scripts/ore_veins/indicators.1.zs" -hash = "eee1737869c3a9a2d2261894b32f09d8dee48df55f07393eec54ba8748a13d79" +hash = "e1c7d1f08c0c54de9b6f9be8c29b3fe4c6f35bc3c8e917d06aaf7bf4fd182a2a" [[files]] file = "scripts/ore_veins/indicators.2.zs" diff --git a/pack.toml b/pack.toml index 33bbaba..4659ff7 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 = "69b89b211686f3c98af33f370e9224b6a33e0c55d930d9efbe8884d8eddad297" +hash = "d16c25fabb4e0584e25d5d3196037dcfd66ecf74bb6b569e9e8a4bec59e90d11" [versions] forge = "14.23.5.2860" diff --git a/scripts/ore_veins/indicators.1.zs b/scripts/ore_veins/indicators.1.zs index f0cee4f..5a2b4d8 100644 --- a/scripts/ore_veins/indicators.1.zs +++ b/scripts/ore_veins/indicators.1.zs @@ -7,9 +7,35 @@ import mods.contenttweaker.VanillaFactory; var nugget_table as string[][] = [ # [name, id, meta] - ["copper", "thermalfoundation:ore", "0"], + ["copper", "ic2:resource", "1"], ["apatite", "forestry:resources", "0"], - ["gold", "minecraft:gold_ore", "0"] + ["gold", "minecraft:gold_ore", "0"], + ["silver", "thermalfoundation:ore", "2"], + ["platinium", "thermalfoundation:ore", "6"], + ["tin", "mekanism:oreblock", "2"], + ["aliminium", "thermalfoundation:ore", "4"], + ["nickel", "thermalfoundation:ore", "5"], + ["redstone", "minecraft:redstone_ore", "0"], + ["osmium", "mekanism:oreblock", "0"], + ["magnesium", "nuclearcraft:ore", "7"], + ["boron", "nuclearcraft:ore", "5"], + ["lithium", "nuclearcraft:ore", "6"], + ["uranium", "nuclearcraft:ore", "4"], + ["coal", "minecarft:coal_ore", "0"], + ["iron", "minecraft:iron_ore", "0"], + ["diamond", "minecraft:diamond_ore", "0"], + ["lapis", "minecraft:lapis_ore", "0"], + ["silicon", "galacticraftcore:basic_block_core", "8"], + ["lead", "thermalfoundation:ore", "3"], + ["iridium", "thermalfoundation:ore", "7"], + ["blackquartz", "actuallyadditions:block_misc", "3"], + ["ruby", "biomesofplenty:gem_ore", "1"], + ["amber", "biomesofplenty:gem_ore", "7"], + ["sapphire", "biomesofplenty:gem_ore", "6"], + ["peridot", "biomesofplenty:gem_ore", "2"], + ["malachite", "biomesofplenty:gem_ore", "5"], + ["tanzite", "biomesofplenty:gem_ore", "4"], + ["certus_quartz", "appliedenegistics2:material", "0"] ]; function replaceCommand(blockName as string, item as string, meta as string, blockPos as mods.contenttweaker.BlockPos) as string { From f9838106208d415c87e83f56236cf5a17cc893e8 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 13 Nov 2022 18:41:15 +0100 Subject: [PATCH 3/7] Add Chat Tweaks and hide "Block placed" messages --- config/ChatTweaks/views.json | 51 ++++++++++++++++++++++++++++++++++++ index.toml | 9 +++++++ mods/chat-tweaks.pw.toml | 13 +++++++++ pack.toml | 2 +- 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 config/ChatTweaks/views.json create mode 100644 mods/chat-tweaks.pw.toml diff --git a/config/ChatTweaks/views.json b/config/ChatTweaks/views.json new file mode 100644 index 0000000..f9edff0 --- /dev/null +++ b/config/ChatTweaks/views.json @@ -0,0 +1,51 @@ +{ + "views": [ + { + "name": "*", + "filterPattern": "", + "outputFormat": "$0", + "style": "Chat", + "isExclusive": false, + "isMuted": false, + "channels": [ + "main", + "interaction", + "system", + "death" + ] + }, + { + "name": "ore veins indicators setblock spam", + "filterPattern": "^\\[[a-zA-Z0-9_]{2,16}: Block placed\\]$", + "outputFormat": "", + "style": "Hidden", + "isExclusive": true, + "isMuted": false, + "channels": [ + "system" + ] + }, + { + "name": "system", + "filterPattern": "", + "outputFormat": "$0", + "style": "Side", + "isExclusive": true, + "isMuted": false, + "channels": [ + "system" + ] + }, + { + "name": "interaction", + "filterPattern": "", + "outputFormat": "$0", + "style": "Bottom", + "isExclusive": true, + "isMuted": false, + "channels": [ + "interaction" + ] + } + ] +} \ No newline at end of file diff --git a/index.toml b/index.toml index c3de786..353a6cd 100644 --- a/index.toml +++ b/index.toml @@ -8,6 +8,10 @@ hash = "cd20deace73b9632c228f75f3740fb7fcd03acabc44e91b25c56e98de19f23de" file = "config/AsmodeusCore/core.conf" hash = "c01c2587ea013f8aac6d534041d631d99ad7d05ae1583fbd139be4ff57bfea56" +[[files]] +file = "config/ChatTweaks/views.json" +hash = "e732ee836fca9e69a06c1793860d06f2ddff619d01c4972bc3409e3388f7c7da" + [[files]] file = "config/ExtraPlanets.cfg" hash = "3ab88bac6026c888eed64172d6d964dd6adff421fab8e55b40b2e75aefc39bcf" @@ -1353,6 +1357,11 @@ file = "mods/chameleon.pw.toml" hash = "305815006195c0647af38ea5d8c03cd6c652c77bf975e3e967b754bc3b9ac569" metafile = true +[[files]] +file = "mods/chat-tweaks.pw.toml" +hash = "36b4d3a36e0556b9c5b9fd329c9d5737af36e41dbc22f4adfa1fbd475017107e" +metafile = true + [[files]] file = "mods/chicken-chunks-1-8.pw.toml" hash = "8c1cd98cbd76ccba330c24575c02edd0ede38a08330a843f9874efee8a1738dd" diff --git a/mods/chat-tweaks.pw.toml b/mods/chat-tweaks.pw.toml new file mode 100644 index 0000000..3c73b0a --- /dev/null +++ b/mods/chat-tweaks.pw.toml @@ -0,0 +1,13 @@ +name = "Chat Tweaks" +filename = "ChatTweaks_1.12.2-5.1.25.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "79f0d53ac10f149e48e45fae09de3798fe9c8478" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 2990969 +project-id = 243506 diff --git a/pack.toml b/pack.toml index 4659ff7..b5e4e9c 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 = "d16c25fabb4e0584e25d5d3196037dcfd66ecf74bb6b569e9e8a4bec59e90d11" +hash = "8a795bf3e23ba6d38c80d575d0b7e9d724d0372854f5a6836fecfa3cd2865adf" [versions] forge = "14.23.5.2860" From 08e56ccc405d91e63711a6f1dba0a0c60375e50c Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 15 Nov 2022 22:24:45 +0100 Subject: [PATCH 4/7] fix typos --- config/oreveins/ore_veins.json | 4 ++-- index.toml | 4 ++-- pack.toml | 2 +- scripts/ore_veins/indicators.1.zs | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/oreveins/ore_veins.json b/config/oreveins/ore_veins.json index b09b871..360679e 100644 --- a/config/oreveins/ore_veins.json +++ b/config/oreveins/ore_veins.json @@ -434,7 +434,7 @@ "horizontal_size": 4 }, - "blackquartz_ore": { + "black_quartz_ore": { "type": "cluster", "ore": { "block": "actuallyadditions:block_misc", @@ -442,7 +442,7 @@ }, "stone": "minecraft:stone", "indicator": { - "blocks": "contenttweaker:juice/internal/indicator/blackquartz", + "blocks": "contenttweaker:juice/internal/indicator/black_quartz", "ignore_vegatation": false, "ignore_liquids": false, "rarity": 24 diff --git a/index.toml b/index.toml index 353a6cd..093bcae 100644 --- a/index.toml +++ b/index.toml @@ -1150,7 +1150,7 @@ hash = "5046cde3673ccd62ba2209aaab9a917b3e1b0da7f521477e89f68bdba1648187" [[files]] file = "config/oreveins/ore_veins.json" -hash = "e1b2b9e15458917be388f68454e78dec70d299e82525f35233d817ea9e2b03cf" +hash = "1863ec33cc86c4c6d8adde5500a5fc6c959948177d9b85c9153c95821f75b4e6" [[files]] file = "config/sereneseasons/biome_info.json" @@ -2405,7 +2405,7 @@ hash = "a07879875ad20ae8e285c3cb39beeee648bd080ec12985b76583ad707a3de3ee" [[files]] file = "scripts/ore_veins/indicators.1.zs" -hash = "e1c7d1f08c0c54de9b6f9be8c29b3fe4c6f35bc3c8e917d06aaf7bf4fd182a2a" +hash = "5ddde773d2f8fe5bac324bb03497776b694eadbef6626f23cf7a9e755f4009ee" [[files]] file = "scripts/ore_veins/indicators.2.zs" diff --git a/pack.toml b/pack.toml index b5e4e9c..192cb79 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 = "8a795bf3e23ba6d38c80d575d0b7e9d724d0372854f5a6836fecfa3cd2865adf" +hash = "504d3886965baa0eab50adab674ea9afbcc3ec12472a90c8c91ce91958499dcf" [versions] forge = "14.23.5.2860" diff --git a/scripts/ore_veins/indicators.1.zs b/scripts/ore_veins/indicators.1.zs index 5a2b4d8..2733429 100644 --- a/scripts/ore_veins/indicators.1.zs +++ b/scripts/ore_veins/indicators.1.zs @@ -13,7 +13,7 @@ var nugget_table as string[][] = [ ["silver", "thermalfoundation:ore", "2"], ["platinium", "thermalfoundation:ore", "6"], ["tin", "mekanism:oreblock", "2"], - ["aliminium", "thermalfoundation:ore", "4"], + ["aluminium", "thermalfoundation:ore", "4"], ["nickel", "thermalfoundation:ore", "5"], ["redstone", "minecraft:redstone_ore", "0"], ["osmium", "mekanism:oreblock", "0"], @@ -21,21 +21,21 @@ var nugget_table as string[][] = [ ["boron", "nuclearcraft:ore", "5"], ["lithium", "nuclearcraft:ore", "6"], ["uranium", "nuclearcraft:ore", "4"], - ["coal", "minecarft:coal_ore", "0"], + ["coal", "minecraft:coal_ore", "0"], ["iron", "minecraft:iron_ore", "0"], ["diamond", "minecraft:diamond_ore", "0"], ["lapis", "minecraft:lapis_ore", "0"], ["silicon", "galacticraftcore:basic_block_core", "8"], ["lead", "thermalfoundation:ore", "3"], ["iridium", "thermalfoundation:ore", "7"], - ["blackquartz", "actuallyadditions:block_misc", "3"], - ["ruby", "biomesofplenty:gem_ore", "1"], - ["amber", "biomesofplenty:gem_ore", "7"], - ["sapphire", "biomesofplenty:gem_ore", "6"], - ["peridot", "biomesofplenty:gem_ore", "2"], - ["malachite", "biomesofplenty:gem_ore", "5"], - ["tanzite", "biomesofplenty:gem_ore", "4"], - ["certus_quartz", "appliedenegistics2:material", "0"] + ["black_quartz", "actuallyadditions:block_misc", "3"], + ["ruby", "biomesoplenty:gem_ore", "1"], + ["amber", "biomesoplenty:gem_ore", "7"], + ["sapphire", "biomesoplenty:gem_ore", "6"], + ["peridot", "biomesoplenty:gem_ore", "2"], + ["malachite", "biomesoplenty:gem_ore", "5"], + ["tanzite", "biomesoplenty:gem_ore", "4"], + ["certus_quartz", "appliedenergistics2:material", "0"] ]; function replaceCommand(blockName as string, item as string, meta as string, blockPos as mods.contenttweaker.BlockPos) as string { From 3f08eebabecd944a5cdf61e08ac8d1884a24d52b Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sat, 19 Nov 2022 21:55:52 +0100 Subject: [PATCH 5/7] oreveins indicators: use api to replace block instead of chat command. --- index.toml | 2 +- pack.toml | 2 +- scripts/ore_veins/indicators.1.zs | 58 ++++++++++++++++++------------- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/index.toml b/index.toml index 093bcae..f8320fa 100644 --- a/index.toml +++ b/index.toml @@ -2405,7 +2405,7 @@ hash = "a07879875ad20ae8e285c3cb39beeee648bd080ec12985b76583ad707a3de3ee" [[files]] file = "scripts/ore_veins/indicators.1.zs" -hash = "5ddde773d2f8fe5bac324bb03497776b694eadbef6626f23cf7a9e755f4009ee" +hash = "36e4b9ee448ad7503f5df16b788e95a0f69bb24a55041c33a87b45c347e57d7f" [[files]] file = "scripts/ore_veins/indicators.2.zs" diff --git a/pack.toml b/pack.toml index 192cb79..a242d70 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 = "504d3886965baa0eab50adab674ea9afbcc3ec12472a90c8c91ce91958499dcf" +hash = "42ca8e723c1e0761d17e371bcd988f0fe299aa09f3c914f0c1183e7c85099d96" [versions] forge = "14.23.5.2860" diff --git a/scripts/ore_veins/indicators.1.zs b/scripts/ore_veins/indicators.1.zs index 2733429..0985180 100644 --- a/scripts/ore_veins/indicators.1.zs +++ b/scripts/ore_veins/indicators.1.zs @@ -1,9 +1,16 @@ #loader contenttweaker +import crafttweaker.block.IBlock; +import crafttweaker.block.IBlockState; +import crafttweaker.data.IData; +import crafttweaker.world.IBlockPos; +import crafttweaker.world.IWorld; import mods.contenttweaker.Block; +import mods.contenttweaker.BlockPos; import mods.contenttweaker.DropHandler; import mods.contenttweaker.ResourceLocation; import mods.contenttweaker.VanillaFactory; +import mods.contenttweaker.World; var nugget_table as string[][] = [ # [name, id, meta] @@ -38,24 +45,29 @@ var nugget_table as string[][] = [ ["certus_quartz", "appliedenergistics2:material", "0"] ]; -function replaceCommand(blockName as string, item as string, meta as string, blockPos as mods.contenttweaker.BlockPos) as string { - return "execute @a " + - blockPos.getX() as string + " " + - blockPos.getY() as string + " " + - blockPos.getZ() as string + " " + - "detect " + - blockPos.getX() as string + " " + - blockPos.getY() as string + " " + - blockPos.getZ() as string + " " + - "contenttweaker:" + blockName + " * " + - "setblock " + - blockPos.getX() as string + " " + - blockPos.getY() as string + " " + - blockPos.getZ() as string + " " + - "draconicevolution:placed_item " + - "0 " + - "replace " + - "{InventoryStacks: [{ id: \"" + item + "\", Count: 1, Damage: " + meta as string + " }]}"; +function replace( + item as string, + meta as string, + blockPos as mods.contenttweaker.BlockPos, + world as World +) +{ + if (world.isRemote()) { return null; } + + # janky hack, mate + var trueWorld as IWorld = IWorld.getFromID(world.getDimension()); + + var nbt as IData = { + Facing: 0 as byte, + InventoryStacks: [{ + id: item as string, + Count: 1 as byte, + Damage: meta as short + }] + }; + + var position as IBlockPos = crafttweaker.util.Position3f.create(blockPos.getX(), blockPos.getY(), blockPos.getZ()).asBlockPos(); + trueWorld.setBlockState(, nbt, position); } for i in nugget_table { @@ -77,20 +89,16 @@ for i in nugget_table { block.setPassable(true); block.setReplaceable(true); - # janky hack, mate block.setOnBlockPlace(function(world, blockPos, blockState) { - var command as string = replaceCommand(blockName, item, meta, blockPos); - server.commandManager.executeCommand(server, command); + replace(item, meta, blockPos, world); }); block.setOnRandomTick(function(world, blockPos, blockState) { - var command as string = replaceCommand(blockName, item, meta, blockPos); - server.commandManager.executeCommand(server, command); + replace(item, meta, blockPos, world); }); block.setOnUpdateTick(function(world, blockPos, blockState) { - var command as string = replaceCommand(blockName, item, meta, blockPos); - server.commandManager.executeCommand(server, command); + replace(item, meta, blockPos, world); }); block.register(); From ef173fbabfae16fc4a22b89fe261e4326ad3d2f0 Mon Sep 17 00:00:00 2001 From: SwitchyJuice Date: Sun, 22 Jan 2023 19:12:34 +0100 Subject: [PATCH 6/7] Added/Updated/Deleted Mods, Changed recipes, Small Config fixes Updated: - Applied Energistics 2 - CraftTweaker - CraftPresence - Cylic - Galacticraft - IC2 Tweaker - JAOPCA - CensoredASM - More Planets - PackagedAuto - Mixin - Render Lib Added: -Ambient Sounds 5 Removed: - Mo'Bends New recipes for Immersive Engineering, Forestry and Gears --- config/GalaxySpace/core.conf | 2 +- config/sereneseasons/biome_info.json | 2 +- index.toml | 48 ++++++----- mods/ae2-extended-life.pw.toml | 6 +- mods/ambientsounds.pw.toml | 13 +++ mods/craftpresence.pw.toml | 6 +- mods/crafttweaker.pw.toml | 6 +- mods/cyclic.pw.toml | 6 +- mods/galacticraft-legacy.pw.toml | 6 +- mods/had-enough-items.pw.toml | 6 +- mods/ic2-tweaker.pw.toml | 6 +- mods/jaopca.pw.toml | 6 +- mods/lolasm.pw.toml | 6 +- mods/mixin-booter.pw.toml | 6 +- mods/mo-bends.pw.toml | 13 --- mods/more-planets-gc-addon.pw.toml | 6 +- mods/packagedauto.pw.toml | 6 +- mods/renderlib.pw.toml | 6 +- pack.toml | 2 +- scripts/Forestry.zs | 28 +++++++ scripts/Immersive_Engineering.zs | 115 +++++++++++++++++++++++++++ scripts/gear.zs | 6 +- 22 files changed, 227 insertions(+), 80 deletions(-) create mode 100644 mods/ambientsounds.pw.toml delete mode 100644 mods/mo-bends.pw.toml create mode 100644 scripts/Forestry.zs diff --git a/config/GalaxySpace/core.conf b/config/GalaxySpace/core.conf index fe2daab..1a8c427 100644 --- a/config/GalaxySpace/core.conf +++ b/config/GalaxySpace/core.conf @@ -109,7 +109,7 @@ hardmode { B:enableSolarRadiationOnMoon=true # Enable/Disable zero gravity (like Kuiper Belt) on Astreroids. - B:enableZeroGravityOnAsteroids=false + B:enableZeroGravityOnAsteroids=true } diff --git a/config/sereneseasons/biome_info.json b/config/sereneseasons/biome_info.json index d86af0e..84bccbe 100644 --- a/config/sereneseasons/biome_info.json +++ b/config/sereneseasons/biome_info.json @@ -400,7 +400,7 @@ "disable_crops": false }, "minecraft:ice_flats": { - "enable_seasonal_effects": true, + "enable_seasonal_effects": false, "use_tropical_seasons": false, "disable_crops": false }, diff --git a/index.toml b/index.toml index 17af29d..f938454 100644 --- a/index.toml +++ b/index.toml @@ -50,7 +50,7 @@ hash = "317bb2e868cc433a89a0b2cf9a952e71116ee22d30f3f6c5789a2ae7b295582d" [[files]] file = "config/GalaxySpace/core.conf" -hash = "a3822250e11521d098711c0b71d954f0f35086c6833016230e09846ee9e03237" +hash = "149a94e0459c6c6f55a96700c11a8ba82079fe2eb7477c5d53d5c9b2c6bfcf30" [[files]] file = "config/GalaxySpace/dimensions.conf" @@ -1150,7 +1150,7 @@ hash = "a8c9789bff4ded56851059a429814250a48b7636e74fe740365e61f57a710590" [[files]] file = "config/sereneseasons/biome_info.json" -hash = "c912c5b6a604cbc399e894fb1ee502e668f1e542deb15067bccb524cdeb7b44a" +hash = "7f73f55864d166864f53dc8f46513fbc169cd91dad4c3a704f043a8d2ca79039" [[files]] file = "config/sereneseasons/cropfertility.cfg" @@ -1195,7 +1195,7 @@ metafile = true [[files]] file = "mods/ae2-extended-life.pw.toml" -hash = "9c3dcc4ca0d6585544f0fe0a0193a3f452565ff3ece6fdc1f426a7b1281fb228" +hash = "d2d808fc2d15c453930b0bc3875eef162fac79613fa8a4685f95e8ba4a3bd2c3" metafile = true [[files]] @@ -1218,6 +1218,11 @@ file = "mods/alcatrazcore.pw.toml" hash = "0dcea6e8171157d25594d8cae90d785ebf40cb538aa652e58e42516812adc8c4" metafile = true +[[files]] +file = "mods/ambientsounds.pw.toml" +hash = "fcb4a5a64f66ff529907e6e3ef3834154971d8921379e21c910738650a07af44" +metafile = true + [[files]] file = "mods/animania-extra.pw.toml" hash = "1ef50d884cdf717aeec398beacfe5f32acef367d8acf3eff5e82c06aa0db43d5" @@ -1415,7 +1420,7 @@ metafile = true [[files]] file = "mods/craftpresence.pw.toml" -hash = "4521305e2e6eb604234077a62ebaa1bc1894be5084294b5c89cf1c2ca58673eb" +hash = "c87d9aa8609abbe11494d1a33ac690616dfbc13129675e3e8348fe5d5e5d647d" metafile = true [[files]] @@ -1425,7 +1430,7 @@ metafile = true [[files]] file = "mods/crafttweaker.pw.toml" -hash = "f375c9acc7559bc0ccaac38a65470c40c4120211c2e53415b74c2cf4950c43e6" +hash = "dca3e8d28b9b3732dcc14e4fec7aeae77d47cded5853229b1f6780c3ec654c82" metafile = true [[files]] @@ -1445,7 +1450,7 @@ metafile = true [[files]] file = "mods/cyclic.pw.toml" -hash = "9fb9dcff98c8cb4326c223f7f16aa29e2856c2e40babf487617a392852886043" +hash = "a1026af48a53ef8abe2446a994d6f13db4e8cc73097dd508781ac2d99771ed19" metafile = true [[files]] @@ -1580,7 +1585,7 @@ metafile = true [[files]] file = "mods/galacticraft-legacy.pw.toml" -hash = "7691411b84a496f1c848d38148a058297aec5d84ed8d888b8197a8597e58884b" +hash = "40bf93dce8d6d4769c2743a4768bb296902cdaa2a7bf8836402715a31269f06b" metafile = true [[files]] @@ -1610,7 +1615,7 @@ metafile = true [[files]] file = "mods/had-enough-items.pw.toml" -hash = "4d3e784d5cb1cc34faaebc39f6fa70d5028f5f1f0eb23a2bb491f433fecec640" +hash = "7616c53901196cf27261e127db97510e3d1afee30cc884e3297da44ee4671b4f" metafile = true [[files]] @@ -1620,7 +1625,7 @@ metafile = true [[files]] file = "mods/ic2-tweaker.pw.toml" -hash = "b8c4b22815d21e7a601cb27cc8499cd7301ce23e8d5eb3624cc2caafbe2812ac" +hash = "d5f239575d292bd3f36e44a3eb352ee949d0c54525612a1a21aa1b9cadcf31df" metafile = true [[files]] @@ -1695,7 +1700,7 @@ metafile = true [[files]] file = "mods/jaopca.pw.toml" -hash = "0f1ad5bde651bcf644cf004156f510d6f194ac8486a912b7739612a389e0aa3b" +hash = "0f985dadcd3c8afa91393c18060ac2c73bda46e214f7e027cad805138ded38f5" metafile = true [[files]] @@ -1760,7 +1765,7 @@ metafile = true [[files]] file = "mods/lolasm.pw.toml" -hash = "9506b5697596b313ef03a72fc044b318bae2d76a2b772ad374721bf89a63e1fd" +hash = "85dd47f10080ff28b61d0413635389cde99e077716d5c2fba07717e7f5613990" metafile = true [[files]] @@ -1810,7 +1815,7 @@ metafile = true [[files]] file = "mods/mixin-booter.pw.toml" -hash = "3be6b5e358209824169142396908a1ecc579a1761a9ad280a9560aa2819bf90f" +hash = "ba303144d3dd5d0bb6c44c7241b5e116d7e695bc04921914e546a5d08353e5db" metafile = true [[files]] @@ -1823,11 +1828,6 @@ file = "mods/mjrlegendslib.pw.toml" hash = "f0254cdd6d5f1c170dfdd1fb91c92f38962f3a5b37c241aea562e57645c8677b" metafile = true -[[files]] -file = "mods/mo-bends.pw.toml" -hash = "e00dd7c2a596dbde20345e7dd1a4184249e98178bbf74c1ae0b3ca6d1f108d74" -metafile = true - [[files]] file = "mods/mob-grinding-utils.pw.toml" hash = "60d45619268b6dbe13ede0e9475442f0e42753dcc00f1c5d2cfa45140c4ad60f" @@ -1845,7 +1845,7 @@ metafile = true [[files]] file = "mods/more-planets-gc-addon.pw.toml" -hash = "0a41eed84f3ec36cf5f3ab85878c40bbf6ecc425f0ec2d2e860fff9ed45ce856" +hash = "5e83c26fc395c2423a8c1e47ef13f009acdd8045777b598fdd7f7e480559ecb4" metafile = true [[files]] @@ -1945,7 +1945,7 @@ metafile = true [[files]] file = "mods/packagedauto.pw.toml" -hash = "1e792b7162a9fab1ef9b93ef85ba800a09a3c1fc91f53b00ae1fabb8f1b8b17c" +hash = "e7c9f1b5f99ab6da718a0f07bda9a1389b722b0c597051e8fd994d7a7c583263" metafile = true [[files]] @@ -2045,7 +2045,7 @@ metafile = true [[files]] file = "mods/renderlib.pw.toml" -hash = "242833298e82c7345d7feca8a15f7fcf2881490717ae47574f6b08fb5c092431" +hash = "ced540e808f9863c64c1c80a9905db5f892859516359ba9aa3051fd26bed3c14" metafile = true [[files]] @@ -2302,13 +2302,17 @@ hash = "c867e13ed9df375c26a21a4667757f7dfd6533df2a4edeb88d531438ecefba20" file = "scripts/ExNihilo&Compressum.zs" hash = "3c1740c575a6fc042e23a59f171649d99d4b5214e5206cfb200f46469ec06076" +[[files]] +file = "scripts/Forestry.zs" +hash = "5fba72cbd72692dde4f7e4eec96e13096d5653e82067e541647e0135b5c34c97" + [[files]] file = "scripts/GalacticCraft.zs" hash = "a08cff47f6f957d735126e82bb575ef20fc6bf0ad7fefd6f2f957a8f60dd8f99" [[files]] file = "scripts/Immersive_Engineering.zs" -hash = "e85b723eae92dea704e0cdb54130a344af44d0a24f5eacad4de8725ad7a6a90f" +hash = "7f656881b2741545a1e2178d91b1cdad71f063364a53f8f4448b5d75afd5f36b" [[files]] file = "scripts/Industrial_Craft_2.zs" @@ -2332,7 +2336,7 @@ hash = "2e4fb5a9f7aa7c41442b781337747b40463457e5b0e7c5540d9a101a6e85e04f" [[files]] file = "scripts/gear.zs" -hash = "e7f3a5fcaf5a12711f7aedf65191fc9fde14dec782128eecb1832ee28ac03114" +hash = "b36ca88f41d9ea7b42dcc756042fcf7f0c7ef1c56ec37109fef7dca24acfb298" [[files]] file = "scripts/nc_script_addons/DONT_PUT_YOUR_SCRIPTS_IN_HERE" diff --git a/mods/ae2-extended-life.pw.toml b/mods/ae2-extended-life.pw.toml index a2ef127..263d65d 100644 --- a/mods/ae2-extended-life.pw.toml +++ b/mods/ae2-extended-life.pw.toml @@ -1,13 +1,13 @@ name = "AE2 Unofficial Extended Life" -filename = "appliedenergistics2-rv6-stable-7-extended_life-v0.54.9.jar" +filename = "appliedenergistics2-rv6-stable-7-extended_life-v0.54.19.jar" side = "both" [download] hash-format = "sha1" -hash = "acb4a0c83ca97fff018a0d881c66028f841d4981" +hash = "a8227b54a98b04e32ea9fa7a6b0e481d775703c0" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4056418 +file-id = 4328930 project-id = 570458 diff --git a/mods/ambientsounds.pw.toml b/mods/ambientsounds.pw.toml new file mode 100644 index 0000000..27387d3 --- /dev/null +++ b/mods/ambientsounds.pw.toml @@ -0,0 +1,13 @@ +name = "AmbientSounds 5" +filename = "AmbientSounds_v3.1.7_mc1.12.2.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "021bd97bcd91bd370e923c48046d6cbe1306ce87" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 3516274 +project-id = 254284 diff --git a/mods/craftpresence.pw.toml b/mods/craftpresence.pw.toml index 069e02e..bf08e6d 100644 --- a/mods/craftpresence.pw.toml +++ b/mods/craftpresence.pw.toml @@ -1,13 +1,13 @@ name = "CraftPresence" -filename = "CraftPresence-Forge-1.12.2-Release-1.9.3.jar" +filename = "CraftPresence-2.0.0-alpha.3+1.12.2.jar" side = "both" [download] hash-format = "sha1" -hash = "cd601f093bc0240e962d5d90bd8c5b8dec1b18f8" +hash = "b16a875edadf1c46f9109b08007c3c60f9d6e347" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4025109 +file-id = 4326527 project-id = 297038 diff --git a/mods/crafttweaker.pw.toml b/mods/crafttweaker.pw.toml index bd25338..1a5026d 100644 --- a/mods/crafttweaker.pw.toml +++ b/mods/crafttweaker.pw.toml @@ -1,13 +1,13 @@ name = "CraftTweaker" -filename = "CraftTweaker2-1.12-4.1.20.680.jar" +filename = "CraftTweaker2-1.12-4.1.20.683.jar" side = "both" [download] hash-format = "sha1" -hash = "7a9c38561f7a7597b95d853f1a3895b75f82f9c6" +hash = "278224964bfb0c4c8b30f6bebdd2db02809b389b" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3965470 +file-id = 4353149 project-id = 239197 diff --git a/mods/cyclic.pw.toml b/mods/cyclic.pw.toml index a445170..3d7044f 100644 --- a/mods/cyclic.pw.toml +++ b/mods/cyclic.pw.toml @@ -1,13 +1,13 @@ name = "Cyclic" -filename = "Cyclic-1.12.2-1.20.12.jar" +filename = "Cyclic-1.12.2-1.20.14.jar" side = "both" [download] hash-format = "sha1" -hash = "2b6ed36e30be997c95d25d64c9c699500f166127" +hash = "48b5e54e91adc3505462cf40b49072eae2a7fdea" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3722420 +file-id = 4075832 project-id = 239286 diff --git a/mods/galacticraft-legacy.pw.toml b/mods/galacticraft-legacy.pw.toml index 9140667..d1d6af2 100644 --- a/mods/galacticraft-legacy.pw.toml +++ b/mods/galacticraft-legacy.pw.toml @@ -1,13 +1,13 @@ name = "Galacticraft Legacy" -filename = "Galacticraft-1.12.2-4.0.2.284.jar" +filename = "Galacticraft-1.12.2-4.0.4.jar" side = "both" [download] hash-format = "sha1" -hash = "0014c6abf900e54c0fa7e8d3b59d6b5087cbe379" +hash = "873aee087e74df592267a1ddd2b2173455193fb1" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3648807 +file-id = 4052975 project-id = 564236 diff --git a/mods/had-enough-items.pw.toml b/mods/had-enough-items.pw.toml index 723ef7d..96e4087 100644 --- a/mods/had-enough-items.pw.toml +++ b/mods/had-enough-items.pw.toml @@ -1,13 +1,13 @@ name = "Had Enough Items" -filename = "HadEnoughItems_1.12.2-4.24.0.jar" +filename = "HadEnoughItems_1.12.2-4.24.2.jar" side = "both" [download] hash-format = "sha1" -hash = "24bf7b901188c039ff7e46df41a6e4104ca9b226" +hash = "42a12cf60ee0705634eb8758aebe27e3b59a87a1" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3957880 +file-id = 4109510 project-id = 557549 diff --git a/mods/ic2-tweaker.pw.toml b/mods/ic2-tweaker.pw.toml index 89b1295..14c4fb1 100644 --- a/mods/ic2-tweaker.pw.toml +++ b/mods/ic2-tweaker.pw.toml @@ -1,13 +1,13 @@ name = "IC2 Tweaker" -filename = "ic2-tweaker-0.2.0.jar" +filename = "ic2-tweaker-0.2.1+build.4.jar" side = "both" [download] hash-format = "sha1" -hash = "e04ec149b385ef3c03e9bcb9a43eb77f317900bd" +hash = "e3d089f7a8cd2a3c1cbb7368831d573208a0b438" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 2666979 +file-id = 4136686 project-id = 311846 diff --git a/mods/jaopca.pw.toml b/mods/jaopca.pw.toml index 6fd0c0d..898d590 100644 --- a/mods/jaopca.pw.toml +++ b/mods/jaopca.pw.toml @@ -1,13 +1,13 @@ name = "JAOPCA" -filename = "JAOPCA-1.12.2-2.3.0.0.jar" +filename = "JAOPCA-1.12.2-2.3.2.3.jar" side = "both" [download] hash-format = "sha1" -hash = "65ce3d3a3085b5624e9d636732bf8c11aee123d0" +hash = "3fead31cced56c0300e436b9c3c6790c48c02c50" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3860513 +file-id = 4292025 project-id = 266936 diff --git a/mods/lolasm.pw.toml b/mods/lolasm.pw.toml index b472e19..ccea284 100644 --- a/mods/lolasm.pw.toml +++ b/mods/lolasm.pw.toml @@ -1,13 +1,13 @@ name = "CensoredASM" -filename = "loliasm-5.6.jar" +filename = "censoredasm5.6.jar" side = "both" [download] hash-format = "sha1" -hash = "47811ff3df2a56435e9518bd62a0eb5d92ea4f40" +hash = "c6d1c7cd8f7c6eaeb9a1b7f42eaa9c72c4daf2d0" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3898244 +file-id = 4140230 project-id = 460609 diff --git a/mods/mixin-booter.pw.toml b/mods/mixin-booter.pw.toml index c174c2c..086dbc2 100644 --- a/mods/mixin-booter.pw.toml +++ b/mods/mixin-booter.pw.toml @@ -1,13 +1,13 @@ name = "MixinBooter" -filename = "!mixinbooter-5.0.jar" +filename = "!mixinbooter-7.0.jar" side = "both" [download] hash-format = "sha1" -hash = "cacbf51a371348f8b9f834c27e15edab06b28c72" +hash = "3e9b7e2cfae2532de3d823c9e5368176334f8726" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3886235 +file-id = 4090558 project-id = 419286 diff --git a/mods/mo-bends.pw.toml b/mods/mo-bends.pw.toml deleted file mode 100644 index 9733c56..0000000 --- a/mods/mo-bends.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Mo' Bends" -filename = "MoBends_1.12.2-1.2.1-19.12.21.jar" -side = "client" - -[download] -hash-format = "sha1" -hash = "79b40921c29312c4acec13db282c2abe3274af3b" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 3573346 -project-id = 231347 diff --git a/mods/more-planets-gc-addon.pw.toml b/mods/more-planets-gc-addon.pw.toml index 8dd270c..ebb9396 100644 --- a/mods/more-planets-gc-addon.pw.toml +++ b/mods/more-planets-gc-addon.pw.toml @@ -1,13 +1,13 @@ name = "More Planets - Galacticraft Add-on" -filename = "More-Planets-1.12.2-2.2.4-GC284.jar" +filename = "More-Planets-1.12.2-2.3.0-GC4.0.4.jar" side = "both" [download] hash-format = "sha1" -hash = "4adeb26228d10e90546409b829ea28f5db91ef5a" +hash = "f3898d1f5a14e7fc57b783d064734ac191c6e668" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3873018 +file-id = 4219738 project-id = 261990 diff --git a/mods/packagedauto.pw.toml b/mods/packagedauto.pw.toml index d462635..70709ac 100644 --- a/mods/packagedauto.pw.toml +++ b/mods/packagedauto.pw.toml @@ -1,13 +1,13 @@ name = "PackagedAuto" -filename = "PackagedAuto-1.12.2-1.0.5.19.jar" +filename = "PackagedAuto-1.12.2-1.0.6.22.jar" side = "both" [download] hash-format = "sha1" -hash = "2802267a48df3077f2ade07f7aef14e1fca2a0fe" +hash = "9da0188f613c95ce5ec2da16ddedcbdf5b1be87a" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3614585 +file-id = 4357977 project-id = 308380 diff --git a/mods/renderlib.pw.toml b/mods/renderlib.pw.toml index 7dd1475..1088144 100644 --- a/mods/renderlib.pw.toml +++ b/mods/renderlib.pw.toml @@ -1,13 +1,13 @@ name = "RenderLib" -filename = "RenderLib-1.12.2-1.1.9.jar" +filename = "RenderLib-1.12.2-1.1.10.jar" side = "both" [download] hash-format = "sha1" -hash = "cf3871ae1821b369e68650e05c92d3ff62bd05a2" +hash = "92fa9254669afe649894d313a2207dea817b8069" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 3994517 +file-id = 4168831 project-id = 624967 diff --git a/pack.toml b/pack.toml index 3d2608b..7c441b0 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 = "b5060bd22fa052dba2eb881c4b2208fe5b2e671841901887f489a672a69ad743" +hash = "645e8b1203f9da3efb37bff6dccbae1a69766538dedd6f4272dd8d217b5cd77d" [versions] forge = "14.23.5.2860" diff --git a/scripts/Forestry.zs b/scripts/Forestry.zs new file mode 100644 index 0000000..a485281 --- /dev/null +++ b/scripts/Forestry.zs @@ -0,0 +1,28 @@ +#Sturdy Casing +recipes.remove(); +recipes.addShaped("Sturdy_Casing", , [ + [,, ], + [, null, ], + [, , ] +]); +#Thermionic Fabricator +recipes.remove(); +recipes.addShaped("Thermionic_Fabricator", , [ + [,, ], + [, , ], + [, , ] +]); +#Squeezer +recipes.remove(); +recipes.addShaped("Squeezerse", , [ + [,, ], + [, null, ], + [, , ] +]); +#Carpenter +recipes.remove(); +recipes.addShaped("Carpenter", , [ + [,, ], + [, null, ], + [, , ] +]); \ No newline at end of file diff --git a/scripts/Immersive_Engineering.zs b/scripts/Immersive_Engineering.zs index c38a209..4328fff 100644 --- a/scripts/Immersive_Engineering.zs +++ b/scripts/Immersive_Engineering.zs @@ -1,3 +1,6 @@ +import crafttweaker.item.IItemStack; + + #Heavy Engineering Block recipes.remove(); recipes.addShaped("Heavy Engineering Block", *2, [ @@ -11,4 +14,116 @@ recipes.addShaped("Iron Mechanical Component", [, , ], [, , ], [, , ] +]); +#Coke Brick +recipes.remove(); +recipes.addShaped("Coke Brick", *2, [ + [, , ], + [, , ], + [, , ] +]); +#Steel Rod +recipes.remove(); +recipes.addShapedMirrored("Steel Rod", , [ + [null, , .anyDamage().transformDamage(1)], + [null, , null], + [null, , null] +]); +#Iron Rod +recipes.remove(); +recipes.addShapedMirrored("Iron Rod", , [ + [null, , .withDamage(0).transformDamage(1)], + [null, , null], + [null, , null] +]); +#Aluminium Rod +recipes.remove(); +recipes.addShapedMirrored("Aluminium Rod", , [ + [null, , .withDamage(0).transformDamage(1)], + [null, , null], + [null, , null] +]); +#Light Engineering Block +recipes.remove(); +recipes.addShaped("Light Engineering Block", *2, [ + [, , ], + [, , ], + [, , ] +]); +#Redstone Engineering Block +recipes.remove(); +recipes.addShaped("Redstone Engineering Block", *2, [ + [, , ], + [, , ], + [, , ] +]); +#Lv Wire Connector +recipes.remove(); +recipes.addShaped("Lv Wire Connector", *4, [ + [null, , null], + [, , ], + [, , ] +]); +#Lv Wire Relay +recipes.remove(); +recipes.addShaped("Lv Wire Relay", *6, [ + [null, null, null], + [, , ], + [, , ] +]); +#Mv Wire Connector +recipes.remove(); +recipes.addShaped("Mv Wire Connector", *4, [ + [null, , null], + [, , ], + [, , ] +]); +#Mv Wire Relay +recipes.remove(); +recipes.addShaped("Mv Wire Relay", *6, [ + [null, null, null], + [, , ], + [, , ] +]); +#Hv Wire Connector +recipes.remove(); +recipes.addShaped("Hv Wire Connector", *4, [ + [null, , null], + [, , ], + [, , ] +]); +#Hv Wire Relay +recipes.remove(); +recipes.addShaped("Hv Wire Relay", *6, [ + [null, , null], + [, , ], + [, , ] +]); +#LV Capacitor +recipes.remove(); +recipes.addShaped("LV Capacitor", , [ + [, , ], + [, , ], + [, , ] +]); +#MV Capacitor +recipes.remove(); +recipes.addShaped("MV Capacitor", , [ + [, , ], + [, , ], + [, , ] +]); +#HV Capacitor +recipes.remove(); +recipes.addShaped("HV Capacitor", , [ + [, , ], + [, , ], + [, , ] +]); +#Transformer +recipes.remove(); +recipes.addShaped("Transformer", , [ + [, null, ], + [, , ], + [, , ] ]); \ No newline at end of file diff --git a/scripts/gear.zs b/scripts/gear.zs index 8936621..19f0e28 100644 --- a/scripts/gear.zs +++ b/scripts/gear.zs @@ -39,19 +39,19 @@ val gearsToRemove = [ recipes.remove(items); } - recipes.addShaped("TE Wooden Gear", + recipes.addShaped("Wooden Gear", , [[null, , null], [, null, ], [null, , null]]); - recipes.addShaped("TE Stone Gear Direct", + recipes.addShaped("Stone Gear Direct", , [[, , ], [, null, ], [, , ]]); - recipes.addShaped("TE Stone Gear Wood", + recipes.addShaped("Stone Gear Wood", , [[null, , null], [, , ], From 17b1738e6bdd4f38f3824c33f9c6bd1723e37e66 Mon Sep 17 00:00:00 2001 From: SwitchyJuice Date: Thu, 11 May 2023 09:01:49 +0200 Subject: [PATCH 7/7] Added Mods: Additional Enchanted Miner, BetterNether --- index.toml | 129 +++++++++++++++++++----- mods/additional-enchanted-miner.pw.toml | 13 +++ mods/betternether.pw.toml | 13 +++ pack.toml | 2 +- 4 files changed, 133 insertions(+), 24 deletions(-) create mode 100644 mods/additional-enchanted-miner.pw.toml create mode 100644 mods/betternether.pw.toml diff --git a/index.toml b/index.toml index f938454..4ccaf44 100644 --- a/index.toml +++ b/index.toml @@ -10,7 +10,7 @@ hash = "c01c2587ea013f8aac6d534041d631d99ad7d05ae1583fbd139be4ff57bfea56" [[files]] file = "config/ExtraPlanets.cfg" -hash = "3ab88bac6026c888eed64172d6d964dd6adff421fab8e55b40b2e75aefc39bcf" +hash = "ebeb4843b2a666b49ffc4330771bab0d40160069f78f8644fc0d3b87a2c33d1e" [[files]] file = "config/Galacticraft/chunkloading.conf" @@ -70,7 +70,7 @@ hash = "2388f6e930e2fc03a46ba645eacb69f8ec7d8df219e7eceb2b1c91e9b36c0f97" [[files]] file = "config/IC2.ini" -hash = "f335c940f5a6679b7209aa1c4b5e41aeb088c00a5857104424f85a62bd2a5595" +hash = "bf2a3e3accb0b0770e2c76edbf982d10af88c97ad7fac3103fc265909f4a60d0" [[files]] file = "config/actuallyadditions.cfg" @@ -1145,8 +1145,96 @@ file = "config/openblocks.cfg" hash = "5046cde3673ccd62ba2209aaab9a917b3e1b0da7f521477e89f68bdba1648187" [[files]] -file = "config/oreveins/ore_veins.json" -hash = "a8c9789bff4ded56851059a429814250a48b7636e74fe740365e61f57a710590" +file = "config/quarryplus/blacklist.json" +hash = "73bf559554055898f1b22bb1c0c42d46289052efd776e9aa426966927eccfad9" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.fuel_module_normal@0.json" +hash = "a2858170c7613eb176d7ccf4b806379c3723d2b9d34d8990a7d1209c7b8fe483" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.magicmirror@1.json" +hash = "a87ea3564e4575309862457c352054919be7a2dd998a4719bc0793ebae23a168" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.magicmirror@2.json" +hash = "bb312f50ee2d3ab6f1c57ac8b7f867f7650cf606333a802b89fa28bc2ad84a44" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.template@0.json" +hash = "3d99dcbb8cc741c291175b674fb736034d10211eaa36f3cf420562ec5b4cc30a" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.tool@0.json" +hash = "2c47545189f6739dde9a2c0b79e6d41a36490f9371258d228b3908dbbe42bb57" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.tool@1.json" +hash = "9927acd0165b8eef2bdd2cdf0577873afd4a0cb24444f27f35bb9d5f108c9940" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.tool@2.json" +hash = "08fd289cfa1e9d0f0b808284bed66834c1bb50fde044c5f7ddaccb0ad36f7c8d" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.tool@3.json" +hash = "7bde70a4851757c7b8bc145ffd33edd38407bae771aeb678a1b9ac9d0e99bcb3" + +[[files]] +file = "config/quarryplus/defaultrecipes/item.torch_module@0.json" +hash = "71743ca3e1faf06f3db411335733a22493a8032889bb2096bbd65fbefc3bb694" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.breakerplus@0.json" +hash = "d61c609fb8fa262fc7c6483a8da563abf85adb805da3bbcc56ebef4164ac8d78" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.chunkdestroyer@0.json" +hash = "122c3173351d9d67463cce8bbbe725e364def38ee09a354e5b9c8fc1e0857f7b" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.enchantmover@0.json" +hash = "9402639ea04c61568681401f8828f74bd6a06480a164aa1241e1a9f438c8ef3b" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.exppump@0.json" +hash = "b690ccd413173ef422075f8f0be77686c240005a04ac5804fa35b8dddbc6dcf6" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.markerplus@0.json" +hash = "1f4084cf37477e98b655c0dc9ffb332475e1c39865c60daa847b0d14c0ab8064" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.miningwellplus@0.json" +hash = "85036dc2034502df55a0c14013f0b3d0c0ce3043af0607866bc6b0c90af93085" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.placerplus@0.json" +hash = "0dfb6f83de361a254697adb39fe2ef863d1739c0441123535aa5434f1c51904a" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.pumpplus@0.json" +hash = "78ff833f62ea04d270345edcf0557d0261496bd18a0d33bb658458259e4ad24b" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.quarry@0.json" +hash = "b195115b302bb30b228b8d41faa2b3436b529741c4d7adfb56eded519e0e0439" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.spawnercontroller@0.json" +hash = "d7a0c7b2fa662df4f6533cdaecb2d2ef90ec1159c31cee0d621e9c73447f51aa" + +[[files]] +file = "config/quarryplus/defaultrecipes/tile.standalonepump@0.json" +hash = "47593d41a3013ad85db5a67279940b7293a4d8828adc227792d9a9e75421d5ca" + +[[files]] +file = "config/quarryplus/quarryplus.cfg" +hash = "db65bacab1ba8f85f8bac27e822956318532445b20ef0bf643180d9b8808f07e" + +[[files]] +file = "config/quarryplus/quarryplus_noDigBlocks.json" +hash = "29e73ab9457a62251f22679c97e65b3a5a0bcb38732f5ff2be68452bd292baf6" [[files]] file = "config/sereneseasons/biome_info.json" @@ -1183,6 +1271,11 @@ file = "mods/actually-additions.pw.toml" hash = "047ea8e0c2ab84aab7e185357a6e5f2dbb75059ba7a0044cd4a22a98dbbcdb84" metafile = true +[[files]] +file = "mods/additional-enchanted-miner.pw.toml" +hash = "7fde842098d034a362b2979123d1476564660503b0af6f9d382d9c817decdf6f" +metafile = true + [[files]] file = "mods/advanced-chimneys.pw.toml" hash = "edf22648f6c289c748735ebbabe34c1c713cc65a055697e655b06f3ed1a73762" @@ -1248,11 +1341,6 @@ file = "mods/appleskin.pw.toml" hash = "ffbb4bb97f53e5d6f005887b6297acf4274bed2e8e88625fc2d1e61a416afb26" metafile = true -[[files]] -file = "mods/architecturecraft.pw.toml" -hash = "8664f4d857fa8b82acfe052a4d61cb4f60f31607481da447ffac51d920b8928d" -metafile = true - [[files]] file = "mods/asmodeuscore.pw.toml" hash = "2d42af07ea3232b9b8520b37dbd85c185dac62ec15c4f3392454d2334e091f6c" @@ -1303,6 +1391,11 @@ file = "mods/betterfps.pw.toml" hash = "3be157f6924a51edca3ade05d9a2c9e16e13e376c874fa6eecb11d0bf6c0a2db" metafile = true +[[files]] +file = "mods/betternether.pw.toml" +hash = "5b4f4320ab870550f1e2155f0e0eaf1f7cf64000881838bd0e34adda979ffd7b" +metafile = true + [[files]] file = "mods/biomes-o-plenty.pw.toml" hash = "a6f2a5c57e847e8a587ca95caf23fff6d91aff86828d764496143a35a30773ed" @@ -1898,11 +1991,6 @@ file = "mods/no-tree-punching.pw.toml" hash = "1c611284aae5119c9d52f35384cc6a3e6f90f9139ad3d4dd5ff411ef7d6063c0" metafile = true -[[files]] -file = "mods/nothirium.pw.toml" -hash = "bb471776e7ad711b4d627f635776dd5ab41ad99840e4af57a31a95a317bd3504" -metafile = true - [[files]] file = "mods/nuclearcraft-overhauled.pw.toml" hash = "f26ccfdf7d8799345b2d4cd447ddf17daefc3c5fecb40efc9817e3eeb559bee6" @@ -2028,11 +2116,6 @@ file = "mods/randompatches-forge.pw.toml" hash = "93d16979ce8714c02e8e13cfb36d7f604e75ca334ec3349bf6d4e8e42f1c5563" metafile = true -[[files]] -file = "mods/realistic-ore-veins.pw.toml" -hash = "d53270536dd7e4807d5626cd7964edbdb3f33c3998d119a32de408491745c9c6" -metafile = true - [[files]] file = "mods/realistic-terrain-generation.pw.toml" hash = "bb1375a2229aa13160cfd9792127cf361642beb434f28e3fb49a71b221adf098" @@ -2312,19 +2395,19 @@ hash = "a08cff47f6f957d735126e82bb575ef20fc6bf0ad7fefd6f2f957a8f60dd8f99" [[files]] file = "scripts/Immersive_Engineering.zs" -hash = "7f656881b2741545a1e2178d91b1cdad71f063364a53f8f4448b5d75afd5f36b" +hash = "30cde4533a0bcd1088d9bf31efb8b0c3d02cd702700925cd93e560ee45ac587d" [[files]] file = "scripts/Industrial_Craft_2.zs" -hash = "c5a4e8a5d66e76bbc4c49c7739a92efc0287c044ca761b0a659de1b7b830779c" +hash = "829daf4457659d44a2571d7180e55cd9b13b01d08725ea15473d9af3dba69b52" [[files]] file = "scripts/Mekanism.zs" -hash = "3c8fd01c466cdae40f0bbd4df87f33089598dde62a9fe3c067c13fefd1fd2b23" +hash = "6f1374c0a5812b8fa48e5535486b45ec55afd8f1101d54c8dbf03465ad7b3ddf" [[files]] file = "scripts/Misc.zs" -hash = "39bdbb3a5d5b83a8a441e8f307a3fef172cbc544c1b5d4ea5b046a0b95070028" +hash = "dafbb457b6a4809c52a5ee5c508b04bd03f6b995d5e05607e6937c8b7ac7f3db" [[files]] file = "scripts/RFTools.zs" diff --git a/mods/additional-enchanted-miner.pw.toml b/mods/additional-enchanted-miner.pw.toml new file mode 100644 index 0000000..c400d7c --- /dev/null +++ b/mods/additional-enchanted-miner.pw.toml @@ -0,0 +1,13 @@ +name = "Additional Enchanted Miner" +filename = "AdditionalEnchantedMiner-1.12.2-12.5.7.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "bfe474f9e836324fe965abac9eb80cb05269fc47" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 3851282 +project-id = 282837 diff --git a/mods/betternether.pw.toml b/mods/betternether.pw.toml new file mode 100644 index 0000000..a93a347 --- /dev/null +++ b/mods/betternether.pw.toml @@ -0,0 +1,13 @@ +name = "BetterNether" +filename = "betternether-0.1.8.6.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "f82a17a9a32bd65579f5414a5162fb8fedf4b73d" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 2859893 +project-id = 311377 diff --git a/pack.toml b/pack.toml index 7c441b0..4e0a26e 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 = "645e8b1203f9da3efb37bff6dccbae1a69766538dedd6f4272dd8d217b5cd77d" +hash = "14ef30daea3a41fa25c6da3f57f26a2c6cf18c3cc246d84b001c76782dc97750" [versions] forge = "14.23.5.2860"