diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/resources/assets/enderio/config/VatRecipes_Core.xml index d6092d71..3ccf8850 100644 --- a/resources/assets/enderio/config/VatRecipes_Core.xml +++ b/resources/assets/enderio/config/VatRecipes_Core.xml @@ -14,7 +14,7 @@ The vat always uses 1 MJ per tick, so energy cost also equates to duration. - + @@ -37,7 +37,7 @@ The vat always uses 1 MJ per tick, so energy cost also equates to duration. - + @@ -46,7 +46,7 @@ The vat always uses 1 MJ per tick, so energy cost also equates to duration. - + @@ -54,7 +54,7 @@ The vat always uses 1 MJ per tick, so energy cost also equates to duration. - + @@ -66,7 +66,7 @@ The vat always uses 1 MJ per tick, so energy cost also equates to duration. - + diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index e103798c..b43adb8b 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -107,11 +107,12 @@ public final class Config { public static float darkSteelPickEffeciencyBoostWhenPowered = 2; public static int hootchPowerPerCycle = 6; - public static int hootchPowerTotalBurnTime = 12000; + public static int hootchPowerTotalBurnTime = 8000; public static int rocketFuelPowerPerCycle = 9; - public static int rocketFuelPowerTotalBurnTime = 12000; + public static int rocketFuelPowerTotalBurnTime = (int)Math.round(hootchPowerTotalBurnTime * 1.2); public static int fireWaterPowerPerCycle = 12; - public static int fireWaterPowerTotalBurnTime = 12000; + public static int fireWaterPowerTotalBurnTime = (int)Math.round(hootchPowerTotalBurnTime * 1.5); + public static float vatPowerUserPerTick = 2; public static void load(FMLPreInitializationEvent event) { configDirectory = new File(event.getModConfigurationDirectory(), "enderio"); @@ -182,6 +183,10 @@ public final class Config { transceiverBucketTransmissionCost = config.get("Settings", "transceiverBucketTransmissionCost", transceiverBucketTransmissionCost, "The cost in MJ of trasporting a bucket of fluid via a Dimensional Transceiver.").getDouble(transceiverBucketTransmissionCost); + + vatPowerUserPerTick = (float)config.get("Settings", "vatPowerUserPerTick", vatPowerUserPerTick, + "Power use (MJ/t) used by the vat.").getDouble(vatPowerUserPerTick); + detailedPowerTrackingEnabled = config .get( "Settings", diff --git a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java index f8da61bc..52ec4bb8 100644 --- a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.generator; +import java.util.Random; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -14,14 +16,15 @@ import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.util.Util; public class BlockCombustionGenerator extends AbstractMachineBlock { public static int renderId; - protected IIcon frontOn; - protected IIcon frontOff; + // protected IIcon frontOn; + // protected IIcon frontOff; public static BlockCombustionGenerator create() { BlockCombustionGenerator gen = new BlockCombustionGenerator(); @@ -36,8 +39,8 @@ public class BlockCombustionGenerator extends AbstractMachineBlock 0) { //right tank x = guiLeft + 114; - y += 7; + RenderUtil.renderGuiTank(gen.fuelTank.getFluid(), 4000, gen.fuelTank.getFluidAmount() - 1000, x, y, zLevel, 15, 47); - + if(gen.isActive()) { txt = gen.getNumTicksPerMbFuel() + " t/MB"; sw = fr.getStringWidth(txt); diff --git a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java index 4e83bc9e..54e8e222 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java @@ -33,6 +33,8 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP private PowerDistributor powerDis; private float transmitted; + private boolean inPause = false; + public TileCombustionGenerator() { super(new SlotDefinition(-1, -1, -1, -1, -1, -1)); powerHandler.configure(0, 0, 0, capacitorType.capacitor.getMaxEnergyStored()); @@ -125,6 +127,10 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP transmitEnergy(); + if(storedEnergy >= capacitorType.capacitor.getMaxEnergyStored()) { + inPause = true; + } + return res; } @@ -152,9 +158,17 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP return false; } - if(coolantTank.getFluidAmount() <= 0 || storedEnergy >= powerHandler.getMaxEnergyStored() - fuel.powerPerCycle) { + if(coolantTank.getFluidAmount() <= 0 || storedEnergy >= powerHandler.getMaxEnergyStored()) { return false; } + + //once full, don't start again until we have drained 2 seconds worth of power to prevent + //flickering on and off constantly when powering a machine that draws less than this produces + if(inPause && storedEnergy >= (powerHandler.getMaxEnergyStored() - fuel.powerPerCycle) * 40) { + return false; + } + inPause = false; + Coolant coolant = IronEngineCoolant.getCoolant(coolantTank.getFluid()); if(coolant == null) { return false; @@ -167,12 +181,14 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP fuelTank.drain(1, true); ticksRemaingFuel = getNumTicksPerMbFuel(fuel); res = true; + tanksDirty = true; } ticksRemaingCoolant--; if(ticksRemaingCoolant <= 0) { coolantTank.drain(1, true); ticksRemaingCoolant = getNumTicksPerMbCoolant(coolant, fuel); res = true; + tanksDirty = true; } diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index 549b2fd7..b07b054c 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import crazypants.enderio.Config; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.IMachineRecipe.ResultStack; @@ -192,7 +193,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override protected float getPowerUsePerTick() { - return 1; + return Config.vatPowerUserPerTick; } }