diff --git a/CHANGELOG.md b/CHANGELOG.md index cc05f88..5e53343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ This will be the initial release for the production server. I will avoid adding - Create Crafts and Additions 1.19.2-20230411a -> 1.19.2-20230426a - Create Deco 1.3.1 -> 1.3.2 - Curios API 5.1.4.0 -> 5.1.4.1 +- Extreme Reactors 2.0.62 -> 2.0.63 - FastWorkbench 7.1.1 -> 7.1.2 - In Control! 7.1.3 -> 7.1.5 - JourneyMap 5.9.5 -> 5.9.6 @@ -75,8 +76,9 @@ This will be the initial release for the production server. I will avoid adding - RFTools Builder 5.2.6 -> 5.2.8 - Saturn 0.0.3 -> 0.0.4 - SeasonHUD 1.4.12 -> 1.4.14 -- Sophisticated Core 0.5.51.251 -> 0.5.53.257 +- Sophisticated Core 0.5.51.251 -> 0.5.54.261 - Tom's Trading Network 0.1.0 -> 0.2.0 +- ZeroCore 2 2.1.33 -> 2.1.34 # 1.0.19 diff --git a/config/quarryplus-common.toml b/config/quarryplus-common.toml new file mode 100644 index 0000000..58cdba1 --- /dev/null +++ b/config/quarryplus-common.toml @@ -0,0 +1,164 @@ + +#QuarryPlus Setting +[common] + #The top of Nether + #Range: -256 ~ 256 + netherTop = 127 + #debug mode + debug = false + #no energy + noEnergy = false + #Whether quarry converts deepslate ore to normal ore. + convertDeepslateOres = false + #Spawner Controller Blacklist + spawnerBlacklist = ["minecraft:ender_dragon", "minecraft:wither", "minecraft:area_effect_cloud", "minecraft:item", "minecraft:player"] + #The amount of energy[FE] that Solid Fuel Quarry generates in a tick. + #Range: 0.0 ~ 100.0 + sfqEnergy = 2.0 + #Remove common materials(Stone, Dirt, Grass, Sand, etc.) obtained by Chunk Destroyer + removeCommonMaterialsByCD = true + #Remove MarkerPlus guide line if player is too far from the marker. + reduceMarkerGuideLineIfPlayerIsFar = false + #Remove adjacent frames when quarry is removed. + removeFrameAfterQuarryIsRemoved = true + #Allow quarries to work in claimed chunk(FTB Chunks). + allowWorkInClaimedChunkByFBTChunks = true + #The range limit(unit: blocks) of ChunkDestroyer. Set -1 or 0 to remove limitation. + #Range: > -1 + chunkDestroyerLimit = -1 + #True to allow pipes to extract items in WorkbenchPlus + allowWorkbenchExtraction = false + #Use simple chunk load function. + #If you have other chunk load system, please disable this and use other mods. + enableChunkLoader = false + #Trace quarry work + logAllQuarryWork = false + +#QuarryPlus Machines. Set true to enable machine or item. +[machines] + adv_pump = true + adv_quarry = false + book_mover = true + exp_module = true + exp_pump = true + filler = true + filler_module = true + filter_module = true + fuel_module_normal = false + mini_quarry = false + mining_well = true + mover = true + placer_plus = true + pump_module = true + pump_plus = true + quarry = true + remote_placer = false + remove_bedrock_module = false + replacer = false + replacer_module = false + solid_fuel_quarry = false + spawner_controller = false + workbench = false + +#Power settings of each machines +[powers] + + [powers.mini_quarry] + #Range: 0.0 ~ 1.0E9 + maxEnergy = 1000.0 + #Range: 0.0 ~ 1.0E9 + breakBlockBase = 20.0 + + [powers.solid_fuel_quarry] + #Range: 0.0 ~ 1.0E9 + maxEnergy = 1000.0 + #Range: 0.0 ~ 1.0E9 + makeFrame = 15.0 + #Range: 0.0 ~ 1.0E9 + breakBlockBase = 25.0 + #Range: 0.0 ~ 1.0E9 + breakBlockFluid = 125.0 + #Range: 0.0 ~ 1.0E9 + moveHeadBase = 1.0 + #Range: 0.0 ~ 1.0E9 + expCollect = 2.5 + #Range: 0.0 ~ 1.0E9 + efficiencyCoefficient = 1.5848931924611136 + #Range: 0.0 ~ 1.0E9 + breakEfficiencyCoefficient = 1.379729661461215 + #Range: 0.0 ~ 1.0E9 + breakFortuneCoefficient = 1.5874010519681996 + #Range: 0.0 ~ 1.0E9 + breakSilktouchCoefficient = 4.0 + + [powers.adv_quarry] + #Range: 0.0 ~ 1.0E9 + maxEnergy = 50000.0 + #Range: 0.0 ~ 1.0E9 + makeFrame = 15.0 + #Range: 0.0 ~ 1.0E9 + breakBlockBase = 25.0 + #Range: 0.0 ~ 1.0E9 + breakBlockFluid = 125.0 + #Range: 0.0 ~ 1.0E9 + moveHeadBase = 1.0 + #Range: 0.0 ~ 1.0E9 + expCollect = 2.5 + #Range: 0.0 ~ 1.0E9 + efficiencyCoefficient = 1.5848931924611136 + #Range: 0.0 ~ 1.0E9 + breakEfficiencyCoefficient = 1.379729661461215 + #Range: 0.0 ~ 1.0E9 + breakFortuneCoefficient = 1.5874010519681996 + #Range: 0.0 ~ 1.0E9 + breakSilktouchCoefficient = 4.0 + + [powers.filler] + #Range: 0.0 ~ 1.0E9 + maxEnergy = 1000.0 + #Range: 0.0 ~ 1.0E9 + breakBlockBase = 15.0 + + [powers.book_mover] + #Range: 0.0 ~ 1.0E9 + maxEnergy = 50000.0 + + [powers.workbench] + #Range: 0.0 ~ 1.0E9 + maxEnergy = 5.0 + + [powers.quarry] + #Range: 0.0 ~ 1.0E9 + maxEnergy = 10000.0 + #Range: 0.0 ~ 1.0E9 + makeFrame = 15.0 + #Range: 0.0 ~ 1.0E9 + breakBlockBase = 25.0 + #Range: 0.0 ~ 1.0E9 + breakBlockFluid = 125.0 + #Range: 0.0 ~ 1.0E9 + moveHeadBase = 1.0 + #Range: 0.0 ~ 1.0E9 + expCollect = 2.5 + #Range: 0.0 ~ 1.0E9 + efficiencyCoefficient = 1.5848931924611136 + #Range: 0.0 ~ 1.0E9 + breakEfficiencyCoefficient = 1.379729661461215 + #Range: 0.0 ~ 1.0E9 + breakFortuneCoefficient = 1.5874010519681996 + #Range: 0.0 ~ 1.0E9 + breakSilktouchCoefficient = 4.0 + +#IC2 integration +[ic2-integration] + #The rate to convert EU to nano FE. Default(4,000,000,000) is the rate of 1 EU = 4 FE + #Range: 1 ~ 9223372036854775807 + conversionRate = 4000000000 + +#Enchantments. Defines enchantments machines can accept. +[enchantments] + quarry = ["minecraft:efficiency", "minecraft:unbreaking", "minecraft:fortune", "minecraft:silk_touch"] + adv_quarry = ["minecraft:efficiency", "minecraft:unbreaking", "minecraft:fortune", "minecraft:silk_touch"] + mini_quarry = ["minecraft:efficiency", "minecraft:unbreaking"] + adv_pump = ["minecraft:efficiency", "minecraft:unbreaking", "minecraft:fortune"] + diff --git a/index.toml b/index.toml index cd964c4..053b629 100644 --- a/index.toml +++ b/index.toml @@ -64,6 +64,10 @@ hash = "d98a950b91ff51ef3ac2b3c73a7ea48eb30ec56dd42668a1891f8dffbc690ab5" file = "config/moremekanismprocessing-common.toml" hash = "f4f94b6b9dcbbf19a828c842217306169bcff7f9570b81af612b5404bc4bda87" +[[files]] +file = "config/quarryplus-common.toml" +hash = "3650fcce5b80ac2b0b36c299d05616990c72579fc9ca779c1c50c76396e2a1dc" + [[files]] file = "config/starterkit/starterkit.txt" hash = "95f16b64340c8980823a39b711bbb4a810f26c68f8f58f5c005da796dcacf236" @@ -94,11 +98,11 @@ hash = "00fd68c7cebeb9d6f09da20fed39c0bdd8e608ed6afaee9f6ef048208f50e86e" [[files]] file = "kubejs/client_scripts/hide.js" -hash = "2255b7d532be636cb1cc8a6cbbc69cb1afb496623af5fa526b8d5c1fc4a64a07" +hash = "14a77b647bc3b65ba673b4430efea6930e83e30eee1525fc82e2722be9dc57db" [[files]] file = "kubejs/server_scripts/balance.js" -hash = "84d823bde19f065e4f25d4d57140133ca73ad5ce140283d86998e0175364cb35" +hash = "b3853c1c8e1445cc96d5ba246440affd7e6a8ebd7e0f31f767cbd8b6f6edb5fc" [[files]] file = "kubejs/server_scripts/banned.js" @@ -440,7 +444,7 @@ metafile = true [[files]] file = "mods/extreme-reactors.pw.toml" -hash = "fa17748369c50dd013fed14cd77891c32a3098688b778af281b227aad41b63f6" +hash = "a5862f6a5ca9ab9fc36150e0adbdc3e8cca375e6c3187087477168f2bb7142a0" metafile = true [[files]] @@ -583,6 +587,11 @@ file = "mods/jei.pw.toml" hash = "ec517326311870553f501b1cea0a453b67419a2663a3d3c4eb3422a0eb21f67c" metafile = true +[[files]] +file = "mods/john_mod_reborn.pw.toml" +hash = "58acfa07a6918387d574fa62f270aca7c6347e5c3d13aa3277beabbbb5404b78" +metafile = true + [[files]] file = "mods/journeymap-integration.pw.toml" hash = "f8c78f9eef3ce31cc182a1d0d12c93c2e5258ca83e28fea0ec2a2fba999f9a9c" @@ -1095,7 +1104,7 @@ metafile = true [[files]] file = "mods/sophisticated-core.pw.toml" -hash = "7359a39beba9c2b70ca5965e42b88b9a4d3de56cefbf860f745a4898a71ca642" +hash = "7ad4c554d2d59b0c52e48670371695a63f087f85cfaed4d37477818260d600dc" metafile = true [[files]] @@ -1255,7 +1264,7 @@ metafile = true [[files]] file = "mods/zerocore.pw.toml" -hash = "3edcfebe2285c4c5ce8c294047e344d06bbe16b60eb19270fbcef6ca0444b422" +hash = "69c88de3ecc6dc7b90ad1b3e87dc428cf88676b350364d8304eeb3480a2a41b3" metafile = true [[files]] diff --git a/kubejs/client_scripts/hide.js b/kubejs/client_scripts/hide.js index c866c79..74243c2 100644 --- a/kubejs/client_scripts/hide.js +++ b/kubejs/client_scripts/hide.js @@ -105,6 +105,8 @@ JEIEvents.hideItems((event) => { event.hide("industrialforegoing:infinity_nuke"); + event.hide("mekanism:digital_miner"); // It just can't keep up with other options. Balancing its cost is annoying. + event.hide("moguns:blue_heat"); event.hide("moguns:garbage"); event.hide("moguns:glockest_glock"); @@ -112,6 +114,23 @@ JEIEvents.hideItems((event) => { event.hide("moguns:taki"); event.hide("moguns:trashcan"); + event.hide("quarryplus:workbench"); // This is very expensive for how slow the quarry is. + event.hide("quarryplus:remote_placer"); + event.hide("quarryplus:spawn_controller"); + event.hide("quarryplus:remove_bedrock_module"); + event.hide("quarryplus:mini_quarry"); // This isn't OP, but it's very confusing to use. + event.hide("quarryplus:adv_quarry"); // This is very OP. It mines all the way to bedrock for an entire chunk in seconds if you have the power. + event.hide("quarryplus:spawner_controller"); + event.hide("quarryplus:dummy"); + event.hide("quarryplus:dummy_replacer"); + event.hide("quarryplus:replacer_module"); + event.hide("quarryplus:replacer"); + event.hide("quarryplus:frame"); + event.hide("quarryplus:status_checker"); // Doesn't seem to work in the current version + event.hide("quarryplus:y_setter"); // Doesn't seem to work in the current version + event.hide("quarryplus:solid_fuel_quarry"); + event.hide("quarryplus:fuel_module_normal"); + event.hide("thermal:press_coin_die"); event.hide("thermal:dynamo_numismatic"); event.hide("thermal:tin_coin"); diff --git a/kubejs/server_scripts/balance.js b/kubejs/server_scripts/balance.js index dcacfcb..f26b863 100644 --- a/kubejs/server_scripts/balance.js +++ b/kubejs/server_scripts/balance.js @@ -17,12 +17,76 @@ ServerEvents.recipes((event) => { }); // Mekanism Digital Miner - event.shaped("mekanism:digital_miner", ["ACA", "SRS", "ETE"], { - A: "mekanism:alloy_atomic", - C: "mekanism:elite_control_circuit", - S: "mekanism:logistical_sorter", - R: "mekanism:advanced_control_circuit", - E: "minecraft:ender_pearl", - T: "mekanism:steel_casing", + // event.shaped("mekanism:digital_miner", ["ACA", "SRS", "ETE"], { + // A: "mekanism:alloy_atomic", + // C: "mekanism:elite_control_circuit", + // S: "mekanism:logistical_sorter", + // R: "thermal:diamond_gear", + // E: "minecraft:ender_pearl", + // T: "mekanism:steel_casing", + // }); + + // QuarryPlus + event.shaped("quarryplus:marker", ["L", "T"], { + L: "minecraft:lapis_lazuli", + T: "minecraft:redstone_torch", + }); + event.shaped("quarryplus:filter_module", ["CGC", "GTG", "CGC"], { + C: "thermal:copper_nugget", + G: "minecraft:glass_pane", + T: "trashcans:item_trash_can", + }); + event.shaped("quarryplus:mining_well", ["DFD", "SMS", "GPG"], { + D: "thermal:dynamo_stirling", + F: "thermal:machine_furnace", + S: "thermal:redstone_servo", + M: "thermal:machine_frame", + G: "redstone_arsenal:flux_gear", + P: "minecraft:diamond_pickaxe", + }); + event.shaped("quarryplus:quarry", ["IPI", "GDG", "IFI"], { + I: "thermal:steel_ingot", + P: "minecraft:ender_pearl", + G: "redstone_arsenal:flux_gear", + D: "thermal:diamond_gear", + F: "thermal:flux_drill", + }); + event.shaped("quarryplus:mover", [" E ", "OPO", "OOO"], { + E: "minecraft:enchanting_table", + O: "minecraft:obsidian", + P: "minecraft:ender_pearl", + }); + event.shaped("quarryplus:book_mover", ["LWL", "BMB", "OOO"], { + L: "minecraft:lapis_lazuli", + W: "minecraft:writable_book", + B: "minecraft:bookshelf", + M: "quarryplus:mover", + O: "minecraft:obsidian", + }); + event.shaped("quarryplus:filler", ["DID", "CMC", "DDD"], { + D: "minecraft:dirt", + I: "thermal:iron_gear", + C: "thermal:copper_gear", + M: "thermal:machine_frame", + }); + event.shaped("quarryplus:pump_plus", ["RRR", "PMP", "GPG"], { + R: "minecraft:redstone", + P: "create:fluid_pipe", + M: "thermal:machine_frame", + G: "thermal:iron_gear", + }); + event.shaped("quarryplus:adv_pump", ["EEE", "SPS", "IFI"], { + E: "minecraft:emerald", + S: "thermal:redstone_servo", + P: "quarryplus:pump_plus", + I: "thermal:invar_gear", + F: "pipez:fluid_pipe", + }); + event.shaped("quarryplus:exp_pump", ["EEE", "SPS", "BFB"], { + E: "minecraft:emerald", + S: "thermal:redstone_servo", + P: "quarryplus:pump_plus", + B: "thermal:bronze_gear", + F: "create:fluid_pipe", }); }); diff --git a/mods/extreme-reactors.pw.toml b/mods/extreme-reactors.pw.toml index d38ef5c..1d4daf9 100644 --- a/mods/extreme-reactors.pw.toml +++ b/mods/extreme-reactors.pw.toml @@ -1,13 +1,13 @@ name = "Extreme Reactors" -filename = "ExtremeReactors2-1.19.2-2.0.62.jar" +filename = "ExtremeReactors2-1.19.2-2.0.63.jar" side = "both" [download] hash-format = "sha1" -hash = "c2dbe5f8f3680774f3eac319f12a6e9d4e61e5d9" +hash = "7f13e9125882c7a4c8ed931f92bf4f4dcc5fceba" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4417968 +file-id = 4526683 project-id = 250277 diff --git a/mods/john_mod_reborn.pw.toml b/mods/john_mod_reborn.pw.toml new file mode 100644 index 0000000..dc7c0a1 --- /dev/null +++ b/mods/john_mod_reborn.pw.toml @@ -0,0 +1,13 @@ +name = "The John Mod Reborn" +filename = "John_Mod_Reborn_1.0.1_mc1.19.2.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/wbFL8rKi/versions/5s1OOXnW/John_Mod_Reborn_1.0.1_mc1.19.2.jar" +hash-format = "sha1" +hash = "a36c5fa337595c95836235c284bec242d987adb1" + +[update] +[update.modrinth] +mod-id = "wbFL8rKi" +version = "5s1OOXnW" diff --git a/mods/sophisticated-core.pw.toml b/mods/sophisticated-core.pw.toml index b7551ca..db5605d 100644 --- a/mods/sophisticated-core.pw.toml +++ b/mods/sophisticated-core.pw.toml @@ -1,13 +1,13 @@ name = "Sophisticated Core" -filename = "sophisticatedcore-1.19.2-0.5.53.257.jar" +filename = "sophisticatedcore-1.19.2-0.5.54.261.jar" side = "both" [download] hash-format = "sha1" -hash = "ca80f7c52c24079c9e5b2abf44aa232a2d44fd2f" +hash = "1ab9729035345c1604aa12706c8d8a4a83b90d3c" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4520497 +file-id = 4525667 project-id = 618298 diff --git a/mods/zerocore.pw.toml b/mods/zerocore.pw.toml index 8710949..7ee0b75 100644 --- a/mods/zerocore.pw.toml +++ b/mods/zerocore.pw.toml @@ -1,13 +1,13 @@ name = "ZeroCore 2" -filename = "ZeroCore2-1.19.2-2.1.33.jar" +filename = "ZeroCore2-1.19.2-2.1.34.jar" side = "both" [download] hash-format = "sha1" -hash = "1fd3de0955a20c31da8ddb58ad1d47f2ea70a7c6" +hash = "331e04cc45f0b7a736d59f5c827aac3d1fae81b5" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4485324 +file-id = 4526681 project-id = 247921 diff --git a/pack.toml b/pack.toml index 9c79484..b666d23 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 = "0c651902b4da35a9ffb16db8e7b5b3bee73ee220572c99c862c19a0457bc0301" +hash = "1eebd0df73ab3991876a7072d49dc3d73655b9f374fb394292712459eef1a18d" [versions] forge = "43.2.8"