diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index 1c4a4f81..bd97b552 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -93,7 +93,7 @@ sand/cobble/wood=0.1 - + diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index 89a402bd..8df0b596 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -78,7 +78,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -299,7 +299,7 @@ - + diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 4e89744f..05e0dc9f 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -144,7 +144,11 @@ public class NetworkPowerManager { int wasAvailable = available; if(available <= 0 || (receptors.isEmpty() && storageReceptors.isEmpty())) { + if(available > 0) { + distributeStorageToConduits(); + } trackerEndTick(); + networkPowerTracker.tickEnd(energyStored); return; } @@ -330,7 +334,7 @@ public class NetworkPowerManager { energyStored = maxEnergyStored; } - float filledRatio = energyStored / maxEnergyStored; + float filledRatio = (float)energyStored / maxEnergyStored; int energyLeft = energyStored; int given = 0; for (IPowerConduit con : network.getConduits()) { @@ -365,8 +369,7 @@ public class NetworkPowerManager { if(energyStored > maxEnergyStored) { energyStored = maxEnergyStored; - } - + } } public void receptorsChanged() { @@ -530,7 +533,7 @@ public class NetworkPowerManager { if(canExtract <= 0 || amount <= 0) { return; } - float ratio = amount / canExtract; + double ratio = (double)amount / canExtract; for (CapBankSupplyEntry entry : enteries) { int use = (int)Math.ceil(ratio * entry.canExtract); @@ -549,7 +552,7 @@ public class NetworkPowerManager { if(canFill <= 0 || amount <= 0) { return; } - float ratio = amount / canFill; + double ratio = (double)amount / canFill; for (CapBankSupplyEntry entry : enteries) { int add = (int) Math.ceil(ratio * entry.canFill); diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 2822eca7..31613828 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -44,9 +44,9 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { static final Map ICONS = new HashMap(); static final ICapacitor[] CAPACITORS = new BasicCapacitor[] { - new BasicCapacitor(500, 1500, 128), - new BasicCapacitor(512, 3000, 512), - new BasicCapacitor(2048, 5000, 2048) + new BasicCapacitor(640, 640, 640), + new BasicCapacitor(5120, 5120, 5120), + new BasicCapacitor(20480, 20480, 20480) }; static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender" }; @@ -215,7 +215,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { subtype = nbtRoot.getShort("subtype"); if(nbtRoot.hasKey("energyStored")) { - nbtRoot.setInteger("energyStored", (int)(nbtRoot.getFloat("energyStored") * 10)); + nbtRoot.setInteger("energyStoredRF", (int)(nbtRoot.getFloat("energyStored") * 10)); } energyStoredRF = Math.min(getCapacitor().getMaxEnergyStored(), nbtRoot.getInteger("energyStoredRF")); @@ -350,7 +350,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { if(getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { return 0; } - float freeSpace = getCapacitor().getMaxEnergyStored() - energyStoredRF; + int freeSpace = getCapacitor().getMaxEnergyStored() - energyStoredRF; int result = (int) Math.min(maxReceive, freeSpace); if(!simulate && result > 0) { energyStoredRF += result; @@ -378,12 +378,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @Override public int getEnergyStored(ForgeDirection from) { - return energyStoredRF; + return getEnergyStored(); } @Override public int getMaxEnergyStored(ForgeDirection from) { - return getCapacitor().getMaxEnergyStored() * 10; + return getMaxEnergyStored(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index e09d5282..fc3e6597 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -256,7 +256,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override public void setEnergyStored(int stored) { - storedEnergyRF = stored; + storedEnergyRF = Math.max(stored, 0); } public boolean hasPower() { @@ -269,7 +269,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public int getEnergyStoredScaled(int scale) { // NB: called on the client so can't use the power provider - return VecmathUtil.clamp(Math.round(scale * (storedEnergyRF / getMaxEnergyStored())), 0, scale); + return VecmathUtil.clamp(Math.round(scale * ((float)storedEnergyRF / getMaxEnergyStored())), 0, scale); } public int getEnergyStored() { diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index b76ff052..8f23d998 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -23,8 +23,7 @@ public class TileCrafter extends AbstractMachineEntity { private List containerItems; public TileCrafter() { - super(new SlotDefinition(9, 1)); - + super(new SlotDefinition(9, 1)); containerItems = new ArrayList(); } diff --git a/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java b/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java index 325c8528..00a7628f 100644 --- a/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java @@ -30,9 +30,9 @@ public class PowerDistributor { receptorsDirty = true; } - public float transmitEnergy(World worldObj, float available) { + public int transmitEnergy(World worldObj, int available) { - float transmitted = 0; + int transmitted = 0; checkReceptors(worldObj); if(!receptors.isEmpty() && !receptorIterator.hasNext()) { receptorIterator = receptors.listIterator(); @@ -44,7 +44,7 @@ public class PowerDistributor { Receptor receptor = receptorIterator.next(); IPowerInterface pp = receptor.receptor; if(pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= available) { - double used = pp.recieveEnergy(receptor.fromDir.getOpposite(), available); + int used = pp.recieveEnergy(receptor.fromDir.getOpposite(), available); transmitted += used; available -= used; } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index 0bda5e80..e423d8f3 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -26,8 +26,6 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement private PowerDistributor powerDis; - private int storedEnergyRF; - public TileEntityStirlingGenerator() { super(new SlotDefinition(1, 0)); } @@ -112,11 +110,6 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement } } - @Override - public int getEnergyStored(ForgeDirection from) { - return (int)(storedEnergyRF * 10); - } - @Override public int getPowerUsePerTick() { return (int)Math.round(ENERGY_PER_TICK * getEnergyMultiplier()); @@ -185,11 +178,11 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } - double canTransmit = Math.min(storedEnergyRF, capacitorType.capacitor.getMaxEnergyExtracted()); + int canTransmit = Math.min(storedEnergyRF, capacitorType.capacitor.getMaxEnergyExtracted()); if(canTransmit <= 0) { return false; } - float transmitted = powerDis.transmitEnergy(worldObj, (float)canTransmit); + int transmitted = powerDis.transmitEnergy(worldObj, canTransmit); storedEnergyRF -= transmitted; return transmitted > 0; } diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index c646ac4b..b674b016 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -517,13 +517,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - int freeSpace = maxStoredEnergy - storedEnergyRF; - freeSpace = Math.min(freeSpace, getMaxInput()); - int result = Math.min(maxReceive, freeSpace); - if(!simulate) { - doAddEnergy(result); - } - return (int)(result * 10); + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } public int doGetEnergyStored(ForgeDirection from) { diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index e549c06b..cac41ffd 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -1,5 +1,6 @@ package crazypants.enderio.machine.soul; +import scala.xml.persistent.SetStorage; import net.minecraft.item.ItemStack; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; @@ -59,6 +60,9 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity { capacitor = CAP_ONE; break; } + if(storedEnergyRF > getMaxEnergyStored()) { + setEnergyStored(getMaxEnergyStored()); + } forceClientUpdate = true; } diff --git a/src/main/java/crazypants/enderio/power/IPowerInterface.java b/src/main/java/crazypants/enderio/power/IPowerInterface.java index ddd32b4c..60a97331 100644 --- a/src/main/java/crazypants/enderio/power/IPowerInterface.java +++ b/src/main/java/crazypants/enderio/power/IPowerInterface.java @@ -16,6 +16,6 @@ public interface IPowerInterface { int getMinEnergyReceived(ForgeDirection dir); - int recieveEnergy(ForgeDirection opposite, float canOffer); + int recieveEnergy(ForgeDirection opposite, int canOffer); } diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java b/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java index 19e02381..0d49067c 100644 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java +++ b/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java @@ -61,9 +61,9 @@ public class PowerInterfaceRF implements IPowerInterface { } @Override - public int recieveEnergy(ForgeDirection opposite, float canOffer) { + public int recieveEnergy(ForgeDirection opposite, int canOffer) { if(rfPower != null && opposite != null) { - return rfPower.receiveEnergy(opposite, (int) (canOffer * 10), false); + return rfPower.receiveEnergy(opposite, canOffer, false); } return 0; }