From ba4c3f4fe8063a344b26029e84f39dcc9330ffcc Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 15:42:45 -0400 Subject: [PATCH 01/10] Buff diesel generators and fluid fuels to be more on par with steam --- .../e0d3d0b8d9c807675613821fa865a35f707cd83f | 4 +-- .../data_maps/fluid/fluid_fuels.json | 30 +++++++--------- .../machine/RegisterMachinesEventJS.java | 3 +- .../datagen/datamap/MIDataMapProvider.java | 26 +++++++------- .../FluidItemConsumerComponent.java | 36 +++++++++++++++---- 5 files changed, 57 insertions(+), 42 deletions(-) diff --git a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f index 802c16382..0f6ac7ba5 100644 --- a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f +++ b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f @@ -1,5 +1,5 @@ -// 1.21.1 2026-07-11T20:54:51.666483018 Data Maps -0bed73c25ef1035ba7e0c0ef2e5f75192637760c data/modern_industrialization/data_maps/fluid/fluid_fuels.json +// 1.21.1 2026-07-28T15:07:34.401110774 Data Maps +9fa89cd89f0001152667e33bfdeb9b0bdacacf16 data/modern_industrialization/data_maps/fluid/fluid_fuels.json 8b10c857a5d13e25393c40f362f23c4f2e732c56 data/modern_industrialization/data_maps/item/item_pipe_upgrades.json 23379e394ae961cd4375daa6145cedb1ae9a9bc4 data/modern_industrialization/data_maps/item/item_tooltips.json 0f741bb2152a28ac007c6ad47e68950b5d367125 data/modern_industrialization/data_maps/item/machine_upgrades.json diff --git a/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json b/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json index f73b71cc4..2bbe2ef08 100644 --- a/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json +++ b/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json @@ -7,46 +7,40 @@ "modid": "immersiveengineering" } ], - "eu_per_mb": 160 + "eu_per_mb": 320 }, "modern_industrialization:biodiesel": { - "eu_per_mb": 250 + "eu_per_mb": 500 }, "modern_industrialization:boosted_diesel": { - "eu_per_mb": 800 + "eu_per_mb": 1600 }, "modern_industrialization:creosote": { - "eu_per_mb": 160 + "eu_per_mb": 320 }, "modern_industrialization:crude_oil": { - "eu_per_mb": 16 - }, - "modern_industrialization:deuterium": { - "eu_per_mb": 1 + "eu_per_mb": 32 }, "modern_industrialization:diesel": { - "eu_per_mb": 400 + "eu_per_mb": 800 }, "modern_industrialization:heavy_fuel": { - "eu_per_mb": 240 + "eu_per_mb": 480 }, "modern_industrialization:hydrogen": { - "eu_per_mb": 1 + "eu_per_mb": 2 }, "modern_industrialization:light_fuel": { - "eu_per_mb": 160 + "eu_per_mb": 320 }, "modern_industrialization:naphtha": { - "eu_per_mb": 80 + "eu_per_mb": 160 }, "modern_industrialization:raw_biodiesel": { - "eu_per_mb": 50 + "eu_per_mb": 100 }, "modern_industrialization:synthetic_oil": { - "eu_per_mb": 16 - }, - "modern_industrialization:tritium": { - "eu_per_mb": 1 + "eu_per_mb": 32 } } } \ No newline at end of file diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java b/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java index f10df6916..6a99f11f0 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java +++ b/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java @@ -336,7 +336,8 @@ public FluidItemConsumerComponent build() { return new FluidItemConsumerComponent( maxEnergyProduction, doesAcceptAllItemFuels ? FluidItemConsumerComponent.itemFuels() : itemEuProductionMapBuilder.build(), - doesAcceptAllFluidFuels ? FluidItemConsumerComponent.fluidFuels() : fluidEuProductionMapBuilder.build()); + doesAcceptAllFluidFuels ? FluidItemConsumerComponent.fluidFuels() : fluidEuProductionMapBuilder.build(), + null); } } } diff --git a/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java b/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java index 199e452be..9c529013b 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java @@ -94,21 +94,19 @@ private void addFuel(String path, int value) { } private void gatherFluidFuels() { - int creosote = 160; - - addFluidFuel(MIFluids.HYDROGEN, 1); - addFluidFuel(MIFluids.DEUTERIUM, 1); - addFluidFuel(MIFluids.TRITIUM, 1); - addFluidFuel(MIFluids.CRUDE_OIL, 16); - addFluidFuel(MIFluids.SYNTHETIC_OIL, 16); - addFluidFuel(MIFluids.RAW_BIODIESEL, 50); - addFluidFuel(MIFluids.NAPHTHA, 80); + int creosote = 320; + + addFluidFuel(MIFluids.HYDROGEN, 2); + addFluidFuel(MIFluids.CRUDE_OIL, 32); + addFluidFuel(MIFluids.SYNTHETIC_OIL, 32); + addFluidFuel(MIFluids.RAW_BIODIESEL, 100); + addFluidFuel(MIFluids.NAPHTHA, 160); addFluidFuel(MIFluids.CREOSOTE, creosote); - addFluidFuel(MIFluids.LIGHT_FUEL, 160); - addFluidFuel(MIFluids.HEAVY_FUEL, 240); - addFluidFuel(MIFluids.BIODIESEL, 250); - addFluidFuel(MIFluids.DIESEL, 400); - addFluidFuel(MIFluids.BOOSTED_DIESEL, 800); + addFluidFuel(MIFluids.LIGHT_FUEL, 320); + addFluidFuel(MIFluids.HEAVY_FUEL, 480); + addFluidFuel(MIFluids.BIODIESEL, 500); + addFluidFuel(MIFluids.DIESEL, 800); + addFluidFuel(MIFluids.BOOSTED_DIESEL, 1600); addFluidFuel(ResourceLocation.fromNamespaceAndPath("immersiveengineering", "creosote"), creosote, new ModLoadedCondition("immersiveengineering")); } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java index 4d9ee0f13..438755f79 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java @@ -33,6 +33,7 @@ import aztech.modern_industrialization.machines.MachineComponent; import aztech.modern_industrialization.util.ItemStackHelper; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.HolderLookup; @@ -42,6 +43,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.material.Fluid; +import org.jspecify.annotations.Nullable; /** * A component that turns fluids and/or item into energy. @@ -56,13 +58,17 @@ public class FluidItemConsumerComponent implements MachineComponent.ServerOnly { public final EUProductionMap itemEUProductionMap; public final EUProductionMap fluidEUProductionMap; + @Nullable + private final Function discountFunction; public FluidItemConsumerComponent(long maxEuProduction, EUProductionMap itemEUProductionMap, - EUProductionMap fluidEUProductionMap) { + EUProductionMap fluidEUProductionMap, + @Nullable Function discountFunction) { this.itemEUProductionMap = itemEUProductionMap; this.fluidEUProductionMap = fluidEUProductionMap; this.maxEuProduction = maxEuProduction; + this.discountFunction = discountFunction; } public boolean doAllowMoreThanOne() { @@ -76,16 +82,26 @@ public static FluidItemConsumerComponent ofSingleFluid(long maxEuProduction, return ofFluid(maxEuProduction, new EuProductionMapBuilder<>(BuiltInRegistries.FLUID).add(acceptedFluid.getId(), fluidEUperMb).build()); } + /** + * Fluid fuels (in Diesel Generators) are twice as efficient when producing less EU/t than its maximum, but 20% + * less efficient when producing at its maximum. + */ + private static float fluidFuelDiscount(float scalar) { + return (-1.2f * scalar) + 1f; + } + public static FluidItemConsumerComponent ofFluidFuels(long maxEuProduction) { return new FluidItemConsumerComponent(maxEuProduction, EUProductionMap.empty(), - fluidFuels()); + fluidFuels(), + FluidItemConsumerComponent::fluidFuelDiscount); } public static FluidItemConsumerComponent ofFluid(long maxEuProduction, EUProductionMap fluidEUProductionMap) { return new FluidItemConsumerComponent(maxEuProduction, EUProductionMap.empty(), - fluidEUProductionMap); + fluidEUProductionMap, + null); } @Override @@ -112,6 +128,10 @@ public long getEuProduction(List fluidInputs, return maxEuProduced; } + // Determine the fuel discount based on how full the storage is + float euProducedScale = maxEuProduced / (float) maxEuProduction; + float fuelDiscount = discountFunction != null ? discountFunction.apply(euProducedScale) : 0; + long euProduced = 0; // Consume from the buffer first @@ -122,9 +142,10 @@ public long getEuProduction(List fluidInputs, Fluid fluid = stack.getResource().getFluid(); if (fluidEUProductionMap.accept(fluid) && stack.getAmount() > 0) { long fuelEu = fluidEUProductionMap.getEuProduction(fluid); - long usedDroplets = Math.min((maxEuProduced - euProduced + fuelEu - 1) / fuelEu, stack.getAmount()); - euProduced += usedDroplets * fuelEu; - stack.decrement(usedDroplets); + long usedFluid = Math.min((maxEuProduced - euProduced + fuelEu - 1) / fuelEu, stack.getAmount()); + long euProducedByFuel = fuelEu * usedFluid; + euProduced += euProducedByFuel + Math.round(euProducedByFuel * fuelDiscount); + stack.decrement(usedFluid); if (euProduced >= maxEuProduced) { euBuffer += euProduced - maxEuProduced; @@ -139,7 +160,8 @@ public long getEuProduction(List fluidInputs, if (!itemEUProductionMap.isStandardFuels() || ItemStackHelper.consumeFuel(stack, true)) { long fuelEU = itemEUProductionMap.getEuProduction(fuel); long usedItem = Math.min((maxEuProduced - euProduced + fuelEU - 1) / fuelEU, stack.getAmount()); - euProduced += fuelEU * usedItem; + long euProducedByFuel = fuelEU * usedItem; + euProduced += euProducedByFuel + Math.round(euProducedByFuel * fuelDiscount); if (itemEUProductionMap.isStandardFuels()) { ItemStackHelper.consumeFuel(stack, false); From af92cbdfde73cf55ca754bfda6ffd1f56ce77d1a Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 16:32:49 -0400 Subject: [PATCH 02/10] Adjust formula to plateau at 0.1 and 0.9 to allow for true +100% efficiency --- .../machines/components/FluidItemConsumerComponent.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java index 438755f79..bfec363c5 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java @@ -87,7 +87,12 @@ public static FluidItemConsumerComponent ofSingleFluid(long maxEuProduction, * less efficient when producing at its maximum. */ private static float fluidFuelDiscount(float scalar) { - return (-1.2f * scalar) + 1f; + if (scalar <= 0.1f) { + return 1; + } else if (scalar >= 0.9f) { + return -0.2f; + } + return (-1.5f * scalar) + 1.15f; } public static FluidItemConsumerComponent ofFluidFuels(long maxEuProduction) { From d084efd35413a8a33c43c0ff284983b4aac0361b Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 19:25:28 -0400 Subject: [PATCH 03/10] Adjust diesel tool divisors to reflect changes with fluid fuel values --- .../modern_industrialization/items/armor/JetpackItem.java | 4 ++-- .../items/diesel_tools/DieselToolItem.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java b/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java index a85bd615b..382d9dcfe 100644 --- a/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java +++ b/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java @@ -93,12 +93,12 @@ private void tickArmor(ItemStack stack, Player player) { // Boost forward if fall flying Vec3 playerFacing = player.getLookAngle(); Vec3 playerVelocity = player.getDeltaMovement(); - double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 200.0); + double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 400.0); double attenuationFactor = 0.5; player.setDeltaMovement(playerVelocity.scale(attenuationFactor).add(playerFacing.scale(maxSpeed))); } else { // Otherwise boost vertically - double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 200.0); + double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 400.0); double acceleration = 0.25; Vec3 v = player.getDeltaMovement(); if (v.y < maxSpeed) { diff --git a/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java b/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java index 2604ac788..e48e6eb44 100644 --- a/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java +++ b/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java @@ -122,7 +122,7 @@ private float getMiningSpeedMultiplier(ItemStack stack) { FluidVariant fluid = FluidFuelItemHelper.getFluid(stack); int burnTicks = FluidFuel.getEu(fluid.getFluid()); if (burnTicks > 0) { - return 1.0f + burnTicks / 8.0f; + return 1.0f + burnTicks / 16.0f; } } return 1.0f; @@ -131,7 +131,7 @@ private float getMiningSpeedMultiplier(ItemStack stack) { @Override public ItemAttributeModifiers getDefaultAttributeModifiers(ItemStack stack) { if (FluidFuelItemHelper.getAmount(stack) > 0) { - return ItemHelper.getToolModifiers(damage * FluidFuel.getEu(FluidFuelItemHelper.getFluid(stack).getFluid()) / 600); + return ItemHelper.getToolModifiers(damage * FluidFuel.getEu(FluidFuelItemHelper.getFluid(stack).getFluid()) / 1200); } return ItemAttributeModifiers.EMPTY; } From 11cec401098c521df89d2f1bfe6313ea6d63dd9e Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 22:04:06 -0400 Subject: [PATCH 04/10] Revert generator discount function --- .../machine/RegisterMachinesEventJS.java | 3 +- .../FluidItemConsumerComponent.java | 41 ++++--------------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java b/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java index 6a99f11f0..f10df6916 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java +++ b/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java @@ -336,8 +336,7 @@ public FluidItemConsumerComponent build() { return new FluidItemConsumerComponent( maxEnergyProduction, doesAcceptAllItemFuels ? FluidItemConsumerComponent.itemFuels() : itemEuProductionMapBuilder.build(), - doesAcceptAllFluidFuels ? FluidItemConsumerComponent.fluidFuels() : fluidEuProductionMapBuilder.build(), - null); + doesAcceptAllFluidFuels ? FluidItemConsumerComponent.fluidFuels() : fluidEuProductionMapBuilder.build()); } } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java index bfec363c5..4d9ee0f13 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java @@ -33,7 +33,6 @@ import aztech.modern_industrialization.machines.MachineComponent; import aztech.modern_industrialization.util.ItemStackHelper; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.HolderLookup; @@ -43,7 +42,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.material.Fluid; -import org.jspecify.annotations.Nullable; /** * A component that turns fluids and/or item into energy. @@ -58,17 +56,13 @@ public class FluidItemConsumerComponent implements MachineComponent.ServerOnly { public final EUProductionMap itemEUProductionMap; public final EUProductionMap fluidEUProductionMap; - @Nullable - private final Function discountFunction; public FluidItemConsumerComponent(long maxEuProduction, EUProductionMap itemEUProductionMap, - EUProductionMap fluidEUProductionMap, - @Nullable Function discountFunction) { + EUProductionMap fluidEUProductionMap) { this.itemEUProductionMap = itemEUProductionMap; this.fluidEUProductionMap = fluidEUProductionMap; this.maxEuProduction = maxEuProduction; - this.discountFunction = discountFunction; } public boolean doAllowMoreThanOne() { @@ -82,31 +76,16 @@ public static FluidItemConsumerComponent ofSingleFluid(long maxEuProduction, return ofFluid(maxEuProduction, new EuProductionMapBuilder<>(BuiltInRegistries.FLUID).add(acceptedFluid.getId(), fluidEUperMb).build()); } - /** - * Fluid fuels (in Diesel Generators) are twice as efficient when producing less EU/t than its maximum, but 20% - * less efficient when producing at its maximum. - */ - private static float fluidFuelDiscount(float scalar) { - if (scalar <= 0.1f) { - return 1; - } else if (scalar >= 0.9f) { - return -0.2f; - } - return (-1.5f * scalar) + 1.15f; - } - public static FluidItemConsumerComponent ofFluidFuels(long maxEuProduction) { return new FluidItemConsumerComponent(maxEuProduction, EUProductionMap.empty(), - fluidFuels(), - FluidItemConsumerComponent::fluidFuelDiscount); + fluidFuels()); } public static FluidItemConsumerComponent ofFluid(long maxEuProduction, EUProductionMap fluidEUProductionMap) { return new FluidItemConsumerComponent(maxEuProduction, EUProductionMap.empty(), - fluidEUProductionMap, - null); + fluidEUProductionMap); } @Override @@ -133,10 +112,6 @@ public long getEuProduction(List fluidInputs, return maxEuProduced; } - // Determine the fuel discount based on how full the storage is - float euProducedScale = maxEuProduced / (float) maxEuProduction; - float fuelDiscount = discountFunction != null ? discountFunction.apply(euProducedScale) : 0; - long euProduced = 0; // Consume from the buffer first @@ -147,10 +122,9 @@ public long getEuProduction(List fluidInputs, Fluid fluid = stack.getResource().getFluid(); if (fluidEUProductionMap.accept(fluid) && stack.getAmount() > 0) { long fuelEu = fluidEUProductionMap.getEuProduction(fluid); - long usedFluid = Math.min((maxEuProduced - euProduced + fuelEu - 1) / fuelEu, stack.getAmount()); - long euProducedByFuel = fuelEu * usedFluid; - euProduced += euProducedByFuel + Math.round(euProducedByFuel * fuelDiscount); - stack.decrement(usedFluid); + long usedDroplets = Math.min((maxEuProduced - euProduced + fuelEu - 1) / fuelEu, stack.getAmount()); + euProduced += usedDroplets * fuelEu; + stack.decrement(usedDroplets); if (euProduced >= maxEuProduced) { euBuffer += euProduced - maxEuProduced; @@ -165,8 +139,7 @@ public long getEuProduction(List fluidInputs, if (!itemEUProductionMap.isStandardFuels() || ItemStackHelper.consumeFuel(stack, true)) { long fuelEU = itemEUProductionMap.getEuProduction(fuel); long usedItem = Math.min((maxEuProduced - euProduced + fuelEU - 1) / fuelEU, stack.getAmount()); - long euProducedByFuel = fuelEU * usedItem; - euProduced += euProducedByFuel + Math.round(euProducedByFuel * fuelDiscount); + euProduced += fuelEU * usedItem; if (itemEUProductionMap.isStandardFuels()) { ItemStackHelper.consumeFuel(stack, false); From efdd1f0587ee00f29095daf5a603d92649e00d31 Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 22:47:12 -0400 Subject: [PATCH 05/10] Remove 2x fluid fuel efficiency from boilers, add 2x fluid fuel efficiency to diesel generators --- .../8ad8302d110b05d7e02330dac58628134fdcff02 | 4 ++-- .../modern_industrialization/lang/en_us.json | 3 ++- .../modern_industrialization/MIText.java | 3 ++- .../machine/RegisterMachinesEventJS.java | 8 ++++++++ .../FluidItemConsumerComponent.java | 20 ++++++++++++++++--- .../components/FuelBurningComponent.java | 18 ++++++++--------- .../machines/init/MultiblockMachines.java | 2 +- .../init/SingleBlockSpecialMachines.java | 6 +++--- 8 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 b/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 index 522dd2c84..345d68773 100644 --- a/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 +++ b/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 @@ -1,2 +1,2 @@ -// 1.21.1 2026-07-11T21:21:01.779659244 Translations -1d5d4be8a7f05f6a7db0239c69ea5d070be3fbb4 assets/modern_industrialization/lang/en_us.json +// 1.21.1 2026-07-28T22:20:24.318652607 Translations +5a31367da8773bcd3aef88ebdec6bca1f2bcd6c0 assets/modern_industrialization/lang/en_us.json diff --git a/src/generated/resources/assets/modern_industrialization/lang/en_us.json b/src/generated/resources/assets/modern_industrialization/lang/en_us.json index 940570a1a..d937be3e1 100644 --- a/src/generated/resources/assets/modern_industrialization/lang/en_us.json +++ b/src/generated/resources/assets/modern_industrialization/lang/en_us.json @@ -1655,7 +1655,8 @@ "text.modern_industrialization.DirectEnergy": "Direct Energy for one capture", "text.modern_industrialization.DirectHeatByDesintegration": "Direct Heat for one capture", "text.modern_industrialization.Disabled": "Disabled", - "text.modern_industrialization.DoubleFluidFuelEfficiency": "Double efficiency! (EU x2 per fuel used)", + "text.modern_industrialization.DoubleFluidFuelEfficiency": "Double efficiency! (EU x2 per fluid fuel used)", + "text.modern_industrialization.DoubleItemFuelEfficiency": "Double efficiency! (EU x2 per item fuel used)", "text.modern_industrialization.DurabilityCost": "Durability Cost: %d", "text.modern_industrialization.EbfMaxEu": "Allows EBF recipes up to %d EU/t", "text.modern_industrialization.Efficiency": "Efficiency", diff --git a/src/main/java/aztech/modern_industrialization/MIText.java b/src/main/java/aztech/modern_industrialization/MIText.java index 4762cd02e..cacdd0329 100644 --- a/src/main/java/aztech/modern_industrialization/MIText.java +++ b/src/main/java/aztech/modern_industrialization/MIText.java @@ -97,7 +97,8 @@ public enum MIText { DirectEnergy("Direct Energy for one capture"), DirectHeatByDesintegration("Direct Heat for one capture"), Disabled("Disabled"), - DoubleFluidFuelEfficiency("Double efficiency! (EU x2 per fuel used)"), + DoubleFluidFuelEfficiency("Double efficiency! (EU x2 per fluid fuel used)"), + DoubleItemFuelEfficiency("Double efficiency! (EU x2 per item fuel used)"), DurabilityCost("Durability Cost: %d"), EbfMaxEu("Allows EBF recipes up to %d EU/t"), Efficiency("Efficiency"), diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java b/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java index f10df6916..f8c05ab75 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java +++ b/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java @@ -299,6 +299,8 @@ public void simpleGeneratorMultiBlock( public static class FluidItemConsumerBuilder { long maxEnergyProduction; + long euMultiplier; + FluidItemConsumerComponent.EuProductionMapBuilder itemEuProductionMapBuilder = new FluidItemConsumerComponent.EuProductionMapBuilder<>( BuiltInRegistries.ITEM); @@ -312,6 +314,11 @@ public FluidItemConsumerBuilder(long maxEnergyProduction) { this.maxEnergyProduction = maxEnergyProduction; } + public FluidItemConsumerBuilder euMultiplier(long euMultiplier) { + this.euMultiplier = euMultiplier; + return this; + } + public FluidItemConsumerBuilder fluidFuels() { doesAcceptAllFluidFuels = true; return this; @@ -335,6 +342,7 @@ public FluidItemConsumerBuilder item(ResourceLocation itemId, long euPerItem) { public FluidItemConsumerComponent build() { return new FluidItemConsumerComponent( maxEnergyProduction, + euMultiplier, doesAcceptAllItemFuels ? FluidItemConsumerComponent.itemFuels() : itemEuProductionMapBuilder.build(), doesAcceptAllFluidFuels ? FluidItemConsumerComponent.fluidFuels() : fluidEuProductionMapBuilder.build()); } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java index 4d9ee0f13..cc5324e76 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java @@ -54,15 +54,19 @@ public class FluidItemConsumerComponent implements MachineComponent.ServerOnly { */ public final long maxEuProduction; + protected final long euMultiplier; + public final EUProductionMap itemEUProductionMap; public final EUProductionMap fluidEUProductionMap; public FluidItemConsumerComponent(long maxEuProduction, + long euMultiplier, EUProductionMap itemEUProductionMap, EUProductionMap fluidEUProductionMap) { this.itemEUProductionMap = itemEUProductionMap; this.fluidEUProductionMap = fluidEUProductionMap; this.maxEuProduction = maxEuProduction; + this.euMultiplier = euMultiplier; } public boolean doAllowMoreThanOne() { @@ -76,14 +80,16 @@ public static FluidItemConsumerComponent ofSingleFluid(long maxEuProduction, return ofFluid(maxEuProduction, new EuProductionMapBuilder<>(BuiltInRegistries.FLUID).add(acceptedFluid.getId(), fluidEUperMb).build()); } - public static FluidItemConsumerComponent ofFluidFuels(long maxEuProduction) { + public static FluidItemConsumerComponent ofFluidFuels(long maxEuProduction, long euMultiplier) { return new FluidItemConsumerComponent(maxEuProduction, + euMultiplier, EUProductionMap.empty(), fluidFuels()); } public static FluidItemConsumerComponent ofFluid(long maxEuProduction, EUProductionMap fluidEUProductionMap) { return new FluidItemConsumerComponent(maxEuProduction, + 1, EUProductionMap.empty(), fluidEUProductionMap); } @@ -121,7 +127,7 @@ public long getEuProduction(List fluidInputs, for (ConfigurableFluidStack stack : fluidInputs) { Fluid fluid = stack.getResource().getFluid(); if (fluidEUProductionMap.accept(fluid) && stack.getAmount() > 0) { - long fuelEu = fluidEUProductionMap.getEuProduction(fluid); + long fuelEu = fluidEUProductionMap.getEuProduction(fluid) * euMultiplier; long usedDroplets = Math.min((maxEuProduced - euProduced + fuelEu - 1) / fuelEu, stack.getAmount()); euProduced += usedDroplets * fuelEu; stack.decrement(usedDroplets); @@ -137,7 +143,7 @@ public long getEuProduction(List fluidInputs, Item fuel = stack.getResource().getItem(); if (itemEUProductionMap.accept(fuel) && stack.getAmount() > 0) { if (!itemEUProductionMap.isStandardFuels() || ItemStackHelper.consumeFuel(stack, true)) { - long fuelEU = itemEUProductionMap.getEuProduction(fuel); + long fuelEU = itemEUProductionMap.getEuProduction(fuel) * euMultiplier; long usedItem = Math.min((maxEuProduced - euProduced + fuelEU - 1) / fuelEU, stack.getAmount()); euProduced += fuelEU * usedItem; @@ -185,6 +191,10 @@ public List getTooltips() { } } + if (euMultiplier == 2) { + returnList.add( + new MITooltips.Line(MIText.DoubleFluidFuelEfficiency).build()); + } } if (this.itemEUProductionMap.getNumberOfFuel() != NumberOfFuel.NONE) { @@ -206,6 +216,10 @@ public List getTooltips() { } } + if (euMultiplier == 2) { + returnList.add( + new MITooltips.Line(MIText.DoubleItemFuelEfficiency).build()); + } } return returnList; diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java index 0016d7ac5..99cd37fc8 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java @@ -52,7 +52,7 @@ public class FuelBurningComponent implements MachineComponent { * Multiplier on the efficiency of the boiler, i.e. the number of EUs produced * per burn tick. */ - private final long burningEuMultiplier; + private final long burningItemEuMultiplier; /** * How many EUs one furnace burn tick is worth. Remembering that 1 furnace @@ -70,19 +70,19 @@ public class FuelBurningComponent implements MachineComponent { */ private long burningItemTotalEu; - public FuelBurningComponent(TemperatureComponent temperature, long maxEuProduction, long euPerDegree, long burningEuMultiplier) { + public FuelBurningComponent(TemperatureComponent temperature, long maxEuProduction, long euPerDegree, long burningItemEuMultiplier) { this.temperature = temperature; this.maxEuProduction = maxEuProduction; this.euPerDegree = euPerDegree; - this.burningEuMultiplier = burningEuMultiplier; + this.burningItemEuMultiplier = burningItemEuMultiplier; } public FuelBurningComponent(TemperatureComponent temperature, long maxEuProduction, long euPerDegree) { this(temperature, maxEuProduction, euPerDegree, 1); } - public FuelBurningComponent(SteamHeaterComponent steamHeater, long burningEuMultiplier) { - this(steamHeater, steamHeater.maxEuProduction, steamHeater.euPerDegree, burningEuMultiplier); + public FuelBurningComponent(SteamHeaterComponent steamHeater, long burningItemEuMultiplier) { + this(steamHeater, steamHeater.maxEuProduction, steamHeater.euPerDegree, burningItemEuMultiplier); } public FuelBurningComponent(SteamHeaterComponent steamHeater) { @@ -132,7 +132,7 @@ public void tick(List itemInputs, List 0) { - long fuelTotalEu = fuelTime * EU_PER_BURN_TICK * burningEuMultiplier; + long fuelTotalEu = fuelTime * EU_PER_BURN_TICK * burningItemEuMultiplier; burningEuBuffer += fuelTotalEu; burningItemTotalEu = fuelTotalEu; ItemStackHelper.consumeFuel(stack, false); @@ -148,7 +148,7 @@ public void tick(List itemInputs, List getTooltips() { .arg(MIFluids.STEAM) .build()); - if (burningEuMultiplier == 2) { + if (burningItemEuMultiplier == 2) { returnList.add( - new MITooltips.Line(MIText.DoubleFluidFuelEfficiency).build()); + new MITooltips.Line(MIText.DoubleItemFuelEfficiency).build()); } return returnList; diff --git a/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java b/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java index 5f2b8752c..2e6a48b34 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java @@ -311,7 +311,7 @@ private static void largeDieselGenerator() { "large_diesel_generator", bet -> new GeneratorMultiblockBlockEntity(bet, "large_diesel_generator", largeDieselGeneratorShape, - FluidItemConsumerComponent.ofFluidFuels(16384))); + FluidItemConsumerComponent.ofFluidFuels(16384, 2))); ReiMachineRecipes.registerMultiblockShape("large_diesel_generator", largeDieselGeneratorShape); } diff --git a/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockSpecialMachines.java b/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockSpecialMachines.java index 37ce87e00..b96c157a0 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockSpecialMachines.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockSpecialMachines.java @@ -64,19 +64,19 @@ public static void init() { MachineRegistrationHelper.registerMachine("LV Diesel Generator", "lv_diesel_generator", bet -> new GeneratorMachineBlockEntity(bet, "lv_diesel_generator", false, CableTier.LV, 4000, 16000, - FluidItemConsumerComponent.ofFluidFuels(64)), + FluidItemConsumerComponent.ofFluidFuels(64, 2)), MachineBlockEntity::registerFluidApi, GeneratorMachineBlockEntity::registerEnergyApi); MachineRegistrationHelper.registerMachine("MV Diesel Generator", "mv_diesel_generator", bet -> new GeneratorMachineBlockEntity(bet, "mv_diesel_generator", false, CableTier.MV, 12000, 32000, - FluidItemConsumerComponent.ofFluidFuels(256)), + FluidItemConsumerComponent.ofFluidFuels(256, 2)), MachineBlockEntity::registerFluidApi, GeneratorMachineBlockEntity::registerEnergyApi); MachineRegistrationHelper.registerMachine("HV Diesel Generator", "hv_diesel_generator", bet -> new GeneratorMachineBlockEntity(bet, "hv_diesel_generator", false, CableTier.HV, 60000, 64000, - FluidItemConsumerComponent.ofFluidFuels(1024)), + FluidItemConsumerComponent.ofFluidFuels(1024, 2)), MachineBlockEntity::registerFluidApi, GeneratorMachineBlockEntity::registerEnergyApi); MachineRegistrationHelper.registerMachine("Configurable Chest", "configurable_chest", ConfigurableChestMachineBlockEntity::new, From f1cd50bf6baeae6f7caa4305a744a163b4ecd029 Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 23:07:14 -0400 Subject: [PATCH 06/10] Tweak large diesel generator and large steam turbine recipes to both be more reasonable and consistently EV tier --- .../4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 | 78 +++++++++---------- .../machine/large_diesel_generator.json | 4 +- .../machine/large_steam_turbine.json | 12 ++- .../machine/large_diesel_generator_asbl.json | 4 +- .../machine/large_steam_turbine_asbl.json | 12 ++- 5 files changed, 62 insertions(+), 48 deletions(-) diff --git a/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 b/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 index d114ba4ea..9c6a6ba20 100644 --- a/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 +++ b/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 @@ -1,4 +1,4 @@ -// 1.21.1 2025-10-17T22:04:47.2462839 Server Data (aggregated) +// 1.21.1 2026-07-28T23:04:29.00107507 Server Data (aggregated) 3ed44658dfe9569ce8f176ca3f3c3c82fe6feeaa data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json 17019fa80e9403e189de444bc671ebd0e01cd445 data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json 4f16b34fe53d232383c92af163f2227351f88801 data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json @@ -109,9 +109,9 @@ d3b221f6d816fe56e6da73b749596059ad0f3bb4 data/modern_industrialization/recipe/as 96fa7afe0a77dc32ebb36325fd1ae9fb9b8e6d2d data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json 317706a8875aaacb912e648ecbfa9ed110e27400 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json 312ea17d4038e83b9127ce98537d0e620ae3515c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json -a2391a11890dd94b6bc8ab14bba6afe08970e75e data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json +88397f158610144a6351a5897f16aa1575756acb data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json 6061a5c9d59bb515163b4da8316f9104aa45d38c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json -09fbc58fe47aabc572679196e87c1cefc6da42c1 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json +ab234f54169128f5c7c057e89c133b151026793c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json 995c6b0e673b7ba571b410715a93e5b45d85534f data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json d68150754e49823b2de81e8df4f995e5fed1fdd0 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank_hatch.json 88c7953eded128f7b0963994194da138a908e61e data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_diesel_generator.json @@ -263,10 +263,10 @@ c930b0bcd5591e7b2750a0c8ab4ff72ab907f880 data/modern_industrialization/recipe/co 79d6c5ec93c1fe2fa445dc3d8bbf69ee08f5cbf7 data/modern_industrialization/recipe/compat/ae2/electrolyzer/ae2_certus_quartz_crystal_to_ae2_charged_certus_quartz_crystal.json 46a45848d9bdf6ea60fcf62022a562708665bbd5 data/modern_industrialization/recipe/compat/ae2/engineering_processor.json 40e89252a241ba1a8288fb420a5dca8c176bce24 data/modern_industrialization/recipe/compat/ae2/logic_processor.json +aa2e177f5a1748b48dea2843d46a966cfc3d37a6 data/modern_industrialization/recipe/compat/ae2/macerator/_c_gems_certus_quartz_to_ae2_certus_quartz_dust.json 91f10388ef054ecc3468ec6902fdde0e3d280fc1 data/modern_industrialization/recipe/compat/ae2/macerator/ae2_fluix_crystal_to_ae2_fluix_dust.json 82078617c7b24bd779f87711c1f8a6edeec5e913 data/modern_industrialization/recipe/compat/ae2/macerator/ae2_sky_stone_block_to_ae2_sky_dust.json 0fac4b99c3b308919d8b5e9f08589c7b0a5e4001 data/modern_industrialization/recipe/compat/ae2/macerator/minecraft_ender_pearl_to_ae2_ender_dust.json -aa2e177f5a1748b48dea2843d46a966cfc3d37a6 data/modern_industrialization/recipe/compat/ae2/macerator/_c_gems_certus_quartz_to_ae2_certus_quartz_dust.json b122e9e9cd48131a3f2937e6a2754c0ced951b88 data/modern_industrialization/recipe/compat/ae2/mixer/fluix.json 140146e63399c1d43ceb887890a7e0d08ecdf20b data/modern_industrialization/recipe/compat/ae2/printed_calculation_processor.json 49d9e6327a492f6bb62907d1d4c2842963a67101 data/modern_industrialization/recipe/compat/ae2/printed_engineering_processor.json @@ -1586,41 +1586,6 @@ c01eaaaea292f745f4614dc1461e0680b17eacae data/modern_industrialization/recipe/ma b605d0111af143adc3b79f72b7b8fc6e8844fec1 data/modern_industrialization/recipe/materials/lapis/packer/dust.json 2cfdb1226cadd7446a7a78ca2c45fe24687a52a9 data/modern_industrialization/recipe/materials/lapis/unpacker/gem.json b99f30a83d9d9baf9c673ddeeb6265522fa4d965 data/modern_industrialization/recipe/materials/lapis/unpacker/tiny_dust.json -43c7377599df668da5876abe0f49089460f78dbf data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json -1a4bbb2e97b9cce2394e1d33d2333fa9c9bbc330 data/modern_industrialization/recipe/materials/lead/compressor/main.json -b877d99645c9ca69e4aaece29e3493dae41899ad data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json -718b9bf66decade4fd3d4c4cf0abd6bfb77b1f68 data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json -1f9b150870e35269620fe7a2a22365e26c9e3066 data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json -c7aab170fb33bdb7d46cb3700d0c2be4b50fc8a3 data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json -da71498c412256a1fa39bd7f27680afb471e746b data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json -8c4427da15cfb023bd3429022d64efdca25dddda data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json -24e6b3cae5ae6e7da202c26d0613565fce058326 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json -1945001e03fe97bf90bba394fcb14d6504470b93 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json -eff66069854abd6fee946ac09b984954d5152e47 data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json -0d75f304df91b925e9bfbd0231acd43b4331d861 data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json -86582629f1de49cb3b43e363956099e0d1915ff8 data/modern_industrialization/recipe/materials/lead/macerator/ingot.json -ecf2b3a0f78350b9bd08c688f7af790e8280973e data/modern_industrialization/recipe/materials/lead/macerator/nugget.json -45e4369364924d842c205697d75082a29ee93966 data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json -86e15120d8312db1db774df3f77e05416d73f0a1 data/modern_industrialization/recipe/materials/lead/macerator/plate.json -cc12b93ff29f48db02924544ea567920a7ba767f data/modern_industrialization/recipe/materials/lead/packer/block.json -de911d4f5de7017a8998330aae7090bf07cce819 data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json -68749b7530bd52c1ff00887e8c3566020395ed69 data/modern_industrialization/recipe/materials/lead/packer/dust.json -c1c8d1c6fc90ad37b4ac5e09b87b9fc05c33879b data/modern_industrialization/recipe/materials/lead/packer/ingot.json -97a4c61e7e173d2584900110c3e63b04ad724530 data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json -457122d5b59aac6bb39eb7af5185c27b173e8a9a data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json -4c7d60b8606b568a3b29bd37d3c19a9903c5280d data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json -9237a79c06a40796af3fb5b18bbb1637c772e8d0 data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json -2d4cd53e4352908a6e6afdcb1d3f29b6e21982a6 data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json -060e6d1f8929f84ba2e8d9685551d828884671f9 data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json -665045466a93cd738ac4a6fc4b5efb4b89acde11 data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json -a63cc0017f838723df4e23fe2a76364473ae2d86 data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json -dddc08160e75a7d3bc97a3dd74750334e1bd28b0 data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json -c478375698e2489ce9aae4ba8abcea52cf1ec3bf data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json -e8c3698be9285630db8fabd28af713bc2621d839 data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json -dfe6d9f29ceca63210599b7a64c1c64e116d33fd data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json -63774a6846d6ee946caa07cd2711acd9bb775c9a data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json -aebb86e1b9a914da7a6fd2d6d5b2b3f1457ef392 data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json -57824124449950db1d739f6afcdc80bd63ac3f90 data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json 54a24d0073fca5090fbd7e0c94622597795769c0 data/modern_industrialization/recipe/materials/le_mox/assembler/fuel_rod.json fc036654d5e504066a5b8eb722925b7859808444 data/modern_industrialization/recipe/materials/le_mox/blast_furnace/dust.json 8dccf56113495121c6a2b681905bdd776fa3feed data/modern_industrialization/recipe/materials/le_mox/blast_furnace/tiny_dust.json @@ -1663,6 +1628,41 @@ f9a088c24b767d2dc9ed8ba50911cdaadd947b84 data/modern_industrialization/recipe/ma 45126bbb351179774bb773231ad7abebcdab050c data/modern_industrialization/recipe/materials/le_uranium/unpacker/ingot.json 6b9cff3b427d7ca78cb0b185958869537952884f data/modern_industrialization/recipe/materials/le_uranium/unpacker/nugget.json d807e1dac58695735b5f9cf78752cd7bf3d1933b data/modern_industrialization/recipe/materials/le_uranium/unpacker/tiny_dust.json +43c7377599df668da5876abe0f49089460f78dbf data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json +1a4bbb2e97b9cce2394e1d33d2333fa9c9bbc330 data/modern_industrialization/recipe/materials/lead/compressor/main.json +b877d99645c9ca69e4aaece29e3493dae41899ad data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json +718b9bf66decade4fd3d4c4cf0abd6bfb77b1f68 data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json +1f9b150870e35269620fe7a2a22365e26c9e3066 data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json +c7aab170fb33bdb7d46cb3700d0c2be4b50fc8a3 data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json +da71498c412256a1fa39bd7f27680afb471e746b data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json +8c4427da15cfb023bd3429022d64efdca25dddda data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json +24e6b3cae5ae6e7da202c26d0613565fce058326 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json +1945001e03fe97bf90bba394fcb14d6504470b93 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json +eff66069854abd6fee946ac09b984954d5152e47 data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json +0d75f304df91b925e9bfbd0231acd43b4331d861 data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json +86582629f1de49cb3b43e363956099e0d1915ff8 data/modern_industrialization/recipe/materials/lead/macerator/ingot.json +ecf2b3a0f78350b9bd08c688f7af790e8280973e data/modern_industrialization/recipe/materials/lead/macerator/nugget.json +45e4369364924d842c205697d75082a29ee93966 data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json +86e15120d8312db1db774df3f77e05416d73f0a1 data/modern_industrialization/recipe/materials/lead/macerator/plate.json +cc12b93ff29f48db02924544ea567920a7ba767f data/modern_industrialization/recipe/materials/lead/packer/block.json +de911d4f5de7017a8998330aae7090bf07cce819 data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json +68749b7530bd52c1ff00887e8c3566020395ed69 data/modern_industrialization/recipe/materials/lead/packer/dust.json +c1c8d1c6fc90ad37b4ac5e09b87b9fc05c33879b data/modern_industrialization/recipe/materials/lead/packer/ingot.json +97a4c61e7e173d2584900110c3e63b04ad724530 data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json +457122d5b59aac6bb39eb7af5185c27b173e8a9a data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json +4c7d60b8606b568a3b29bd37d3c19a9903c5280d data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json +9237a79c06a40796af3fb5b18bbb1637c772e8d0 data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json +2d4cd53e4352908a6e6afdcb1d3f29b6e21982a6 data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json +060e6d1f8929f84ba2e8d9685551d828884671f9 data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json +665045466a93cd738ac4a6fc4b5efb4b89acde11 data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json +a63cc0017f838723df4e23fe2a76364473ae2d86 data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json +dddc08160e75a7d3bc97a3dd74750334e1bd28b0 data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json +c478375698e2489ce9aae4ba8abcea52cf1ec3bf data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json +e8c3698be9285630db8fabd28af713bc2621d839 data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json +dfe6d9f29ceca63210599b7a64c1c64e116d33fd data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json +63774a6846d6ee946caa07cd2711acd9bb775c9a data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json +aebb86e1b9a914da7a6fd2d6d5b2b3f1457ef392 data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json +57824124449950db1d739f6afcdc80bd63ac3f90 data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json 8c4d56ea084cb7beb6ec5cbab27c87238ce74547 data/modern_industrialization/recipe/materials/lignite_coal/compressor/lignite_coal.json e65c190aa3e06fcf7e81767018c0c57daa413251 data/modern_industrialization/recipe/materials/lignite_coal/craft/block_from_gem.json d1e4038a88e04eef99f35de2fccc84c5e3fd6794 data/modern_industrialization/recipe/materials/lignite_coal/craft/deepslate_to_ore.json diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json index eb1751afe..01031575c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json @@ -5,7 +5,7 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:large_advanced_pump" + "item": "modern_industrialization:advanced_pump" }, { "amount": 1, @@ -21,7 +21,7 @@ }, { "amount": 2, - "item": "modern_industrialization:large_advanced_motor" + "item": "modern_industrialization:advanced_motor" }, { "amount": 1, diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json index 681677ea3..892f0b53a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json @@ -4,7 +4,7 @@ "eu": 8, "item_inputs": [ { - "amount": 4, + "amount": 1, "item": "modern_industrialization:hv_steam_turbine" }, { @@ -13,7 +13,15 @@ }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "item": "modern_industrialization:processing_unit" + }, + { + "amount": 2, + "item": "modern_industrialization:advanced_motor" + }, + { + "amount": 1, + "item": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 2, diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json index e40c9d5e8..a3d12f1dd 100644 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json +++ b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json @@ -7,7 +7,7 @@ ], "key": { "p" : { - "item" : "modern_industrialization:large_advanced_pump" + "item" : "modern_industrialization:advanced_pump" }, "H" : { "item" : "modern_industrialization:highly_advanced_machine_hull" @@ -19,7 +19,7 @@ "item" : "modern_industrialization:titanium_gear" }, "m" : { - "item" : "modern_industrialization:large_advanced_motor" + "item" : "modern_industrialization:advanced_motor" }, "e" : { "item" : "modern_industrialization:hv_diesel_generator" diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json index 9d8cb1304..61be37ff2 100644 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json +++ b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json @@ -1,9 +1,9 @@ { "type" : "minecraft:crafting_shaped", "pattern" : [ - "tpt", + "pcp", "RHR", - "tpt" + "mtm" ], "key": { @@ -13,8 +13,14 @@ "p" : { "item" : "modern_industrialization:advanced_pump" }, + "c" : { + "item" : "modern_industrialization:processing_unit" + }, + "m" : { + "item" : "modern_industrialization:advanced_motor" + }, "H" :{ - "item" : "modern_industrialization:turbo_machine_hull" + "item" : "modern_industrialization:highly_advanced_machine_hull" }, "R" : { "item" : "modern_industrialization:stainless_steel_rotor" From d79f37b9faf172d706a70b68042778012cda83b2 Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 23:12:41 -0400 Subject: [PATCH 07/10] Clean up jsons --- .../4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 | 4 ++-- .../machine/large_diesel_generator.json | 18 +++++++++--------- .../machine/large_diesel_generator_asbl.json | 19 +++++++++---------- .../machine/large_steam_turbine_asbl.json | 4 +--- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 b/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 index 9c6a6ba20..795c617c5 100644 --- a/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 +++ b/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 @@ -1,4 +1,4 @@ -// 1.21.1 2026-07-28T23:04:29.00107507 Server Data (aggregated) +// 1.21.1 2026-07-28T23:12:16.157715658 Server Data (aggregated) 3ed44658dfe9569ce8f176ca3f3c3c82fe6feeaa data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json 17019fa80e9403e189de444bc671ebd0e01cd445 data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json 4f16b34fe53d232383c92af163f2227351f88801 data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json @@ -109,7 +109,7 @@ d3b221f6d816fe56e6da73b749596059ad0f3bb4 data/modern_industrialization/recipe/as 96fa7afe0a77dc32ebb36325fd1ae9fb9b8e6d2d data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json 317706a8875aaacb912e648ecbfa9ed110e27400 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json 312ea17d4038e83b9127ce98537d0e620ae3515c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json -88397f158610144a6351a5897f16aa1575756acb data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json +46cd36f65c5b3000b27f1195826494adc7c8b007 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json 6061a5c9d59bb515163b4da8316f9104aa45d38c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json ab234f54169128f5c7c057e89c133b151026793c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json 995c6b0e673b7ba571b410715a93e5b45d85534f data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json index 01031575c..4206621d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json @@ -4,28 +4,28 @@ "eu": 8, "item_inputs": [ { - "amount": 2, - "item": "modern_industrialization:advanced_pump" + "amount": 1, + "item": "modern_industrialization:hv_diesel_generator" }, { - "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "amount": 2, + "item": "modern_industrialization:advanced_pump" }, { "amount": 1, "item": "modern_industrialization:processing_unit" }, - { - "amount": 2, - "item": "modern_industrialization:titanium_gear" - }, { "amount": 2, "item": "modern_industrialization:advanced_motor" }, { "amount": 1, - "item": "modern_industrialization:hv_diesel_generator" + "item": "modern_industrialization:highly_advanced_machine_hull" + }, + { + "amount": 2, + "item": "modern_industrialization:titanium_gear" } ], "item_outputs": [ diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json index a3d12f1dd..bf57b982f 100644 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json +++ b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json @@ -3,28 +3,27 @@ "pattern" : [ "pcp", "GHG", - "mem" + "mgm" ], "key": { + "g": { + "item" : "modern_industrialization:hv_diesel_generator" + }, "p" : { "item" : "modern_industrialization:advanced_pump" }, - "H" : { - "item" : "modern_industrialization:highly_advanced_machine_hull" - }, "c" : { "item" : "modern_industrialization:processing_unit" }, - "G":{ - "item" : "modern_industrialization:titanium_gear" - }, "m" : { "item" : "modern_industrialization:advanced_motor" }, - "e" : { - "item" : "modern_industrialization:hv_diesel_generator" + "H" :{ + "item" : "modern_industrialization:highly_advanced_machine_hull" + }, + "G" : { + "item" : "modern_industrialization:titanium_gear" } - }, "result": { "id": "modern_industrialization:large_diesel_generator" diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json index 61be37ff2..35d68c335 100644 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json +++ b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json @@ -5,8 +5,7 @@ "RHR", "mtm" ], - "key": - { + "key": { "t": { "item" : "modern_industrialization:hv_steam_turbine" }, @@ -26,7 +25,6 @@ "item" : "modern_industrialization:stainless_steel_rotor" } }, - "result": { "id": "modern_industrialization:large_steam_turbine" } From 0c5f6166e65f11d681b09e8290ad0d94aa6a542c Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 23:21:20 -0400 Subject: [PATCH 08/10] Fix GeneratorTests game test --- .../modern_industrialization/test/GeneratorTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java b/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java index 44bb26d61..5c0f1a8f4 100644 --- a/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java +++ b/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java @@ -53,12 +53,12 @@ public void testGeneratorEmptiesEuBuffer(MIGameTestHelper helper) { tx.commit(); } - // Should produce 64 per tick: 192 after 3 ticks and only 250 (the biodiesel value) after 4 ticks + // Should produce 64 per tick: 960 after 15 ticks and only 1000 (2x the biodiesel value) after 16 ticks helper.startSequence() - .thenIdle(3) - .thenExecute(() -> helper.assertEnergy(generatorPos, 192, Direction.NORTH)) + .thenIdle(15) + .thenExecute(() -> helper.assertEnergy(generatorPos, 960, Direction.NORTH)) .thenIdle(1) - .thenExecute(() -> helper.assertEnergy(generatorPos, 250, Direction.NORTH)) + .thenExecute(() -> helper.assertEnergy(generatorPos, 1000, Direction.NORTH)) .thenSucceed(); } } From db670c1eb4c5236522ea995265593531a7022c18 Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 23:50:47 -0400 Subject: [PATCH 09/10] Revert fluid fuel eu/mb changes --- .../e0d3d0b8d9c807675613821fa865a35f707cd83f | 4 ++-- .../data_maps/fluid/fluid_fuels.json | 22 +++++++++---------- .../datagen/datamap/MIDataMapProvider.java | 20 ++++++++--------- .../items/armor/JetpackItem.java | 4 ++-- .../items/diesel_tools/DieselToolItem.java | 4 ++-- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f index 0f6ac7ba5..25e05d7ff 100644 --- a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f +++ b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f @@ -1,5 +1,5 @@ -// 1.21.1 2026-07-28T15:07:34.401110774 Data Maps -9fa89cd89f0001152667e33bfdeb9b0bdacacf16 data/modern_industrialization/data_maps/fluid/fluid_fuels.json +// 1.21.1 2026-07-28T23:41:36.734170783 Data Maps +510b30fe7835dc474a0193ba48123cbadceb241d data/modern_industrialization/data_maps/fluid/fluid_fuels.json 8b10c857a5d13e25393c40f362f23c4f2e732c56 data/modern_industrialization/data_maps/item/item_pipe_upgrades.json 23379e394ae961cd4375daa6145cedb1ae9a9bc4 data/modern_industrialization/data_maps/item/item_tooltips.json 0f741bb2152a28ac007c6ad47e68950b5d367125 data/modern_industrialization/data_maps/item/machine_upgrades.json diff --git a/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json b/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json index 2bbe2ef08..1fe2cfb9d 100644 --- a/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json +++ b/src/generated/resources/data/modern_industrialization/data_maps/fluid/fluid_fuels.json @@ -7,40 +7,40 @@ "modid": "immersiveengineering" } ], - "eu_per_mb": 320 + "eu_per_mb": 160 }, "modern_industrialization:biodiesel": { - "eu_per_mb": 500 + "eu_per_mb": 250 }, "modern_industrialization:boosted_diesel": { - "eu_per_mb": 1600 + "eu_per_mb": 800 }, "modern_industrialization:creosote": { - "eu_per_mb": 320 + "eu_per_mb": 160 }, "modern_industrialization:crude_oil": { - "eu_per_mb": 32 + "eu_per_mb": 16 }, "modern_industrialization:diesel": { - "eu_per_mb": 800 + "eu_per_mb": 400 }, "modern_industrialization:heavy_fuel": { - "eu_per_mb": 480 + "eu_per_mb": 240 }, "modern_industrialization:hydrogen": { "eu_per_mb": 2 }, "modern_industrialization:light_fuel": { - "eu_per_mb": 320 + "eu_per_mb": 160 }, "modern_industrialization:naphtha": { - "eu_per_mb": 160 + "eu_per_mb": 80 }, "modern_industrialization:raw_biodiesel": { - "eu_per_mb": 100 + "eu_per_mb": 50 }, "modern_industrialization:synthetic_oil": { - "eu_per_mb": 32 + "eu_per_mb": 16 } } } \ No newline at end of file diff --git a/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java b/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java index 9c529013b..2d02faa00 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java @@ -94,19 +94,19 @@ private void addFuel(String path, int value) { } private void gatherFluidFuels() { - int creosote = 320; + int creosote = 160; addFluidFuel(MIFluids.HYDROGEN, 2); - addFluidFuel(MIFluids.CRUDE_OIL, 32); - addFluidFuel(MIFluids.SYNTHETIC_OIL, 32); - addFluidFuel(MIFluids.RAW_BIODIESEL, 100); - addFluidFuel(MIFluids.NAPHTHA, 160); + addFluidFuel(MIFluids.CRUDE_OIL, 16); + addFluidFuel(MIFluids.SYNTHETIC_OIL, 16); + addFluidFuel(MIFluids.RAW_BIODIESEL, 50); + addFluidFuel(MIFluids.NAPHTHA, 80); addFluidFuel(MIFluids.CREOSOTE, creosote); - addFluidFuel(MIFluids.LIGHT_FUEL, 320); - addFluidFuel(MIFluids.HEAVY_FUEL, 480); - addFluidFuel(MIFluids.BIODIESEL, 500); - addFluidFuel(MIFluids.DIESEL, 800); - addFluidFuel(MIFluids.BOOSTED_DIESEL, 1600); + addFluidFuel(MIFluids.LIGHT_FUEL, 160); + addFluidFuel(MIFluids.HEAVY_FUEL, 240); + addFluidFuel(MIFluids.BIODIESEL, 250); + addFluidFuel(MIFluids.DIESEL, 400); + addFluidFuel(MIFluids.BOOSTED_DIESEL, 800); addFluidFuel(ResourceLocation.fromNamespaceAndPath("immersiveengineering", "creosote"), creosote, new ModLoadedCondition("immersiveengineering")); } diff --git a/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java b/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java index 382d9dcfe..a85bd615b 100644 --- a/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java +++ b/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java @@ -93,12 +93,12 @@ private void tickArmor(ItemStack stack, Player player) { // Boost forward if fall flying Vec3 playerFacing = player.getLookAngle(); Vec3 playerVelocity = player.getDeltaMovement(); - double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 400.0); + double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 200.0); double attenuationFactor = 0.5; player.setDeltaMovement(playerVelocity.scale(attenuationFactor).add(playerFacing.scale(maxSpeed))); } else { // Otherwise boost vertically - double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 400.0); + double maxSpeed = Math.sqrt(FluidFuel.getEu(fluid.getFluid()) / 200.0); double acceleration = 0.25; Vec3 v = player.getDeltaMovement(); if (v.y < maxSpeed) { diff --git a/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java b/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java index e48e6eb44..2604ac788 100644 --- a/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java +++ b/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java @@ -122,7 +122,7 @@ private float getMiningSpeedMultiplier(ItemStack stack) { FluidVariant fluid = FluidFuelItemHelper.getFluid(stack); int burnTicks = FluidFuel.getEu(fluid.getFluid()); if (burnTicks > 0) { - return 1.0f + burnTicks / 16.0f; + return 1.0f + burnTicks / 8.0f; } } return 1.0f; @@ -131,7 +131,7 @@ private float getMiningSpeedMultiplier(ItemStack stack) { @Override public ItemAttributeModifiers getDefaultAttributeModifiers(ItemStack stack) { if (FluidFuelItemHelper.getAmount(stack) > 0) { - return ItemHelper.getToolModifiers(damage * FluidFuel.getEu(FluidFuelItemHelper.getFluid(stack).getFluid()) / 1200); + return ItemHelper.getToolModifiers(damage * FluidFuel.getEu(FluidFuelItemHelper.getFluid(stack).getFluid()) / 600); } return ItemAttributeModifiers.EMPTY; } From 1f16ec66c5a5382d56a9d5fd84381d27a9d2675c Mon Sep 17 00:00:00 2001 From: Swedz Date: Tue, 28 Jul 2026 23:52:36 -0400 Subject: [PATCH 10/10] Fix GeneratorTests again --- .../modern_industrialization/test/GeneratorTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java b/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java index 5c0f1a8f4..68d3cf00c 100644 --- a/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java +++ b/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java @@ -53,12 +53,12 @@ public void testGeneratorEmptiesEuBuffer(MIGameTestHelper helper) { tx.commit(); } - // Should produce 64 per tick: 960 after 15 ticks and only 1000 (2x the biodiesel value) after 16 ticks + // Should produce 64 per tick: 448 after 7 ticks and only 500 (2x the biodiesel value) after 8 ticks helper.startSequence() - .thenIdle(15) - .thenExecute(() -> helper.assertEnergy(generatorPos, 960, Direction.NORTH)) + .thenIdle(7) + .thenExecute(() -> helper.assertEnergy(generatorPos, 448, Direction.NORTH)) .thenIdle(1) - .thenExecute(() -> helper.assertEnergy(generatorPos, 1000, Direction.NORTH)) + .thenExecute(() -> helper.assertEnergy(generatorPos, 500, Direction.NORTH)) .thenSucceed(); } }