mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 12:19:55 +00:00
Bug fixes.
This commit is contained in:
1 parent
3791e9dc70
commit
b703ce0175
7 files changed
+40
-47
No files matched your search
@@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
@@ -50,7 +51,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
|
||||
// Power
|
||||
protected Capacitors capacitorType;
|
||||
|
||||
protected int storedEnergyRF;
|
||||
private int storedEnergyRF;
|
||||
|
||||
protected ItemStack[] inventory;
|
||||
protected final SlotDefinition slotDefinition;
|
||||
@@ -256,7 +257,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
|
||||
|
||||
@Override
|
||||
public void setEnergyStored(int stored) {
|
||||
storedEnergyRF = Math.max(stored, 0);
|
||||
storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored());
|
||||
}
|
||||
|
||||
public boolean hasPower() {
|
||||
@@ -528,12 +529,14 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
|
||||
|
||||
setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]);
|
||||
|
||||
int energy;
|
||||
if(nbtRoot.hasKey("storedEnergy")) {
|
||||
float storedEnergyMJ = nbtRoot.getFloat("storedEnergy");
|
||||
storedEnergyRF = (int)(storedEnergyMJ * 10);
|
||||
energy = (int)(storedEnergyMJ * 10);
|
||||
} else {
|
||||
storedEnergyRF = nbtRoot.getInteger("storedEnergyRF");
|
||||
energy = nbtRoot.getInteger("storedEnergyRF");
|
||||
}
|
||||
setEnergyStored(energy);
|
||||
|
||||
// read in the inventories contents
|
||||
inventory = new ItemStack[slotDefinition.getNumSlots()];
|
||||
|
||||
@@ -22,7 +22,7 @@ public class PacketPowerStorage implements IMessage, IMessageHandler<PacketPower
|
||||
x = ent.xCoord;
|
||||
y = ent.yCoord;
|
||||
z = ent.zCoord;
|
||||
storedEnergy = ent.storedEnergyRF;
|
||||
storedEnergy = ent.getEnergyStored();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -47,8 +47,7 @@ public class PacketPowerStorage implements IMessage, IMessageHandler<PacketPower
|
||||
EntityPlayer player = EnderIO.proxy.getClientPlayer();
|
||||
TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z);
|
||||
if(te instanceof AbstractMachineEntity) {
|
||||
AbstractMachineEntity me = (AbstractMachineEntity) te;
|
||||
me.storedEnergyRF = message.storedEnergy;
|
||||
AbstractMachineEntity me = (AbstractMachineEntity) te;
|
||||
me.setEnergyStored(message.storedEnergy);
|
||||
}
|
||||
return null;
|
||||
|
||||
+9
-14
@@ -1,5 +1,6 @@
|
||||
package crazypants.enderio.machine.generator.combustion;
|
||||
|
||||
import scala.xml.persistent.SetStorage;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -159,7 +160,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF
|
||||
res = true;
|
||||
}
|
||||
|
||||
if(storedEnergyRF >= capacitorType.capacitor.getMaxEnergyStored()) {
|
||||
if(getEnergyStored() >= capacitorType.capacitor.getMaxEnergyStored()) {
|
||||
inPause = true;
|
||||
}
|
||||
|
||||
@@ -180,14 +181,14 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF
|
||||
}
|
||||
|
||||
private boolean transmitEnergy() {
|
||||
if(storedEnergyRF <= 0) {
|
||||
if(getEnergyStored() <= 0) {
|
||||
return false;
|
||||
}
|
||||
if(powerDis == null) {
|
||||
powerDis = new PowerDistributor(new BlockCoord(this));
|
||||
}
|
||||
float transmitted = powerDis.transmitEnergy(worldObj, Math.min(maxOutputTick, storedEnergyRF));
|
||||
storedEnergyRF -= transmitted;
|
||||
int transmitted = powerDis.transmitEnergy(worldObj, Math.min(maxOutputTick, getEnergyStored()));
|
||||
setEnergyStored(getEnergyStored() - transmitted);
|
||||
return transmitted > 0;
|
||||
}
|
||||
|
||||
@@ -197,7 +198,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF
|
||||
|
||||
if((ticksRemaingCoolant <= 0 && getCoolantTank().getFluidAmount() <= 0) ||
|
||||
(ticksRemaingFuel <= 0 && getFuelTank().getFluidAmount() <= 0) ||
|
||||
storedEnergyRF >= getMaxEnergyStored()) {
|
||||
getEnergyStored() >= getMaxEnergyStored()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -205,7 +206,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF
|
||||
//flickering on and off constantly when powering a machine that draws less than this produces
|
||||
if(inPause) {
|
||||
int powerPerCycle = getPowerPerCycle();
|
||||
if(storedEnergyRF >= (getMaxEnergyStored() - (powerPerCycle * 200))) {
|
||||
if(getEnergyStored() >= (getMaxEnergyStored() - (powerPerCycle * 200))) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -252,10 +253,9 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF
|
||||
}
|
||||
}
|
||||
|
||||
float oldVal = storedEnergyRF;
|
||||
|
||||
generated = getPowerPerCycle();
|
||||
storedEnergyRF += generated;
|
||||
storedEnergyRF = Math.min(storedEnergyRF, getMaxEnergyStored());
|
||||
setEnergyStored(getEnergyStored() + generated);
|
||||
|
||||
return getFuelTank().getFluidAmount() > 0 && getCoolantTank().getFluidAmount() > 0;
|
||||
}
|
||||
@@ -300,11 +300,6 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF
|
||||
return numTicks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEnergyStored(ForgeDirection from) {
|
||||
return (int) (storedEnergyRF * 10);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(ForgeDirection from, Fluid fluid) {
|
||||
if(isSideDisabled(from.ordinal())) {
|
||||
|
||||
+5
-5
@@ -121,8 +121,8 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement
|
||||
boolean sendBurnTimePacket = false;
|
||||
|
||||
if(burnTime > 0) {
|
||||
if(storedEnergyRF < getMaxEnergyStored()) {
|
||||
storedEnergyRF += getPowerUsePerTick();
|
||||
if(getEnergyStored() < getMaxEnergyStored()) {
|
||||
setEnergyStored(getEnergyStored() + getPowerUsePerTick());
|
||||
}
|
||||
burnTime--;
|
||||
sendBurnTimePacket = worldObj.getTotalWorldTime() % 20 == 1 || burnTime == 0;
|
||||
@@ -132,7 +132,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement
|
||||
|
||||
if(redstoneCheckPassed) {
|
||||
|
||||
if(burnTime <= 0 && storedEnergyRF < getMaxEnergyStored()) {
|
||||
if(burnTime <= 0 && getEnergyStored() < getMaxEnergyStored()) {
|
||||
if(inventory[0] != null && inventory[0].stackSize > 0) {
|
||||
burnTime = Math.round(TileEntityFurnace.getItemBurnTime(inventory[0]) / getBurnTimeMultiplier());
|
||||
if(burnTime > 0) {
|
||||
@@ -178,12 +178,12 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement
|
||||
if(powerDis == null) {
|
||||
powerDis = new PowerDistributor(new BlockCoord(this));
|
||||
}
|
||||
int canTransmit = Math.min(storedEnergyRF, capacitorType.capacitor.getMaxEnergyExtracted());
|
||||
int canTransmit = Math.min(getEnergyStored(), capacitorType.capacitor.getMaxEnergyExtracted());
|
||||
if(canTransmit <= 0) {
|
||||
return false;
|
||||
}
|
||||
int transmitted = powerDis.transmitEnergy(worldObj, canTransmit);
|
||||
storedEnergyRF -= transmitted;
|
||||
setEnergyStored(getEnergyStored() - transmitted);
|
||||
return transmitted > 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package crazypants.enderio.machine.generator.zombie;
|
||||
|
||||
import scala.xml.persistent.SetStorage;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -114,11 +115,6 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IFluid
|
||||
powerDis.neighboursChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEnergyStored(ForgeDirection from) {
|
||||
return storedEnergyRF;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean processTasks(boolean redstoneCheckPassed) {
|
||||
@@ -138,7 +134,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IFluid
|
||||
res = true;
|
||||
}
|
||||
|
||||
if(storedEnergyRF >= capacitorType.capacitor.getMaxEnergyStored()) {
|
||||
if(getEnergyStored() >= capacitorType.capacitor.getMaxEnergyStored()) {
|
||||
inPause = true;
|
||||
}
|
||||
|
||||
@@ -159,7 +155,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IFluid
|
||||
|
||||
//once full, don't start again until we have drained 10 seconds worth of power to prevent
|
||||
//flickering on and off constantly when powering a machine that draws less than this produces
|
||||
if(inPause && storedEnergyRF >= (getMaxEnergyStored() - (outputPerTick * 200))) {
|
||||
if(inPause && getEnergyStored() >= (getMaxEnergyStored() - (outputPerTick * 200))) {
|
||||
return false;
|
||||
}
|
||||
inPause = false;
|
||||
@@ -174,23 +170,20 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IFluid
|
||||
fuelTank.drain(1, true);
|
||||
ticksRemaingFuel = tickPerBucketOfFuel/1000;
|
||||
tanksDirty = true;
|
||||
}
|
||||
|
||||
float oldVal = storedEnergyRF;
|
||||
storedEnergyRF += outputPerTick;
|
||||
storedEnergyRF = Math.min(storedEnergyRF, capacitorType.capacitor.getMaxEnergyStored());
|
||||
}
|
||||
setEnergyStored(getEnergyStored() + outputPerTick);
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean transmitEnergy() {
|
||||
if(storedEnergyRF <= 0) {
|
||||
if(getEnergyStored() <= 0) {
|
||||
return false;
|
||||
}
|
||||
if(powerDis == null) {
|
||||
powerDis = new PowerDistributor(new BlockCoord(this));
|
||||
}
|
||||
float transmitted = powerDis.transmitEnergy(worldObj, Math.min(outputPerTick * 2, storedEnergyRF));
|
||||
storedEnergyRF -= transmitted;
|
||||
int transmitted = powerDis.transmitEnergy(worldObj, Math.min(outputPerTick * 2, getEnergyStored()));
|
||||
setEnergyStored(getEnergyStored() - transmitted);
|
||||
return transmitted > 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
@@ -435,7 +436,7 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept
|
||||
|
||||
@Override
|
||||
public void setEnergyStored(int stored) {
|
||||
storedEnergyRF = stored;
|
||||
storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -807,11 +808,14 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept
|
||||
@Override
|
||||
public void readCustomNBT(NBTTagCompound nbtRoot) {
|
||||
|
||||
int energy;
|
||||
if(nbtRoot.hasKey("storedEnergy")) {
|
||||
storedEnergyRF = (int)(nbtRoot.getFloat("storedEnergy") * 10);
|
||||
energy = (int)(nbtRoot.getFloat("storedEnergy") * 10);
|
||||
} else {
|
||||
storedEnergyRF = nbtRoot.getInteger("storedEnergyRF");
|
||||
energy = nbtRoot.getInteger("storedEnergyRF");
|
||||
}
|
||||
setEnergyStored(energy);
|
||||
|
||||
|
||||
String channelName = nbtRoot.getString("channelName");
|
||||
String channelUser = nbtRoot.getString("channelUser");
|
||||
|
||||
@@ -60,9 +60,8 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity {
|
||||
capacitor = CAP_ONE;
|
||||
break;
|
||||
}
|
||||
if(storedEnergyRF > getMaxEnergyStored()) {
|
||||
setEnergyStored(getMaxEnergyStored());
|
||||
}
|
||||
//Force a check that the new value is in bounds
|
||||
setEnergyStored(getEnergyStored());
|
||||
forceClientUpdate = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user