diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 7be79b128..9ba267034 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -104,7 +104,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double transferEnergyToAcceptor(EnumFacing side, double amount) { - int needed = acceptor.getMaxEnergyStored(side)-acceptor.getEnergyStored(side); + int needed = Math.min(acceptor.getMaxEnergyStored(side)-acceptor.getEnergyStored(side), Integer.MAX_VALUE); int transferred = acceptor.receiveEnergy(side, Math.min(needed, toRF(amount)), false); return fromRF(transferred); @@ -139,7 +139,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public boolean needsEnergy(EnumFacing side) { - return acceptor.receiveEnergy(side, 1, true) > 0; + return acceptor.receiveEnergy(side, 1, true) > 0 || getEnergyNeeded(side) > 0; } public int toRF(double joules) @@ -151,6 +151,11 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { return rf * general.FROM_TE; } + + public int getEnergyNeeded(ForgeDirection side) + { + return acceptor.getMaxEnergyStored(side) - acceptor.getEnergyStored(side); + } } public static class IC2Acceptor extends EnergyAcceptorWrapper @@ -165,7 +170,8 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double transferEnergyToAcceptor(EnumFacing side, double amount) { - return amount - fromEU(acceptor.injectEnergy(side, Math.min(acceptor.getDemandedEnergy(), toEU(amount)), 0)); + double toTransfer = Math.min(Math.min(acceptor.getDemandedEnergy(), toEU(amount)), Integer.MAX_VALUE); + return amount - fromEU(acceptor.injectEnergy(side, toTransfer, 0)); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java index 6c937d9b6..8226753d9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; +import mekanism.common.Upgrade; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.tile.component.TileComponentConfig; @@ -33,6 +34,8 @@ public class TileEntityAdvancedFactory extends TileEntityFactory configComponent.setInputConfig(TransmissionType.ENERGY); upgradeComponent = new TileComponentUpgrade(this, 0); + upgradeComponent.setSupported(Upgrade.MUFFLING); + ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java index e3fad8b82..303283a75 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java @@ -32,7 +32,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl if(!worldObj.isRemote) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) { if(structure.steamStored != null && structure.steamStored.amount > 0) { @@ -63,7 +63,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) + if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) { return new FluidTankInfo[] {steamTank.getInfo()}; } @@ -78,7 +78,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord-1) { return waterTank.fill(resource, doFill); } @@ -89,7 +89,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) { if(structure.steamStored != null) { @@ -106,7 +106,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) { return steamTank.drain(maxDrain, doDrain); } @@ -119,7 +119,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord; + return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord-1; } return false; @@ -130,7 +130,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord; + return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1; } return false; diff --git a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java index 4b27994f9..9bd6dbae2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; +import mekanism.common.Upgrade; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.tile.component.TileComponentConfig; @@ -33,6 +34,8 @@ public class TileEntityEliteFactory extends TileEntityFactory configComponent.setInputConfig(TransmissionType.ENERGY); upgradeComponent = new TileComponentUpgrade(this, 0); + upgradeComponent.setSupported(Upgrade.MUFFLING); + ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); } diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 9ae8fbdf7..ec317e83b 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -250,7 +250,8 @@ public final class CableUtils if(handler.canConnectEnergy(side.getOpposite())) { - int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(currentSending*general.TO_TE), false); + int toSend = Math.min((int)Math.round(currentSending*general.TO_TE), Integer.MAX_VALUE); + int used = handler.receiveEnergy(side.getOpposite(), toSend, false); sent += used*general.FROM_TE; } } @@ -259,7 +260,7 @@ public final class CableUtils if(((IEnergySink)tileEntity).acceptsEnergyFrom((TileEntity)from, side.getOpposite())) { double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)tileEntity).getSinkTier())*general.FROM_IC2); - toSend = Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2); + toSend = Math.min(Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2), Integer.MAX_VALUE); sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2)); } }