From d8c28d04fd3158ef1ea2225a7da5df81937974ec Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:47:19 -0400 Subject: [PATCH 01/10] Thermal Lang Tweaks --- .../CABIN/assets/thermal/lang/en_us.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/overrides/resourcepacks/CABIN/assets/thermal/lang/en_us.json b/overrides/resourcepacks/CABIN/assets/thermal/lang/en_us.json index 52550dc..2321c17 100644 --- a/overrides/resourcepacks/CABIN/assets/thermal/lang/en_us.json +++ b/overrides/resourcepacks/CABIN/assets/thermal/lang/en_us.json @@ -13,6 +13,18 @@ "item.thermal.raw_lead": "Concentrated Raw Lead", "item.thermal.raw_nickel": "Concentrated Raw Nickel", "item.thermal.raw_silver": "Concentrated Raw Silver" - - -} \ No newline at end of file + "item.thermal.lead_plate": "Lead Sheet", + "item.thermal.nickel_plate": "Nickel Sheet", + "item.thermal.silver_plate": "Silver Sheet", + "item.thermal.constantan_plate": "Constantan Sheet", + "item.thermal.electrum_plate": "Electrum Sheet", + "item.thermal.invar_plate": "Invar Sheet", + "item.thermal.enderium_plate": "Enderium Sheet", + "item.thermal.lumium_plate": "Lumium Sheet", + "item.thermal.signalum_plate": "Signalum Sheet" + "item.thermal.heavy_oil_bucket": "Diesel Bucket", + "item.thermal.light_oil_bucket": "Gasoline Bucket", + "fluid.thermal.creosote": "Creosote", + "fluid.thermal.heavy_oil": "Diesel", + "fluid.thermal.light_oil": "Gasoline" +} From 08124873eaf7ca67cdff5f3d10999d2ba9d115e4 Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:48:55 -0400 Subject: [PATCH 02/10] Beyond Earth Lang Tweaks.json --- .../resourcepacks/CABIN/assets/beyond_earth/lang/en_us.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/overrides/resourcepacks/CABIN/assets/beyond_earth/lang/en_us.json b/overrides/resourcepacks/CABIN/assets/beyond_earth/lang/en_us.json index 40cb6d6..f6b54a9 100644 --- a/overrides/resourcepacks/CABIN/assets/beyond_earth/lang/en_us.json +++ b/overrides/resourcepacks/CABIN/assets/beyond_earth/lang/en_us.json @@ -1,5 +1,6 @@ { - "item.beyond_earth.rocket_t1": "The Rocket", + "item.beyond_earth.rocket_t1": "The Rocket", "biome.beyond_earth.moon_desert": "The Moon", + "item.beyond_earth.fuel_bucket": "Rocket Fuel Bucket", "fluid.beyond_earth.fuel": "Rocket Fuel" } From a2d6f76fa7a371bdbee39cc55a02c797a562ac85 Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:51:06 -0400 Subject: [PATCH 03/10] Crafts & Additions and Diesel Generators Lang Tweaks --- .../CABIN/assets/createaddition/lang/en_us.json | 4 ++++ .../CABIN/assets/createdieselgenerators/lang/en_us.json | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 overrides/resourcepacks/CABIN/assets/createaddition/lang/en_us.json create mode 100644 overrides/resourcepacks/CABIN/assets/createdieselgenerators/lang/en_us.json diff --git a/overrides/resourcepacks/CABIN/assets/createaddition/lang/en_us.json b/overrides/resourcepacks/CABIN/assets/createaddition/lang/en_us.json new file mode 100644 index 0000000..a74a94a --- /dev/null +++ b/overrides/resourcepacks/CABIN/assets/createaddition/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "item.createaddition.seed_oil_bucket": "Seed Oil Bucket", + "item.createaddition.bioethanol_bucket": "Bioethanol Bucket" +} diff --git a/overrides/resourcepacks/CABIN/assets/createdieselgenerators/lang/en_us.json b/overrides/resourcepacks/CABIN/assets/createdieselgenerators/lang/en_us.json new file mode 100644 index 0000000..42fa37a --- /dev/null +++ b/overrides/resourcepacks/CABIN/assets/createdieselgenerators/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "block.createdieselgenerators.diesel_engine": "Compact Oil Engine", + "block.createdieselgenerators.large_diesel_engine": "Modular Oil Engine", + "block.createdieselgenerators.huge_diesel_engine": "Huge Oil Engine", + "item.createdieselgenerators.chemical_sprayer_lighter": "Ignition Chemical Sprayer" +} \ No newline at end of file From c5f580a6fa5914b0b853bc1907b63139cfd1a1b8 Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:53:35 -0400 Subject: [PATCH 04/10] Diesel Generators Compat & Blacklist --- .../createdieselgenerators.js | 109 ++++++++++++++++++ .../createdieselgenerators.js | 12 ++ 2 files changed, 121 insertions(+) create mode 100644 overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js create mode 100644 overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js diff --git a/overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js b/overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js new file mode 100644 index 0000000..48c5bdd --- /dev/null +++ b/overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js @@ -0,0 +1,109 @@ +// Create Diesel Generators +if(Platform.isLoaded("createdieselgenerators")) { + onEvent('fluid.tags', event => { + + // Oil Tag Cleanup + event.removeAllTagsFrom('createdieselgenerators:crude_oil') + event.removeAllTagsFrom('createdieselgenerators:flowing_crude_oil') + event.removeAllTagsFrom('createdieselgenerators:gasoline') + event.removeAllTagsFrom('createdieselgenerators:flowing_gasoline') + event.removeAllTagsFrom('createdieselgenerators:diesel') + event.removeAllTagsFrom('createdieselgenerators:flowing_diesel') + event.removeAllTagsFrom('createdieselgenerators:biodiesel') + event.removeAllTagsFrom('createdieselgenerators:flowing_biodiesel') + event.removeAllTagsFrom('createdieselgenerators:plant_oil') + event.removeAllTagsFrom('createdieselgenerators:flowing_plant_oil') + + // Pumpjack Output + event.add('createdieselgenerators:pumpjack_output', 'thermal:crude_oil') + }) + + onEvent('recipes', event => { + + // Duplicated Oils + event.remove({id: 'createdieselgenerators:mixing/biodiesel'}) + event.remove({id: 'createdieselgenerators:compacting/plant_oil'}) + event.remove({id: 'createdieselgenerators:distillation/crude_oil'}) // Distillation outputs can't be changed with scripts + + // Crude Distilation + event.custom({ + "type": "createdieselgenerators:distillation", + "ingredients": [ + {"fluid": "thermal:crude_oil", "amount": 200} + ], + "heatRequirement": "heated", + "processingTime": 200, + "results": [ + {"fluid": "thermal:heavy_oil", "amount": 80}, + {"fluid": "thermal:light_oil", "amount": 120}, + ] + }) + + // Crude Extraction + copperMachine(event, Item.of('createdieselgenerators:pumpjack_hole', 1)) + invarMachine(event, Item.of('createdieselgenerators:pumpjack_crank', 1), 'create:zinc_block') + invarMachine(event, Item.of('createdieselgenerators:oil_scanner', 1), 'ae2:charged_certus_quartz_crystal') + + // Oil Engines + event.remove({id: 'createdieselgenerators:crafting/engine_piston'}) // This one uses a Shaft instead of an Iron Rod + event.remove({id: 'createdieselgenerators:crafting/diesel_engine'}) + event.recipes.create.mechanical_crafting('createdieselgenerators:diesel_engine', [ + ' BLB ', + 'PPSPP', + ' BTB '], + { L: 'createdieselgenerators:lighter', + P: 'createdieselgenerators:engine_piston', + B: 'create:brass_ingot', + S: 'create:shaft', + T: 'create:fluid_tank', + }) + zincMachine(event, Item.of('createdieselgenerators:large_diesel_engine', 1), 'createdieselgenerators:diesel_engine') + invarMachine(event, Item.of('createdieselgenerators:huge_diesel_engine', 1), 'create:brass_block') + + // Wooden Chips Patch + event.remove({id: 'createdieselgenerators:crafting/chip_wood_block'}), + event.shaped('createdieselgenerators:chip_wood_block', [ + 'CCC', + 'CCC', + 'CCC'], + {C: 'createdieselgenerators:wood_chip'} // Now uses 9 instead of 4 in order to prevent duping exploits + ) + + // Miscelaneus Tweaks + event.replaceInput({ + id: 'createdieselgenerators:crafting/pumpjack_bearing'}, + 'create:andesite_alloy', + 'thermal:invar_ingot') + event.replaceInput({ + id: 'createdieselgenerators:crafting/pumpjack_head'}, + 'create:zinc_ingot', + 'thermal:invar_ingot') + event.replaceInput({ + id: 'createdieselgenerators:crafting/asphalt_block'}, + 'createdieselgenerators:crude_oil_bucket', + 'thermal:crude_oil_bucket') + + // Frog Leg Fermentation (Because why not?) + event.custom({ + "type": "createdieselgenerators:basin_fermenting", + "ingredients": [ + {"item": "quark:frog_leg"}, + {"tag": "forge:nuggets/gold"}, + {"tag": "forge:nuggets/gold"}, + {"tag": "forge:nuggets/gold"}, + {"tag": "forge:nuggets/gold"}, + {"tag": "forge:nuggets/gold"}, + {"fluid": "create:potion", + "nbt": {"Potion": "minecraft:mundane"}, + "amount": 100} + ], + "processingTime": 400, + "results": [ + {"item": "quark:golden_frog_leg"}, + {"fluid": "create:potion", + "nbt": {"Potion": "minecraft:thick"}, + "amount": 100} + ] + }) + }) +} \ No newline at end of file diff --git a/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js b/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js new file mode 100644 index 0000000..9d7281e --- /dev/null +++ b/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js @@ -0,0 +1,12 @@ +// Create Diesel Generators +if (Platform.isLoaded("createdieselgenerators")) { + global.itemBlacklist.push("createdieselgenerators:crude_oil_bucket") + global.itemBlacklist.push("createdieselgenerators:gasoline_bucket") + global.itemBlacklist.push("createdieselgenerators:diesel_bucket") + global.itemBlacklist.push("createdieselgenerators:biodiesel_bucket") + global.itemBlacklist.push("createdieselgenerators:plant_oil_bucket") + + global.randomiumBlacklist.push("createdieselgenerators:pumpjack_crank") + global.randomiumBlacklist.push("createdieselgenerators:huge_diesel_engine") + global.randomiumBlacklist.push("createdieselgenerators:oil_scanner") +} \ No newline at end of file From a6a8a53a0ea468146cdcb87ca58561f67b01377b Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:54:27 -0400 Subject: [PATCH 05/10] Fuel Types Rework --- .../diesel_engine_fuel_types/biodiesel.json | 19 +++++++++++++++++++ .../diesel_engine_fuel_types/creosote.json | 19 +++++++++++++++++++ .../diesel_engine_fuel_types/diesel.json | 19 +++++++++++++++++++ .../diesel_engine_fuel_types/ethanol.json | 19 +++++++++++++++++++ .../diesel_engine_fuel_types/gasoline.json | 19 +++++++++++++++++++ .../diesel_engine_fuel_types/plantoil.json | 19 +++++++++++++++++++ .../refined_fuel.json | 19 +++++++++++++++++++ 7 files changed, 133 insertions(+) create mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json create mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json create mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json create mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json create mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json create mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json create mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json new file mode 100644 index 0000000..13a5d37 --- /dev/null +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json @@ -0,0 +1,19 @@ +{ + "fluid": "createaddition:bioethanol", + "sound_speed": 3, + "normal": { + "speed": 64.0, + "strength": 4096.0, + "burn_rate": 2 + }, + "modular": { + "speed": 128.0, + "strength": 8192.0, + "burn_rate": 4 + }, + "huge": { + "speed": 128.0, + "strength": 16384.0, + "burn_rate": 8 + } +} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json new file mode 100644 index 0000000..2aeaefc --- /dev/null +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json @@ -0,0 +1,19 @@ +{ + "fluid": "thermal:creosote", + "sound_speed": 1, + "normal": { + "speed": 64.0, + "strength": 2048.0, + "burn_rate": 2 + }, + "modular": { + "speed": 48.0, + "strength": 3072.0, + "burn_rate": 4 + }, + "huge": { + "speed": 32.0, + "strength": 3072.0, + "burn_rate": 6 + } +} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json new file mode 100644 index 0000000..4f95bf1 --- /dev/null +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json @@ -0,0 +1,19 @@ +{ + "fluid": "thermal:heavy_oil", + "sound_speed": 2, + "normal": { + "speed": 64.0, + "strength": 3072.0, + "burn_rate": 2 + }, + "modular": { + "speed": 96.0, + "strength": 6144.0, + "burn_rate": 3 + }, + "huge": { + "speed": 128.0, + "strength": 12288.0, + "burn_rate": 4 + } +} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json new file mode 100644 index 0000000..fdafe05 --- /dev/null +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json @@ -0,0 +1,19 @@ +{ + "fluid": "#forge:ethanol", + "sound_speed": 2, + "normal": { + "speed": 64.0, + "strength": 4096.0, + "burn_rate": 2 + }, + "modular": { + "speed": 64.0, + "strength": 6144.0, + "burn_rate": 4 + }, + "huge": { + "speed": 64.0, + "strength": 8192.0, + "burn_rate": 8 + } +} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json new file mode 100644 index 0000000..93c8b6b --- /dev/null +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json @@ -0,0 +1,19 @@ +{ + "fluid": "thermal:light_oil", + "sound_speed": 2, + "normal": { + "speed": 64.0, + "strength": 3072.0, + "burn_rate": 1 + }, + "modular": { + "speed": 128.0, + "strength": 6144.0, + "burn_rate": 2 + }, + "huge": { + "speed": 96.0, + "strength": 6144.0, + "burn_rate": 3 + } +} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json new file mode 100644 index 0000000..7f4c7e2 --- /dev/null +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json @@ -0,0 +1,19 @@ +{ + "fluid": "thermal:tree_oil", + "sound_speed": 1, + "normal": { + "speed": 32.0, + "strength": 1024.0, + "burn_rate": 1 + }, + "modular": { + "speed": 64.0, + "strength": 2048.0, + "burn_rate": 2 + }, + "huge": { + "speed": 64.0, + "strength": 3072.0, + "burn_rate": 3 + } +} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json new file mode 100644 index 0000000..36305b8 --- /dev/null +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json @@ -0,0 +1,19 @@ +{ + "fluid": "thermal:refined_fuel", + "sound_speed": 3, + "normal": { + "speed": 64.0, + "strength": 4096.0, + "burn_rate": 1 + }, + "modular": { + "speed": 128.0, + "strength": 8192.0, + "burn_rate": 2 + }, + "huge": { + "speed": 128.0, + "strength": 16384.0, + "burn_rate": 4 + } +} \ No newline at end of file From 0b39d8b5d662f9d47306f46d6269e763d376d14a Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Sun, 17 Nov 2024 02:03:14 -0400 Subject: [PATCH 06/10] Bioethanol Patch --- .../diesel_engine_fuel_types/biodiesel.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json index 13a5d37..3884e87 100644 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json @@ -1,5 +1,5 @@ { - "fluid": "createaddition:bioethanol", + "fluid": "#forge:biofuel", "sound_speed": 3, "normal": { "speed": 64.0, @@ -16,4 +16,4 @@ "strength": 16384.0, "burn_rate": 8 } -} \ No newline at end of file +} From 5b967d1ef39a2425f771368a724397b721565bb4 Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Sun, 17 Nov 2024 03:05:14 -0400 Subject: [PATCH 07/10] Renewable Oils Rebalance --- .../diesel_engine_fuel_types/biodiesel.json | 10 +++++----- .../diesel_engine_fuel_types/creosote.json | 4 ++-- .../diesel_engine_fuel_types/ethanol.json | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json index 3884e87..fa2d6b2 100644 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json @@ -4,16 +4,16 @@ "normal": { "speed": 64.0, "strength": 4096.0, - "burn_rate": 2 + "burn_rate": 4 }, "modular": { "speed": 128.0, "strength": 8192.0, - "burn_rate": 4 + "burn_rate": 8 }, "huge": { "speed": 128.0, - "strength": 16384.0, - "burn_rate": 8 + "strength": 12288.0, + "burn_rate": 12 } -} +} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json index 2aeaefc..4c0fa15 100644 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json @@ -4,12 +4,12 @@ "normal": { "speed": 64.0, "strength": 2048.0, - "burn_rate": 2 + "burn_rate": 4 }, "modular": { "speed": 48.0, "strength": 3072.0, - "burn_rate": 4 + "burn_rate": 6 }, "huge": { "speed": 32.0, diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json index fdafe05..f170eb2 100644 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json +++ b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json @@ -4,16 +4,16 @@ "normal": { "speed": 64.0, "strength": 4096.0, - "burn_rate": 2 + "burn_rate": 4 }, "modular": { "speed": 64.0, "strength": 6144.0, - "burn_rate": 4 + "burn_rate": 6 }, "huge": { - "speed": 64.0, - "strength": 8192.0, - "burn_rate": 8 + "speed": 48.0, + "strength": 6144.0, + "burn_rate": 6 } } \ No newline at end of file From 363a3cdf97dc31ca1d20475d17db6394dbe2f36e Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:09:09 -0400 Subject: [PATCH 08/10] Fluid Blacklist --- .../startup_compatability/createdieselgenerators.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js b/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js index 9d7281e..2f2a2b0 100644 --- a/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js +++ b/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js @@ -6,7 +6,18 @@ if (Platform.isLoaded("createdieselgenerators")) { global.itemBlacklist.push("createdieselgenerators:biodiesel_bucket") global.itemBlacklist.push("createdieselgenerators:plant_oil_bucket") + global.jeiFluidBlacklist.push('createdieselgenerators:crude_oil') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_crude_oil') + global.jeiFluidBlacklist.push('createdieselgenerators:gasoline') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_gasoline') + global.jeiFluidBlacklist.push('createdieselgenerators:diesel') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_diesel') + global.jeiFluidBlacklist.push('createdieselgenerators:biodiesel') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_biodiesel') + global.jeiFluidBlacklist.push('createdieselgenerators:plant_oil') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_plant_oil') + global.randomiumBlacklist.push("createdieselgenerators:pumpjack_crank") global.randomiumBlacklist.push("createdieselgenerators:huge_diesel_engine") global.randomiumBlacklist.push("createdieselgenerators:oil_scanner") -} \ No newline at end of file +} From 94d67400c06e3a65d94d761a267e28976737bae5 Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Wed, 20 Nov 2024 00:13:31 -0400 Subject: [PATCH 09/10] Datapack Merge --- .../diesel_engine_fuel_types/biodiesel.json | 19 ------------------- .../diesel_engine_fuel_types/creosote.json | 19 ------------------- .../diesel_engine_fuel_types/diesel.json | 19 ------------------- .../diesel_engine_fuel_types/ethanol.json | 19 ------------------- .../diesel_engine_fuel_types/gasoline.json | 19 ------------------- .../diesel_engine_fuel_types/plantoil.json | 19 ------------------- .../refined_fuel.json | 19 ------------------- 7 files changed, 133 deletions(-) delete mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json delete mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json delete mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json delete mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json delete mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json delete mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json delete mode 100644 overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json deleted file mode 100644 index fa2d6b2..0000000 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/biodiesel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "fluid": "#forge:biofuel", - "sound_speed": 3, - "normal": { - "speed": 64.0, - "strength": 4096.0, - "burn_rate": 4 - }, - "modular": { - "speed": 128.0, - "strength": 8192.0, - "burn_rate": 8 - }, - "huge": { - "speed": 128.0, - "strength": 12288.0, - "burn_rate": 12 - } -} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json deleted file mode 100644 index 4c0fa15..0000000 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/creosote.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "fluid": "thermal:creosote", - "sound_speed": 1, - "normal": { - "speed": 64.0, - "strength": 2048.0, - "burn_rate": 4 - }, - "modular": { - "speed": 48.0, - "strength": 3072.0, - "burn_rate": 6 - }, - "huge": { - "speed": 32.0, - "strength": 3072.0, - "burn_rate": 6 - } -} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json deleted file mode 100644 index 4f95bf1..0000000 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/diesel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "fluid": "thermal:heavy_oil", - "sound_speed": 2, - "normal": { - "speed": 64.0, - "strength": 3072.0, - "burn_rate": 2 - }, - "modular": { - "speed": 96.0, - "strength": 6144.0, - "burn_rate": 3 - }, - "huge": { - "speed": 128.0, - "strength": 12288.0, - "burn_rate": 4 - } -} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json deleted file mode 100644 index f170eb2..0000000 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/ethanol.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "fluid": "#forge:ethanol", - "sound_speed": 2, - "normal": { - "speed": 64.0, - "strength": 4096.0, - "burn_rate": 4 - }, - "modular": { - "speed": 64.0, - "strength": 6144.0, - "burn_rate": 6 - }, - "huge": { - "speed": 48.0, - "strength": 6144.0, - "burn_rate": 6 - } -} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json deleted file mode 100644 index 93c8b6b..0000000 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/gasoline.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "fluid": "thermal:light_oil", - "sound_speed": 2, - "normal": { - "speed": 64.0, - "strength": 3072.0, - "burn_rate": 1 - }, - "modular": { - "speed": 128.0, - "strength": 6144.0, - "burn_rate": 2 - }, - "huge": { - "speed": 96.0, - "strength": 6144.0, - "burn_rate": 3 - } -} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json deleted file mode 100644 index 7f4c7e2..0000000 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/plantoil.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "fluid": "thermal:tree_oil", - "sound_speed": 1, - "normal": { - "speed": 32.0, - "strength": 1024.0, - "burn_rate": 1 - }, - "modular": { - "speed": 64.0, - "strength": 2048.0, - "burn_rate": 2 - }, - "huge": { - "speed": 64.0, - "strength": 3072.0, - "burn_rate": 3 - } -} \ No newline at end of file diff --git a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json b/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json deleted file mode 100644 index 36305b8..0000000 --- a/overrides/kubejs/data/createdieselgenerators/diesel_engine_fuel_types/refined_fuel.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "fluid": "thermal:refined_fuel", - "sound_speed": 3, - "normal": { - "speed": 64.0, - "strength": 4096.0, - "burn_rate": 1 - }, - "modular": { - "speed": 128.0, - "strength": 8192.0, - "burn_rate": 2 - }, - "huge": { - "speed": 128.0, - "strength": 16384.0, - "burn_rate": 4 - } -} \ No newline at end of file From fc5600b81de954b00fbad618d1b4a51d4a7d7b53 Mon Sep 17 00:00:00 2001 From: CapNapu <110067479+CapNapu@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:57:16 -0400 Subject: [PATCH 10/10] Better Fuel Compats & Minor Tweaks --- .../createdieselgenerators.js | 145 ++++++++++++------ .../createdieselgenerators.js | 26 ++-- 2 files changed, 112 insertions(+), 59 deletions(-) diff --git a/overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js b/overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js index 48c5bdd..26615a6 100644 --- a/overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js +++ b/overrides/kubejs/server_scripts/server_compatability/createdieselgenerators.js @@ -2,19 +2,8 @@ if(Platform.isLoaded("createdieselgenerators")) { onEvent('fluid.tags', event => { - // Oil Tag Cleanup - event.removeAllTagsFrom('createdieselgenerators:crude_oil') - event.removeAllTagsFrom('createdieselgenerators:flowing_crude_oil') - event.removeAllTagsFrom('createdieselgenerators:gasoline') - event.removeAllTagsFrom('createdieselgenerators:flowing_gasoline') - event.removeAllTagsFrom('createdieselgenerators:diesel') - event.removeAllTagsFrom('createdieselgenerators:flowing_diesel') - event.removeAllTagsFrom('createdieselgenerators:biodiesel') - event.removeAllTagsFrom('createdieselgenerators:flowing_biodiesel') - event.removeAllTagsFrom('createdieselgenerators:plant_oil') - event.removeAllTagsFrom('createdieselgenerators:flowing_plant_oil') - // Pumpjack Output + event.remove('createdieselgenerators:pumpjack_output', 'createdieselgenerators:crude_oil') event.add('createdieselgenerators:pumpjack_output', 'thermal:crude_oil') }) @@ -43,6 +32,14 @@ if(Platform.isLoaded("createdieselgenerators")) { copperMachine(event, Item.of('createdieselgenerators:pumpjack_hole', 1)) invarMachine(event, Item.of('createdieselgenerators:pumpjack_crank', 1), 'create:zinc_block') invarMachine(event, Item.of('createdieselgenerators:oil_scanner', 1), 'ae2:charged_certus_quartz_crystal') + event.replaceInput({ + id: 'createdieselgenerators:crafting/pumpjack_bearing'}, + 'create:andesite_alloy', + 'thermal:invar_ingot') + event.replaceInput({ + id: 'createdieselgenerators:crafting/pumpjack_head'}, + 'create:zinc_ingot', + 'thermal:invar_ingot') // Oil Engines event.remove({id: 'createdieselgenerators:crafting/engine_piston'}) // This one uses a Shaft instead of an Iron Rod @@ -50,8 +47,8 @@ if(Platform.isLoaded("createdieselgenerators")) { event.recipes.create.mechanical_crafting('createdieselgenerators:diesel_engine', [ ' BLB ', 'PPSPP', - ' BTB '], - { L: 'createdieselgenerators:lighter', + ' BTB '],{ + L: 'createdieselgenerators:lighter', P: 'createdieselgenerators:engine_piston', B: 'create:brass_ingot', S: 'create:shaft', @@ -65,45 +62,97 @@ if(Platform.isLoaded("createdieselgenerators")) { event.shaped('createdieselgenerators:chip_wood_block', [ 'CCC', 'CCC', - 'CCC'], - {C: 'createdieselgenerators:wood_chip'} // Now uses 9 instead of 4 in order to prevent duping exploits - ) + 'CCC'],{ + C: 'createdieselgenerators:wood_chip' // Now uses 9 instead of 4 in order to prevent duping exploits + }) - // Miscelaneus Tweaks - event.replaceInput({ - id: 'createdieselgenerators:crafting/pumpjack_bearing'}, - 'create:andesite_alloy', - 'thermal:invar_ingot') - event.replaceInput({ - id: 'createdieselgenerators:crafting/pumpjack_head'}, - 'create:zinc_ingot', - 'thermal:invar_ingot') + // Asphalt from Bucket event.replaceInput({ - id: 'createdieselgenerators:crafting/asphalt_block'}, + id: 'createdieselgenerators:crafting/asphalt_block'}, 'createdieselgenerators:crude_oil_bucket', 'thermal:crude_oil_bucket') + }) - // Frog Leg Fermentation (Because why not?) - event.custom({ - "type": "createdieselgenerators:basin_fermenting", - "ingredients": [ - {"item": "quark:frog_leg"}, - {"tag": "forge:nuggets/gold"}, - {"tag": "forge:nuggets/gold"}, - {"tag": "forge:nuggets/gold"}, - {"tag": "forge:nuggets/gold"}, - {"tag": "forge:nuggets/gold"}, - {"fluid": "create:potion", - "nbt": {"Potion": "minecraft:mundane"}, - "amount": 100} - ], - "processingTime": 400, - "results": [ - {"item": "quark:golden_frog_leg"}, - {"fluid": "create:potion", - "nbt": {"Potion": "minecraft:thick"}, - "amount": 100} - ] + onEvent('server.datapack.first', event => { + + // Thermal's Fuels + // There's gotta be a way to compact all these in a single function, but I couldn't figure it out + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/creosote`, { + "fluid": "thermal:creosote", + "sound_speed": 3, + "normal": {"speed": 64.0, "strength": 2048.0, "burn_rate": 2}, + "modular": { "speed": 32.0, "strength": 3072.0, "burn_rate": 6}, + "huge": {"speed": 32.0, "strength": 4096.0, "burn_rate": 8} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/heavy_oil`, { + "fluid": "thermal:heavy_oil", + "sound_speed": 3, + "normal": {"speed": 64.0, "strength": 2048.0, "burn_rate": 2}, + "modular": { "speed": 96.0, "strength": 6144.0, "burn_rate": 3}, + "huge": {"speed": 128.0, "strength": 12288.0, "burn_rate": 4} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/light_oil`, { + "fluid": "thermal:light_oil", + "sound_speed": 3, + "normal": {"speed": 64.0, "strength": 3072.0, "burn_rate": 2}, + "modular": { "speed": 128.0, "strength": 6144.0, "burn_rate": 3}, + "huge": {"speed": 96.0, "strength": 6144.0, "burn_rate": 6} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/refined_fuel`, { + "fluid": "#thermal:refined_fuel", + "sound_speed": 3, + "normal": {"speed": 64.0, "strength": 4096.0, "burn_rate": 1}, + "modular": { "speed": 128.0, "strength": 8192.0, "burn_rate": 2}, + "huge": {"speed": 128.0, "strength": 16384.0, "burn_rate": 4} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/tree_oil`, { + "fluid": "thermal:tree_oil", + "sound_speed": 1, + "normal": {"speed": 32.0, "strength": 1024.0, "burn_rate": 1}, + "modular": { "speed": 64.0, "strength": 2048.0, "burn_rate": 2}, + "huge": {"speed": 64.0, "strength": 3072.0, "burn_rate": 6} + }) + + // Forge's Fuel Tags + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/biodiesel`, { + "fluid": "#forge:biofuel", + "sound_speed": 3, + "normal": {"speed": 64.0, "strength": 4096.0, "burn_rate": 3}, + "modular": { "speed": 128.0, "strength": 8192.0, "burn_rate": 6}, + "huge": {"speed": 128.0, "strength": 12288.0, "burn_rate": 12} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/diesel`, { + "fluid": "#forge:diesel", + "sound_speed": 3, + "normal": {"speed": 64.0, "strength": 2048.0, "burn_rate": 2}, + "modular": { "speed": 96.0, "strength": 6144.0, "burn_rate": 3}, + "huge": {"speed": 128.0, "strength": 12288.0, "burn_rate": 4} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/ethanol`, { + "fluid": "#forge:ethanol", + "sound_speed": 2, + "normal": {"speed": 64.0, "strength": 3072.0, "burn_rate": 3}, + "modular": { "speed": 96.0, "strength": 6144.0, "burn_rate": 6}, + "huge": {"speed": 96.0, "strength": 6144.0, "burn_rate": 12} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/gasoline`, { + "fluid": "#forge:gasoline", + "sound_speed": 3, + "normal": {"speed": 64.0, "strength": 3072.0, "burn_rate": 2}, + "modular": { "speed": 128.0, "strength": 6144.0, "burn_rate": 3}, + "huge": {"speed": 96.0, "strength": 6144.0, "burn_rate": 6} + }) + event.addJson(`createdieselgenerators:diesel_engine_fuel_types/plantoil`, { + "fluid": "#forge:plantoil", + "sound_speed": 1, + "normal": {"speed": 32.0, "strength": 1024.0, "burn_rate": 1}, + "modular": { "speed": 64.0, "strength": 2048.0, "burn_rate": 2}, + "huge": {"speed": 64.0, "strength": 3072.0, "burn_rate": 6} + }) + + // Disable Beyond Earth's oil wells + event.addJson(`beyond_earth:tags/worldgen/biome/has_structure/oil_well_biomes`, { + "replace": true, "values": [] }) }) } \ No newline at end of file diff --git a/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js b/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js index 2f2a2b0..648e7f1 100644 --- a/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js +++ b/overrides/kubejs/startup_scripts/startup_compatability/createdieselgenerators.js @@ -5,19 +5,23 @@ if (Platform.isLoaded("createdieselgenerators")) { global.itemBlacklist.push("createdieselgenerators:diesel_bucket") global.itemBlacklist.push("createdieselgenerators:biodiesel_bucket") global.itemBlacklist.push("createdieselgenerators:plant_oil_bucket") + global.itemBlacklist.push("beyond_earth:oil_bucket") global.jeiFluidBlacklist.push('createdieselgenerators:crude_oil') - global.jeiFluidBlacklist.push('createdieselgenerators:flowing_crude_oil') - global.jeiFluidBlacklist.push('createdieselgenerators:gasoline') - global.jeiFluidBlacklist.push('createdieselgenerators:flowing_gasoline') - global.jeiFluidBlacklist.push('createdieselgenerators:diesel') - global.jeiFluidBlacklist.push('createdieselgenerators:flowing_diesel') - global.jeiFluidBlacklist.push('createdieselgenerators:biodiesel') - global.jeiFluidBlacklist.push('createdieselgenerators:flowing_biodiesel') - global.jeiFluidBlacklist.push('createdieselgenerators:plant_oil') - global.jeiFluidBlacklist.push('createdieselgenerators:flowing_plant_oil') - + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_crude_oil') + global.jeiFluidBlacklist.push('createdieselgenerators:gasoline') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_gasoline') + global.jeiFluidBlacklist.push('createdieselgenerators:diesel') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_diesel') + global.jeiFluidBlacklist.push('createdieselgenerators:biodiesel') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_biodiesel') + global.jeiFluidBlacklist.push('createdieselgenerators:plant_oil') + global.jeiFluidBlacklist.push('createdieselgenerators:flowing_plant_oil') + global.jeiFluidBlacklist.push('beyond_earth:oil') + global.randomiumBlacklist.push("createdieselgenerators:pumpjack_crank") + global.randomiumBlacklist.push("createdieselgenerators:pumpjack_head") + global.randomiumBlacklist.push("createdieselgenerators:pumpjack_bearing") global.randomiumBlacklist.push("createdieselgenerators:huge_diesel_engine") global.randomiumBlacklist.push("createdieselgenerators:oil_scanner") -} +} \ No newline at end of file