Increase electric pump buffer, fix steam machines

AztechMC · Jun 7, 2021 · e00ce71 · e00ce71
1 parent 3e58091
commit e00ce71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/aztech/modern_industrialization/blocks/tank/TankRenderer.java b/src/main/java/aztech/modern_industrialization/blocks/tank/TankRenderer.java
@@ -28,7 +28,6 @@
 import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.fluid.Fluids;
 
 public class TankRenderer extends BlockEntityRenderer<TankBlockEntity> {
     public TankRenderer(BlockEntityRenderDispatcher dispatcher) {
@@ -38,7 +37,7 @@ public TankRenderer(BlockEntityRenderDispatcher dispatcher) {
     @Override
     public void render(TankBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
             int overlay) {
-        if (entity.fluid != Fluids.EMPTY && entity.amount > 0) {
+        if (!entity.fluid.isEmpty() && entity.amount > 0) {
             RenderHelper.drawFluidInTank(matrices, vertexConsumers, entity.fluid, (float) entity.amount / entity.capacity);
         }
     }

diff --git a/.../aztech/modern_industrialization/machines/blockentities/ElectricWaterPumpBlockEntity.java b/.../aztech/modern_industrialization/machines/blockentities/ElectricWaterPumpBlockEntity.java
@@ -42,7 +42,7 @@ public class ElectricWaterPumpBlockEntity extends AbstractWaterPumpBlockEntity {
     public ElectricWaterPumpBlockEntity(BlockEntityType<?> type) {
         super(type, "lv_water_pump");
 
-        long capacity = 81000 * MITanks.BRONZE.bucketCapacity * 4;
+        long capacity = 81000 * MITanks.BRONZE.bucketCapacity * 8;
         this.inventory = new MIInventory(Collections.emptyList(),
                 Collections.singletonList(ConfigurableFluidStack.lockedOutputSlot(capacity, Fluids.WATER)), SlotPositions.empty(),
                 new SlotPositions.Builder().addSlot(OUTPUT_SLOT_X, OUTPUT_SLOT_Y).build());

diff --git a/src/main/java/aztech/modern_industrialization/machines/helper/SteamHelper.java b/src/main/java/aztech/modern_industrialization/machines/helper/SteamHelper.java
@@ -35,7 +35,7 @@ public static long consumeSteamEu(List<ConfigurableFluidStack> fluidStacks, long
 
         long totalRem = 0;
         for (ConfigurableFluidStack stack : fluidStacks) {
-            if (stack.getFluid() == MIFluids.STEAM) {
+            if (stack.getFluid().getFluid() == MIFluids.STEAM) {
                 long amount = stack.getAmount();
                 long rem = Math.min(maxEu, amount / 81);
                 if (simulation.isActing()) {