diff --git a/index.toml b/index.toml index 461e57c..49a8b0d 100644 --- a/index.toml +++ b/index.toml @@ -691,7 +691,7 @@ hash = "596dd1c049f41e6f4085aea50a1791be7397710d13d3c234ca09a0626c1d62b5" [[files]] file = "kubejs/server_scripts/mods/industrial_foregoing.js" -hash = "dbf1ad898c625e089daa09ae5c331ead86e0d4ff310c4a043f0dbcf0ff02e629" +hash = "4f6bfff4f318af1559c80a6487333577d4e1983f3dcc7b4344f765a9144851da" [[files]] file = "kubejs/server_scripts/mods/ironfurnaces.js" @@ -711,7 +711,7 @@ hash = "2d9109e7f1e0beed5dd325fb7939a15f6afa2f2783e31f3830d1fb6f055f3f07" [[files]] file = "kubejs/server_scripts/mods/powah.js" -hash = "f83c2a9f95e664a55b76eb3f67e0c4e64218fc4cba324da41829a79aea5b9cb1" +hash = "d7770a1c3fa83efb1fde7c12715c741138995bdf4b513f4fe6b917fc8664763a" [[files]] file = "kubejs/server_scripts/mods/powder_power.js" @@ -735,7 +735,7 @@ hash = "d37bfb9bc41aa46d0aa075dbe19a5eeb947b4ea3d8f13c03ac370cb00763d7a1" [[files]] file = "kubejs/server_scripts/mods/thermal.js" -hash = "d8fcfe6c5efe785eb7493deddcc121ace1eff1358669426c6da2e63ae5b2d495" +hash = "9490e5519a8dc011f2d22a65df5c086ecd44d6cbf5b7a12df417521e5b21a324" [[files]] file = "kubejs/server_scripts/mods/torchmaster.js" @@ -755,7 +755,7 @@ hash = "4003082f31011049402ff31504a6db0f4fdd6c7076167109c66fa412286be462" [[files]] file = "kubejs/server_scripts/ore-processing.js" -hash = "4b8bb32cc012765c5c1719b297a396ffef6bd563f4b0a1cee1a5b4b2b98a8af1" +hash = "2b375084a5ad842c4a8039fa11b45805c1998a80a3d0a79b1bdca23594c90f4e" [[files]] file = "kubejs/server_scripts/progression/report.js" diff --git a/kubejs/server_scripts/mods/industrial_foregoing.js b/kubejs/server_scripts/mods/industrial_foregoing.js index ab8875b..15643ad 100755 --- a/kubejs/server_scripts/mods/industrial_foregoing.js +++ b/kubejs/server_scripts/mods/industrial_foregoing.js @@ -51,6 +51,10 @@ ServerEvents.recipes(event => { ['minecraft:diamond_pickaxe', '#kubejs:grist/build/radiant'] ]); + // Remove some basic generators where thermal dynamos are way better + event.remove({output: 'industrialforegoing:biofuel_generator'}); + event.remove({output: 'industrialforegoing:pitiful_generator'}); + let v = [['common', 'pity'], ['pity', 'simple'], ['simple', 'advanced'], ['advanced','supreme']].forEach(tierPair => { event.replaceInput( {id: `industrialforegoing:${tierPair[1]}_black_hole_unit`}, diff --git a/kubejs/server_scripts/mods/powah.js b/kubejs/server_scripts/mods/powah.js index edb7d0d..d626ae9 100755 --- a/kubejs/server_scripts/mods/powah.js +++ b/kubejs/server_scripts/mods/powah.js @@ -82,7 +82,6 @@ ServerEvents.recipes(event => { 'minecraft:clay_ball', '#alltheores:ore_hammers' ]); - // TODO: Add create mixing and thermal alloy smelting versions for dialectric paste event.recipes.thermal.smelter('24x powah:dielectric_paste', [ 'kubejs:grist_energetic_basic', 'minecraft:clay_ball', diff --git a/kubejs/server_scripts/mods/thermal.js b/kubejs/server_scripts/mods/thermal.js index 60eaea1..3d6f222 100755 --- a/kubejs/server_scripts/mods/thermal.js +++ b/kubejs/server_scripts/mods/thermal.js @@ -147,12 +147,15 @@ ServerEvents.recipes(event => { 'thermal:niter_dust' ]); - // Pulverizer is gated behind brass, which requires create - /*event.replaceInput( - {id: 'thermal:machine_pulverizer'}, - '#forge:gears/brass', - '#kubejs:grist/agricultural/basic' - );*/ + // thermal processing line for creating biofuel + // 1000mb of biofuel should then produce 1000mb of refined fuel after another step of processing, which seems balanced + event.recipes.thermal.refinery( + [Fluid.of('thermal:light_oil', 75), Fluid.of('thermal:heavy_oil', 25)], + Fluid.of('industrialforegoing:biofuel', 100) + ); - // Centrifuge comes already gated behind constantan + // Make industrial foregoing biofuel work in compression dynamo + // 1 bucket refined fuel = 1.5M RF + // 1 bucket biofuel = 640k RF + event.recipes.thermal.compression_fuel('industrialforegoing:biofuel').energy(640000); }); \ No newline at end of file diff --git a/kubejs/server_scripts/ore-processing.js b/kubejs/server_scripts/ore-processing.js index cadbeae..b5d44a0 100755 --- a/kubejs/server_scripts/ore-processing.js +++ b/kubejs/server_scripts/ore-processing.js @@ -1,7 +1,3 @@ -//FIXME: broken andesite mixing recipe creates no output -//FIXME: test create shaft and cog recipes again -//FIXME: Figure out what the original create wool and concrete coloring recipes were, add mixer variants -//FIXME: Create a water mixer route to turn concrete powder to concrete ServerEvents.recipes(event => { // Metal tiers: // Copper, iron, tin, nickel, gold, zinc, brass, invar, bronze - Pre-basic build tier, the only ores that don't require a pulverizer or smelter to process diff --git a/pack.toml b/pack.toml index 764724c..ce6a618 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 = "4d2453a62fcc952bf14f0c1924c7b2087a1007633f173ef78c66ececc8fdb2b8" +hash = "c708e45fff1f9f71b6f81e9970bdc5d3bf662ffb8948c9f15179eb3ae4327562" [versions] forge = "47.4.0"