diff --git a/src/main/java/mffs/base/TileEntityFortron.java b/src/main/java/mffs/base/TileEntityFortron.java index 3c72f1e..c579e4a 100644 --- a/src/main/java/mffs/base/TileEntityFortron.java +++ b/src/main/java/mffs/base/TileEntityFortron.java @@ -153,8 +153,8 @@ public abstract class TileEntityFortron extends TileEntityFrequency public int getFortronCapacity() { return this.fortronTank.getCapacity(); } - public int requestFortron(final int joules, final boolean doUse) { - return FortronHelper.getAmount(this.fortronTank.drain(joules, doUse)); + public int requestFortron(final int amount, final boolean doUse) { + return FortronHelper.getAmount(this.fortronTank.drain(amount, doUse)); } public int provideFortron(final int joules, final boolean doUse) { diff --git a/src/main/java/mffs/gui/GuiCoercionDeriver.java b/src/main/java/mffs/gui/GuiCoercionDeriver.java index f711794..1f1374b 100644 --- a/src/main/java/mffs/gui/GuiCoercionDeriver.java +++ b/src/main/java/mffs/gui/GuiCoercionDeriver.java @@ -71,7 +71,7 @@ public class GuiCoercionDeriver extends GuiBase { this.drawTextWithTooltip("fortron", "%1: " + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronEnergy(), + this.tileEntity.getFortronEnergy() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES), 8, 105, x, y); this.fontRendererObj.drawString( diff --git a/src/main/java/mffs/gui/GuiForceFieldProjector.java b/src/main/java/mffs/gui/GuiForceFieldProjector.java index 7669dd3..99b195a 100644 --- a/src/main/java/mffs/gui/GuiForceFieldProjector.java +++ b/src/main/java/mffs/gui/GuiForceFieldProjector.java @@ -2,6 +2,7 @@ package mffs.gui; import mffs.base.GuiBase; import mffs.container.ContainerForceFieldProjector; +import mffs.tileentity.TileEntityCoercionDeriver; import mffs.tileentity.TileEntityForceFieldProjector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.IBlockAccess; @@ -89,11 +90,11 @@ public class GuiForceFieldProjector extends GuiBase { this.drawTextWithTooltip("fortron", "%1: " + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronEnergy(), + this.tileEntity.getFortronEnergy() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES) + "/" + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronCapacity(), + this.tileEntity.getFortronCapacity() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES), 8, 110, x, y); this.fontRendererObj.drawString( diff --git a/src/main/java/mffs/gui/GuiForceManipulator.java b/src/main/java/mffs/gui/GuiForceManipulator.java index 519cf92..805f5c0 100644 --- a/src/main/java/mffs/gui/GuiForceManipulator.java +++ b/src/main/java/mffs/gui/GuiForceManipulator.java @@ -5,6 +5,7 @@ import mffs.base.GuiBase; import mffs.base.PacketTile; import mffs.container.ContainerForceManipulator; import mffs.gui.button.GuiIcon; +import mffs.tileentity.TileEntityCoercionDeriver; import mffs.tileentity.TileEntityForceManipulator; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -111,12 +112,12 @@ public class GuiForceManipulator extends GuiBase { this.drawTextWithTooltip("fortron", "%1: " + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronEnergy(), + this.tileEntity.getFortronEnergy() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES) + "/" + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronCapacity(), + this.tileEntity.getFortronCapacity() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES), 8, 110, x, y); this.fontRendererObj.drawString( diff --git a/src/main/java/mffs/gui/GuiFortronCapacitor.java b/src/main/java/mffs/gui/GuiFortronCapacitor.java index c7a8723..76bd910 100644 --- a/src/main/java/mffs/gui/GuiFortronCapacitor.java +++ b/src/main/java/mffs/gui/GuiFortronCapacitor.java @@ -5,6 +5,7 @@ import mffs.base.GuiBase; import mffs.base.PacketTile; import mffs.container.ContainerFortronCapacitor; import mffs.gui.button.GuiButtonPressTransferMode; +import mffs.tileentity.TileEntityCoercionDeriver; import mffs.tileentity.TileEntityFortronCapacitor; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -59,11 +60,11 @@ public class GuiFortronCapacitor extends GuiBase { this.drawTextWithTooltip("fortron", "%1:", 8, 95, x, y); this.fontRendererObj.drawString( ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronEnergy(), + this.tileEntity.getFortronEnergy() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES) + "/" + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronCapacity(), + this.tileEntity.getFortronCapacity() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES), 8, 105, 4210752); super.drawGuiContainerForegroundLayer(x, y); diff --git a/src/main/java/mffs/gui/GuiInterdictionMatrix.java b/src/main/java/mffs/gui/GuiInterdictionMatrix.java index f6b86b4..ba1bdcc 100644 --- a/src/main/java/mffs/gui/GuiInterdictionMatrix.java +++ b/src/main/java/mffs/gui/GuiInterdictionMatrix.java @@ -4,6 +4,7 @@ import mffs.ModularForceFieldSystem; import mffs.base.GuiBase; import mffs.base.PacketTile; import mffs.container.ContainerInterdictionMatrix; +import mffs.tileentity.TileEntityCoercionDeriver; import mffs.tileentity.TileEntityInterdictionMatrix; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -64,11 +65,11 @@ public class GuiInterdictionMatrix extends GuiBase { this.drawTextWithTooltip("fortron", "%1: " + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronEnergy(), + this.tileEntity.getFortronEnergy() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES) + "/" + ElectricityDisplay.getDisplayShort( - this.tileEntity.getFortronCapacity(), + this.tileEntity.getFortronCapacity() * TileEntityCoercionDeriver.FORTRON_UE_RATIO, ElectricityDisplay.ElectricUnit.JOULES), 8, 110, x, y); this.fontRendererObj.drawString( diff --git a/src/main/java/mffs/tileentity/TileEntityCoercionDeriver.java b/src/main/java/mffs/tileentity/TileEntityCoercionDeriver.java index 9c28110..b4ba8d7 100644 --- a/src/main/java/mffs/tileentity/TileEntityCoercionDeriver.java +++ b/src/main/java/mffs/tileentity/TileEntityCoercionDeriver.java @@ -44,7 +44,7 @@ public class TileEntityCoercionDeriver extends TileEntityUniversalEnergy { if (!this.isDisabled() && this.isActive()) { if (this.isInversed && Settings.ENABLE_ELECTRICITY) { final double watts = - Math.min(this.getFortronEnergy() * 6.0f, 1000.0f); + Math.min(this.getFortronEnergy() * FORTRON_UE_RATIO, 1000.0f); final ElectricityPack remainder = this.produce(watts); double electricItemGiven = 0.0; if (remainder.getWatts() > 0.0) { @@ -53,7 +53,7 @@ public class TileEntityCoercionDeriver extends TileEntityUniversalEnergy { this.getVoltage()); } this.requestFortron( - (int)((watts - (remainder.getWatts() - electricItemGiven)) / 6.0), + (int)((watts - (remainder.getWatts() - electricItemGiven)) / FORTRON_UE_RATIO), true); } else { super.wattsReceived += ElectricItemHelper.dechargeItem(