diff --git a/index.toml b/index.toml index 7492b2b..461e57c 100644 --- a/index.toml +++ b/index.toml @@ -559,19 +559,19 @@ hash = "65145ba119d067f34a207496f295c8fd63673723c9504637872f27ff0f78c566" [[files]] file = "kubejs/server_scripts/grist/build.js" -hash = "0cf8fc13970c924bc2491d3bdc06f139786820fe02e49995264b6cec75b05107" +hash = "3d6b9e5d6935c8de378596e052c8a61ea7e827cfbda135e7298863093772151e" [[files]] file = "kubejs/server_scripts/grist/energetic.js" -hash = "bfa1cb2d1ed46b921592c129fee680945f60e3f103f3f8ef38eef274c737fd29" +hash = "28fffd03b4985c3f56d18d8449f2e04badb91439f0690484668d222130672ae6" [[files]] file = "kubejs/server_scripts/grist/intelligent.js" -hash = "c0b4918e65c898df79ef88916448259936a7b1e0d7cee62912ecf801df804757" +hash = "11903a439e89b90be32c435f54b49ad915aab9d571434120592b3a4b579f197d" [[files]] file = "kubejs/server_scripts/grist/primordeal.js" -hash = "7dc5f3ae65fd65800df171420bdb6c69b3c62a99337822a3426c07db73eb6db0" +hash = "8902157c387eedd43855207c38af0fa990522589fb6a8ae827bb9cfecedf19b6" [[files]] file = "kubejs/server_scripts/grist/tags.js" @@ -627,7 +627,7 @@ hash = "4717847a6d54f56ed6919a1e2c3591fc73780973708e818a563753132bc7c15e" [[files]] file = "kubejs/server_scripts/mods/create.js" -hash = "08a3e63e7cc12785d7d34716e1506a6993be6617fa43863d66e280743d563742" +hash = "449085c47d84c6f0f24cbe7b15b60434f35db12095f5e2172e0c64a23b93a526" [[files]] file = "kubejs/server_scripts/mods/create_jetpack.js" @@ -661,6 +661,10 @@ hash = "4ae08d926ae9dfd24d59ae6bea4659c400ca89f011f2acc85b7f839956236f35" file = "kubejs/server_scripts/mods/elevatorid.js" hash = "f9a0d2744bd16db5ba3a099b87ce15c72c9e067ce4d27ba17a82fceee40a9845" +[[files]] +file = "kubejs/server_scripts/mods/energymeter.js" +hash = "dc4318bb4290cc1b1a9f7c971fca38f951977d22bdfc824fb4290b78e2f0841a" + [[files]] file = "kubejs/server_scripts/mods/experienceobelisk.js" hash = "d635d9125b6a04148ddf506e45c45e88b8c255c4fdfa5a3af1d441931a15bcd0" @@ -715,7 +719,7 @@ hash = "029c5a31573f50b8876763efa7a6306867542623e62ab0a0e5b3f377792f8b59" [[files]] file = "kubejs/server_scripts/mods/prettypipes.js" -hash = "b8e97ae2d545b542bd983935eb914709315630d63f921a144f9242943ecfe672" +hash = "27dec2fed14df3f60856114b01e9d34821ebd37afbc5a5fcd5eb1c093821f05b" [[files]] file = "kubejs/server_scripts/mods/sophisticated.js" @@ -731,11 +735,11 @@ hash = "d37bfb9bc41aa46d0aa075dbe19a5eeb947b4ea3d8f13c03ac370cb00763d7a1" [[files]] file = "kubejs/server_scripts/mods/thermal.js" -hash = "181bca8e5f6daabd6b42090276f48b823afec2fae37f0f3317fd76f9456a5c4e" +hash = "d8fcfe6c5efe785eb7493deddcc121ace1eff1358669426c6da2e63ae5b2d495" [[files]] file = "kubejs/server_scripts/mods/torchmaster.js" -hash = "9eed24eaac1d6016fc1d99bcb7259900e430afd674db47c52df89e5cdb6e1317" +hash = "bace606c88cff3079285ad8932eeebccdcea1e73dab04168591a888ee5c5278b" [[files]] file = "kubejs/server_scripts/mods/vinery.js" @@ -1255,6 +1259,11 @@ file = "mods/ends-delight.pw.toml" hash = "63a9fdacf232df08a520fb1f25d2d1e878551fef4d18722c075e04d6291f5ed1" metafile = true +[[files]] +file = "mods/energymeter.pw.toml" +hash = "4f815d15a2c3918b1ae49851e4d743b85bbdb5bc5b32cd0c9fde14daed000cda" +metafile = true + [[files]] file = "mods/enlightend.pw.toml" hash = "bd3ba2a82d5b80be3ccc187ad50a1aec11f53956c2a20cd9a0ad70b8cd932c1d" diff --git a/kubejs/server_scripts/grist/build.js b/kubejs/server_scripts/grist/build.js index 09c1531..b2ebbd7 100755 --- a/kubejs/server_scripts/grist/build.js +++ b/kubejs/server_scripts/grist/build.js @@ -83,15 +83,32 @@ ServerEvents.recipes(event => { reinforced grist nuggets come from grist blend in a centrifugal separator grist blend comes from basic + improved primordeal block + sulfur in induction smelter */ - event.recipes.thermal.crystallizer( - 'kubejs:grist_build_improved_block', - ['4x minecraft:clay', '#kubejs:grist/build/improved', Fluid.of('kubejs:grist_primordeal_improved_fluid', 4500)] - ); - event.recipes.thermal.crystallizer( - 'kubejs:grist_build_improved_block', - ['32x kubejs:reinforced_grist_ingot', Fluid.of('kubejs:grist_primordeal_improved_fluid', 4000)] + + // Improved grist starts by smelting together build grist, primordeal improved grist, and sulfur to create reinforced grist blend + event.recipes.thermal.smelter( + 'kubejs:reinforced_grist_blend', + ['32x #kubejs:grist/build/basic', '8x kubejs:grist_primordeal_improved_block', '2x #forge:dusts/sulfur'] ); + // The grist blend is then centrifuged to extract nuggets + /*event.recipes.thermal.centrifuge([ + 'kubejs:reinforced_grist_nugget', + Fluid.of('kubejs:grist_build_basic_fluid', 125) + ], 'kubejs:reinforced_grist_blend');*/ + + event.custom({ + type: 'thermal:centrifuge', + ingredients: [ + { item: 'kubejs:reinforced_grist_blend', count: 3 } + ], + results: [ + { fluid: 'kubejs:grist_build_basic_fluid', amount: 225 }, + { item: 'kubejs:grist_essence', chance: 0.2 }, + { item: 'kubejs:reinforced_grist_nugget' }, + ] + }); + + // 9 nuggets combine only in a press to create a reinforced grist ingot event.custom({ type: "thermal:press", ingredients: [ @@ -101,6 +118,18 @@ ServerEvents.recipes(event => { result: [{item: 'kubejs:reinforced_grist_ingot'}] }); + // Finally, you crystallize a pile of ingots with improved primordeal fluid. + event.recipes.thermal.crystallizer( + '2x kubejs:grist_build_improved_block', + ['32x kubejs:reinforced_grist_ingot', Fluid.of('kubejs:grist_primordeal_improved_fluid', 8000)] + ); + + // After that, you simply re-crystalize it along with a little bit of clay + event.recipes.thermal.crystallizer( + 'kubejs:grist_build_improved_block', + ['4x minecraft:clay', '#kubejs:grist/build/improved', Fluid.of('kubejs:grist_primordeal_improved_fluid', 4500)] + ); + /*event.custom({ type: "thermal:centrifuge", ingredients: [ @@ -108,15 +137,6 @@ ServerEvents.recipes(event => { ], result: [{item: 'kubejs:build_grist_basic'}, {item: 'kubejs:reinforced_grist_nugget', chance: 0.3}] });*/ - event.recipes.thermal.centrifuge([ - '8x kubejs:build_grist_basic', - Item.of('kubejs:reinforced_grist_nugget').withChance(0.3) - ], 'kubejs:reinforced_grist_blend'); - - event.recipes.thermal.smelter( - 'kubejs:reinforced_grist_blend', - ['32x #kubejs:grist/build/basic', '3x kubejs:grist_primordeal_improved_block', '2x #forge:dusts/sulfur'] - ); /* improved -> radiant: process ores with power generation, new machines, and tool enchants into smelting up grist alloys -> near creative mode world shaping tools, crafting any block diff --git a/kubejs/server_scripts/grist/energetic.js b/kubejs/server_scripts/grist/energetic.js index 9a7ed4a..5dabfa9 100755 --- a/kubejs/server_scripts/grist/energetic.js +++ b/kubejs/server_scripts/grist/energetic.js @@ -62,7 +62,7 @@ ServerEvents.recipes(event => { ); event.recipes.powah.energizing([ '#forge:glass', - 'thermal:phytogrow', + 'thermal:phytogro', '#forge:dusts/redstone', 'thermal:rf_coil', global.nuggetItem('steel'), @@ -82,7 +82,7 @@ ServerEvents.recipes(event => { 'kubejs:activated_grist_capacitor', 'kubejs:infused_grist_capacitor', 3000, - [] + ['kubejs:intelligent_catalyst', 'kubejs:intelligent_catalyst', 'kubejs:intelligent_catalyst'] ); event.recipes.thermal.bottler( Item.of('kubejs:unstable_grist_capacitor'), diff --git a/kubejs/server_scripts/grist/intelligent.js b/kubejs/server_scripts/grist/intelligent.js index 19693bb..f79cdc6 100755 --- a/kubejs/server_scripts/grist/intelligent.js +++ b/kubejs/server_scripts/grist/intelligent.js @@ -69,12 +69,21 @@ ServerEvents.recipes(event => { '#alltheores:ore_hammers' ]); + // After you have finished your first grist, you simply duplicate it with a bunch of Source event.recipes.ars_nouveau.imbuement( 'kubejs:grist_primordeal_basic_block', 'kubejs:grist_intelligent_basic_block', 900, ['kubejs:grist_intelligent_basic'] ); + + // Adding a catalyst makes it run more efficiently + event.recipes.ars_nouveau.imbuement( + 'kubejs:grist_primordeal_basic_block', + '2x kubejs:grist_intelligent_basic_block', + 700, + ['kubejs:grist_intelligent_basic', 'kubejs:intelligent_catalyst'] + ); /*event.custom({ type: "thermal:press", diff --git a/kubejs/server_scripts/grist/primordeal.js b/kubejs/server_scripts/grist/primordeal.js index 3a53bf6..43b2317 100755 --- a/kubejs/server_scripts/grist/primordeal.js +++ b/kubejs/server_scripts/grist/primordeal.js @@ -43,9 +43,12 @@ ServerEvents.recipes(event => { let id = grist.id(); let fluidID = grist.fluid().id(); let blockID = grist.block().id(); + event.recipes.thermal.crucible(Fluid.of(fluidID, 1000), blockID); event.recipes.thermal.crucible(Fluid.of(fluidID, 250), id); event.recipes.thermal.chiller(id, Fluid.of(fluidID, 250)); + event.recipes.thermal.chiller(blockID, Fluid.of(fluidID, 1000)); event.recipes.createMixing(Fluid.of(fluidID, 250), id).heated(); + event.recipes.createMixing(Fluid.of(fluidID, 1000), blockID).heated(); // convert between block and normal item event.shapeless(blockID, [`9x ${id}`]); @@ -78,6 +81,7 @@ ServerEvents.recipes(event => { // Progression along primordeals and universals let _ = [{from: 'basic', to: 'improved'}, {from: 'improved', to: 'radiant'}].forEach(upgrade => { + // TODO: Implement sideways conversion from universal grist to each of the elementals // Primordeal progression requires one from each element of the lower tier event.shaped(`kubejs:grist_primordeal_${upgrade.to}`, [ 'A B', diff --git a/kubejs/server_scripts/mods/create.js b/kubejs/server_scripts/mods/create.js index 32b4e35..ff6257f 100644 --- a/kubejs/server_scripts/mods/create.js +++ b/kubejs/server_scripts/mods/create.js @@ -77,6 +77,8 @@ ServerEvents.recipes(event => { // 1 nugget == 60mb cognitium event.recipes.createMixing(Fluid.of('experienceobelisk:cognitium', 60), 'create:experience_nugget').heated(); event.recipes.createMixing(Fluid.of('experienceobelisk:cognitium', 60 * 9), 'create:experience_block').heated(); + event.recipes.thermal.centrifuge([Fluid.of('experienceobelisk:cognitum', 60)], 'create:experience_nugget'); + event.recipes.thermal.centrifuge([Fluid.of('experienceobelisk:cognitum', 60 * 9)], 'create:experience_block'); // Precision mechanisms should require intelligent grist event.recipes.createSequencedAssembly([ diff --git a/kubejs/server_scripts/mods/energymeter.js b/kubejs/server_scripts/mods/energymeter.js new file mode 100644 index 0000000..2923b2f --- /dev/null +++ b/kubejs/server_scripts/mods/energymeter.js @@ -0,0 +1,15 @@ +ServerEvents.recipes(event => { + event.replaceInput({mod: 'energymeter'}, + 'minecraft:comparator', + '#kubejs:grist/energetic/basic' + ); + event.replaceInput({mod: 'energymeter'}, + 'minecraft:redstone', + '#kubejs:grist/intelligent/basic' + ); + + event.replaceInput({mod: 'energymeter'}, + 'minecraft:iron_ingot', + global.ingotItem('copper') + ); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/mods/prettypipes.js b/kubejs/server_scripts/mods/prettypipes.js index 33ffb6c..acbb27f 100755 --- a/kubejs/server_scripts/mods/prettypipes.js +++ b/kubejs/server_scripts/mods/prettypipes.js @@ -91,4 +91,10 @@ ServerEvents.recipes(event => { 'minecraft:redstone_block', '#kubejs:grist/intelligent/improved' ); + + event.replaceInput( + {mod: 'prettypipes'}, + 'minecraft:sugar', + '#kubejs:grist/energetic/basic' + ); }) \ No newline at end of file diff --git a/kubejs/server_scripts/mods/thermal.js b/kubejs/server_scripts/mods/thermal.js index 3a552e1..60eaea1 100755 --- a/kubejs/server_scripts/mods/thermal.js +++ b/kubejs/server_scripts/mods/thermal.js @@ -141,6 +141,12 @@ ServerEvents.recipes(event => { event.remove({input: 'thermal:earth_charge'}); + event.recipes.create.mixing('16x thermal:phytogro', [ + '#forge:sand', + '2x thermal:apatite_dust', + 'thermal:niter_dust' + ]); + // Pulverizer is gated behind brass, which requires create /*event.replaceInput( {id: 'thermal:machine_pulverizer'}, diff --git a/kubejs/server_scripts/mods/torchmaster.js b/kubejs/server_scripts/mods/torchmaster.js index 5aa1d5d..f28149d 100644 --- a/kubejs/server_scripts/mods/torchmaster.js +++ b/kubejs/server_scripts/mods/torchmaster.js @@ -11,6 +11,15 @@ ServerEvents.recipes(event => { 'minecraft:gold_ingot', '#kubejs:grist/build/basic' ); + event.replaceInput({mod: 'torchmaster'}, + '#minecraft:logs', + '#kubejs:grist/agricultural/basic/block' + ); + + event.replaceInput({mod: 'torchmaster'}, + 'minecraft:gold_block', + '#kubejs:grist/build/basic/block' + ); event.replaceInput({mod: 'torchmaster'}, 'minecraft:glowstone', diff --git a/mods/energymeter.pw.toml b/mods/energymeter.pw.toml new file mode 100644 index 0000000..4d56480 --- /dev/null +++ b/mods/energymeter.pw.toml @@ -0,0 +1,13 @@ +name = "Energy Meter" +filename = "energymeter-forge-1.20.1-1.0.0.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/MbejSZ2E/versions/UyNuFWXF/energymeter-forge-1.20.1-1.0.0.jar" +hash-format = "sha512" +hash = "e599493c47e3f5ea24aae9cc1e67c335085c088ac6149e23eb2a3c2d25cc9f51dd015f9ef5e3b68c8b2971db5151aad99534d33bec8b70902ddca64db6e67ac7" + +[update] +[update.modrinth] +mod-id = "MbejSZ2E" +version = "UyNuFWXF" diff --git a/pack.toml b/pack.toml index d75e5f5..764724c 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 = "36c4195e673f31c7b4848b9fd27f4aff0809e6c3286dd401caf050a67f31901b" +hash = "4d2453a62fcc952bf14f0c1924c7b2087a1007633f173ef78c66ececc8fdb2b8" [versions] forge = "47.4.0"