diff --git a/src/main/java/techreborn/client/container/ContainerAesu.java b/src/main/java/techreborn/client/container/ContainerAesu.java index 155df65e6..21f107cd0 100644 --- a/src/main/java/techreborn/client/container/ContainerAesu.java +++ b/src/main/java/techreborn/client/container/ContainerAesu.java @@ -62,7 +62,7 @@ public class ContainerAesu extends TechRebornContainer { if(this.storedEu != tile.energy){ icrafting.sendProgressBarUpdate(this, 1, (int) tile.energy); } - if(this.euChange != tile.getEuChange()){ + if(this.euChange != tile.getEuChange() && tile.getEuChange() != -1){ icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange()); } } diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index ba09b5d36..af9af3636 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -68,6 +68,7 @@ public class ConfigTechReborn { public static int CentrifugeInputTick; public static int DragoneggsiphonerOutput; public static int heatGeneratorOutput; + public static int aveargeEuOutTickTime; // Charge public static int AdvancedDrillCharge; public static int LapotronPackCharge; @@ -559,6 +560,14 @@ public class ConfigTechReborn { StatCollector .translateToLocal("config.techreborn.thermalGeneratorMaxCharge.tooltip")) .getInt(); + aveargeEuOutTickTime = config + .get(CATEGORY_POWER, + StatCollector + .translateToLocal("config.techreborn.aveargeEuOutTickTime"), + 100, + StatCollector + .translateToLocal("config.techreborn.aveargeEuOutTickTime.tooltip")) + .getInt(); // Teir AdvancedDrillTier = config diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index b1d5d4d92..a0e948d83 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -4,6 +4,7 @@ import ic2.api.tile.IWrenchable; import ic2.core.block.wiring.TileEntityElectricBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; import techreborn.util.Inventory; import techreborn.util.LogHelper; @@ -17,6 +18,8 @@ public class TileAesu extends TileEntityElectricBlock implements IWrenchable { public Inventory inventory = new Inventory(2, "TileAesu", 64); private int OUTPUT = 64; //The current output private double euLastTick = 0; + private double euChange; + private int ticks; public TileAesu() { @@ -27,6 +30,13 @@ public class TileAesu extends TileEntityElectricBlock implements IWrenchable { public void updateEntity() { super.updateEntity(); + if(ticks == ConfigTechReborn.aveargeEuOutTickTime){ + euChange = -1; + ticks = 0; + } else { + ticks ++; + euChange += energy - euLastTick; + } euLastTick = energy; } @@ -117,7 +127,10 @@ public class TileAesu extends TileEntityElectricBlock implements IWrenchable { } public double getEuChange(){ - return energy - euLastTick; + if(euChange == -1){ + return -1; + } + return (euChange / ticks); } diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index f0b7f534d..fdaa3a746 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -760,6 +760,8 @@ config.techreborn.centrifugeMaxCharge=Maximum charge for Centrifuge config.techreborn.centrifugeMaxCharge.tooltip= config.techreborn.thermalGeneratorMaxCharge=Maximum charge for Thermal Generator config.techreborn.thermalGeneratorMaxCharge.tooltip= +config.techreborn.aveargeEuOutTickTim=Eu out time +config.techreborn.aveargeEuOutTickTime.tooltip=How often in ticks to update the eu out #ConfigGui config.techreborn.category.general=General Configs