diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index a1906b7b..d118efcb 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -301,8 +301,7 @@ public class NetworkPowerManager { storageReceptors.clear(); for (ReceptorEntry rec : network.getPowerReceptors()) { if(rec.powerInterface.getDelegate() != null && - rec.powerInterface.getDelegate() instanceof IPowerStorage && - !((IPowerStorage) rec.powerInterface.getDelegate()).isCreative()) { + rec.powerInterface.getDelegate() instanceof IPowerStorage) { storageReceptors.add(rec); } else { receptors.add(rec); @@ -455,7 +454,9 @@ public class NetworkPowerManager { long use = (int) Math.ceil(ratio * entry.canExtract); use = Math.min(use, amount); use = Math.min(use, entry.canExtract); - entry.capBank.addEnergy((int) -use); + if(!entry.capBank.isCreative()) { + entry.capBank.addEnergy((int) -use); + } trackerRecieve(entry.emmiter, (int) use, true); amount -= use; if(amount == 0) { @@ -474,7 +475,9 @@ public class NetworkPowerManager { long add = (int) Math.ceil(ratio * entry.canFill); add = Math.min(add, entry.canFill); add = Math.min(add, amount); - entry.capBank.addEnergy((int) add); + if(!entry.capBank.isCreative()) { + entry.capBank.addEnergy((int) add); + } trackerSend(entry.emmiter, (int) add, true); amount -= add; if(amount == 0) { @@ -503,6 +506,11 @@ public class NetworkPowerManager { } void calcToBalance(double targetRatio) { + if(capBank.isCreative()) { + toBalance = 0; + return; + } + long targetAmount = (long) Math.floor(capBank.getMaxEnergyStoredL() * targetRatio); long b = targetAmount - capBank.getEnergyStoredL(); if(b < 0) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 27f64ba3..1ac14873 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -13,7 +13,6 @@ 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.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.client.FMLClientHandler; @@ -22,18 +21,12 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.config.Config; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.ICapacitor; -import crazypants.enderio.power.IInternalPoweredTile; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.util.InventoryWrapper; import crazypants.util.ItemUtil; import crazypants.util.Lang; -import crazypants.vecmath.VecmathUtil; -public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IInternalPoweredTile, IMachine, IRedstoneModeControlable, +public abstract class AbstractMachineEntity extends TileEntityEio implements ISidedInventory, IMachine, IRedstoneModeControlable, IIoConfigurable { public short facing; @@ -43,12 +36,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi protected boolean forceClientUpdate = true; protected boolean lastActive; protected int ticksSinceActiveChanged = 0; - protected float lastSyncPowerStored = -1; - - // Power - protected Capacitors capacitorType; - - private int storedEnergyRF; protected ItemStack[] inventory; protected final SlotDefinition slotDefinition; @@ -77,7 +64,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public AbstractMachineEntity(SlotDefinition slotDefinition) { this.slotDefinition = slotDefinition; facing = 3; - capacitorType = Capacitors.BASIC_CAPACITOR; inventory = new ItemStack[slotDefinition.getNumSlots()]; redstoneControlMode = RedstoneControlMode.IGNORE; @@ -238,63 +224,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi return result; } - // --- Power - // -------------------------------------------------------------------------------------- - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - if(isSideDisabled(dir.ordinal())) { - return 0; - } - return getCapacitor().getMaxEnergyReceived(); - } - - @Override - public int getMaxEnergyStored() { - return getCapacitor().getMaxEnergyStored(); - } - - @Override - public void setEnergyStored(int stored) { - storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); - } - - public boolean hasPower() { - return storedEnergyRF > 0; - } - - public ICapacitor getCapacitor() { - return capacitorType.capacitor; - } - - public int getEnergyStoredScaled(int scale) { - // NB: called on the client so can't use the power provider - return VecmathUtil.clamp(Math.round(scale * ((float)storedEnergyRF / getMaxEnergyStored())), 0, scale); - } - - @Override - public int getEnergyStored() { - return storedEnergyRF; - } - - public void setCapacitor(Capacitors capacitorType) { - this.capacitorType = capacitorType; - forceClientUpdate = true; - //Force a check that the new value is in bounds - setEnergyStored(getEnergyStored()); - } - - public int getPowerUsePerTick() { - return getCapacitor().getMaxEnergyExtracted(); - } - - // RF API Power - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return !isSideDisabled(from.ordinal()); - } // --- Process Loop // -------------------------------------------------------------------------- @@ -345,19 +275,16 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi requiresClientSync |= processTasks(redstoneCheckPassed); - boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && worldObj.getTotalWorldTime() % 5 == 0); + if(requiresClientSync) { - lastSyncPowerStored = storedEnergyRF; + // this will cause 'getPacketDescription()' to be called and its result // will be sent to the PacketHandler on the other end of // client/server connection worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); // And this will make sure our current tile entity state is saved markDirty(); - } else if(powerChanged) { - lastSyncPowerStored = storedEnergyRF; - PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); } if(notifyNeighbours) { @@ -510,17 +437,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi */ public void readCommon(NBTTagCompound nbtRoot) { - setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); - - int energy; - if(nbtRoot.hasKey("storedEnergy")) { - float storedEnergyMJ = nbtRoot.getFloat("storedEnergy"); - energy = (int)(storedEnergyMJ * 10); - } else { - energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); - } - setEnergyStored(energy); - // read in the inventories contents inventory = new ItemStack[slotDefinition.getNumSlots()]; @@ -577,8 +493,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi * Write state common to both block and item */ public void writeCommon(NBTTagCompound nbtRoot) { - nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF); - nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); // write inventory list NBTTagList itemList = new NBTTagList(); @@ -665,7 +579,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } if(fromStack.stackSize <= amount) { inventory[fromSlot] = null; - updateCapacitorFromSlot(); return fromStack; } ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); @@ -687,24 +600,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi if(contents != null && contents.stackSize > getInventoryStackLimit()) { contents.stackSize = getInventoryStackLimit(); } - - if(slotDefinition.isUpgradeSlot(slot)) { - updateCapacitorFromSlot(); - } } - private void updateCapacitorFromSlot() { - if(slotDefinition.getNumUpgradeSlots() <= 0) { - setCapacitor(Capacitors.BASIC_CAPACITOR); - return; - } - ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if(contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { - setCapacitor(Capacitors.BASIC_CAPACITOR); - } else { - setCapacitor(Capacitors.values()[contents.getItemDamage()]); - } - } + @Override public ItemStack getStackInSlotOnClosing(int i) { @@ -772,8 +670,4 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi redstoneStateDirty = true; } - @Override - public boolean displayPower() { - return true; - } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPowerConsumerEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPowerConsumerEntity.java new file mode 100644 index 00000000..1ca2da02 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/AbstractPowerConsumerEntity.java @@ -0,0 +1,31 @@ +package crazypants.enderio.machine; + +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.power.IInternalPowerReceiver; +import crazypants.enderio.power.PowerHandlerUtil; + +public abstract class AbstractPowerConsumerEntity extends AbstractPoweredMachineEntity implements IInternalPowerReceiver { + + public AbstractPowerConsumerEntity(SlotDefinition slotDefinition) { + super(slotDefinition); + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if(isSideDisabled(from.ordinal())) { + return 0; + } + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java new file mode 100644 index 00000000..9f29b0b4 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -0,0 +1,163 @@ +package crazypants.enderio.machine; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MathHelper; +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.vecmath.VecmathUtil; + +public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile { + + // Power + protected Capacitors capacitorType; + + private int storedEnergyRF; + protected float lastSyncPowerStored = -1; + + protected AbstractPoweredMachineEntity(SlotDefinition slotDefinition) { + super(slotDefinition); + capacitorType = Capacitors.BASIC_CAPACITOR; + } + + @Override + public void updateEntity() { + + super.updateEntity(); + + if(worldObj == null) { // sanity check + return; + } + boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && worldObj.getTotalWorldTime() % 5 == 0); + if(powerChanged) { + lastSyncPowerStored = storedEnergyRF; + PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); + } + } + + //RF API Power + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return !isSideDisabled(from.ordinal()); + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + if(isSideDisabled(dir.ordinal())) { + return 0; + } + return getCapacitor().getMaxEnergyReceived(); + } + + @Override + public int getMaxEnergyStored() { + return getCapacitor().getMaxEnergyStored(); + } + + @Override + public void setEnergyStored(int stored) { + storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); + } + + @Override + public int getEnergyStored() { + return storedEnergyRF; + } + + //----- Common Machine Functions + + @Override + public boolean displayPower() { + return true; + } + + public boolean hasPower() { + return storedEnergyRF > 0; + } + + public ICapacitor getCapacitor() { + return capacitorType.capacitor; + } + + public int getEnergyStoredScaled(int scale) { + // NB: called on the client so can't use the power provider + return VecmathUtil.clamp(Math.round(scale * ((float) storedEnergyRF / getMaxEnergyStored())), 0, scale); + } + + public void setCapacitor(Capacitors capacitorType) { + this.capacitorType = capacitorType; + forceClientUpdate = true; + //Force a check that the new value is in bounds + setEnergyStored(getEnergyStored()); + } + + public int getPowerUsePerTick() { + return getCapacitor().getMaxEnergyExtracted(); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack contents) { + super.setInventorySlotContents(slot, contents); + if(slotDefinition.isUpgradeSlot(slot)) { + updateCapacitorFromSlot(); + } + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + ItemStack res = super.decrStackSize(fromSlot, amount); + if(slotDefinition.isUpgradeSlot(fromSlot)) { + updateCapacitorFromSlot(); + } + return res; + } + + private void updateCapacitorFromSlot() { + if(slotDefinition.getNumUpgradeSlots() <= 0) { + setCapacitor(Capacitors.BASIC_CAPACITOR); + return; + } + ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; + if(contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { + setCapacitor(Capacitors.BASIC_CAPACITOR); + } else { + setCapacitor(Capacitors.values()[contents.getItemDamage()]); + } + } + + //--------- NBT + + /** + * Read state common to both block and item + */ + @Override + public void readCommon(NBTTagCompound nbtRoot) { + super.readCommon(nbtRoot); + setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); + int energy; + if(nbtRoot.hasKey("storedEnergy")) { + float storedEnergyMJ = nbtRoot.getFloat("storedEnergy"); + energy = (int) (storedEnergyMJ * 10); + } else { + energy = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); + } + setEnergyStored(energy); + } + + /** + * Write state common to both block and item + */ + @Override + public void writeCommon(NBTTagCompound nbtRoot) { + super.writeCommon(nbtRoot); + nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, storedEnergyRF); + nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 8ac611b9..4856cb3c 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -10,9 +10,8 @@ import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPowerReceiver; -import crazypants.enderio.power.PowerHandlerUtil; -public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity implements IInternalPowerReceiver { +public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEntity implements IInternalPowerReceiver { protected IPoweredTask currentTask = null; protected IMachineRecipe lastCompletedRecipe; @@ -71,26 +70,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im return currentTask == null ? 0 : currentTask.getProgress(); } - //RF API Power - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(isSideDisabled(from.ordinal())) { - return 0; - } - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getMaxEnergyStored(); - } - public IPoweredTask getCurrentTask() { return currentTask; } diff --git a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java index ad4f6a89..75309210 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java @@ -5,7 +5,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.util.Util; public class ContainerAlloySmelter extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index 261184e9..b7b901ca 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -9,8 +9,8 @@ import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.alloy.TileAlloySmelter.Mode; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.gui.IconButton; @@ -18,7 +18,7 @@ import crazypants.render.RenderUtil; import crazypants.util.Lang; import crazypants.vecmath.Vector4f; -public class GuiAlloySmelter extends GuiMachineBase { +public class GuiAlloySmelter extends GuiPoweredMachineBase { private TileAlloySmelter tileEntity; diff --git a/src/main/java/crazypants/enderio/machine/attractor/ContainerAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/ContainerAttractor.java index 07f7dd9a..a440c2ea 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/ContainerAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/ContainerAttractor.java @@ -3,8 +3,8 @@ package crazypants.enderio.machine.attractor; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerAttractor extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java index e455c831..778b4cf4 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/GuiAttractor.java @@ -9,12 +9,12 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; -import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; -public class GuiAttractor extends GuiMachineBase { +public class GuiAttractor extends GuiPoweredMachineBase { private static final int RANGE_ID = 8738924; diff --git a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java index e7464eb1..36f031e5 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/TileAttractor.java @@ -33,7 +33,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.AbstractPowerConsumerEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.ranged.IRanged; import crazypants.enderio.machine.ranged.RangeEntity; @@ -44,7 +44,7 @@ import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.vecmath.Vector3d; -public class TileAttractor extends AbstractMachineEntity implements IRanged { +public class TileAttractor extends AbstractPowerConsumerEntity implements IRanged { private AxisAlignedBB attractorBounds; private FakePlayer target; diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index dec240a9..0c7df9c0 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -18,8 +18,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.machine.GuiMachineBase; -import crazypants.enderio.machine.GuiOverlayIoConfig; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; @@ -27,6 +25,8 @@ import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.NetworkState; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; @@ -111,7 +111,7 @@ public class GuiCapBank extends GuiContainerBase { }); - int x = xSize - rightMargin - GuiMachineBase.BUTTON_SIZE - 21; + int x = xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE - 21; int y = inputY; inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { @@ -197,7 +197,7 @@ public class GuiCapBank extends GuiContainerBase { configB.onGuiInit(); - int x = guiLeft + xSize - rightMargin - GuiMachineBase.BUTTON_SIZE; + int x = guiLeft + xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE; int y = guiTop + inputY; FontRenderer fontRenderer = getFontRenderer(); diff --git a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java index 8d8e537b..1ded7860 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/ContainerCrafter.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.gui.TemplateSlot; public class ContainerCrafter extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index ce7bc535..9ec97320 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -10,14 +10,14 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; -import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.IItemBuffer; import crazypants.enderio.machine.PacketItemBuffer; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; -public class GuiCrafter extends GuiMachineBase { +public class GuiCrafter extends GuiPoweredMachineBase { private IItemBuffer entity; diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index c1abd1a8..a5d4e9c5 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -12,14 +12,14 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.AbstractPowerConsumerEntity; import crazypants.enderio.machine.IItemBuffer; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -public class TileCrafter extends AbstractMachineEntity implements IItemBuffer { +public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuffer { DummyCraftingGrid craftingGrid = new DummyCraftingGrid(); diff --git a/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java index 5a39f931..b545ada5 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/ContainerCrusher.java @@ -3,8 +3,8 @@ package crazypants.enderio.machine.crusher; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerCrusher extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java index 9c0cf049..8decc7de 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java @@ -4,10 +4,10 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.RenderUtil; -public class GuiCrusher extends GuiMachineBase { +public class GuiCrusher extends GuiPoweredMachineBase { private TileCrusher tileEntity; diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java index 1dbedf24..002cc1a8 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java @@ -5,7 +5,7 @@ import java.awt.Point; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class FarmStationContainer extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index ded40183..b5d0fd6f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -8,11 +8,11 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -public class GuiFarmStation extends GuiMachineBase { +public class GuiFarmStation extends GuiPoweredMachineBase { public GuiFarmStation(InventoryPlayer par1InventoryPlayer, TileFarmStation machine) { super(machine, new FarmStationContainer(par1InventoryPlayer, machine)); diff --git a/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java b/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java index ce101adf..702a3d87 100644 --- a/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java +++ b/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java @@ -1,11 +1,11 @@ package crazypants.enderio.machine.generator; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.AbstractPoweredMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.IInternalPowerProvider; -public abstract class AbstractGeneratorEntity extends AbstractMachineEntity implements IInternalPowerProvider { +public abstract class AbstractGeneratorEntity extends AbstractPoweredMachineEntity implements IInternalPowerProvider { //RF API Power diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java b/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java index 8acceddf..1c9de92f 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/ContainerCombustionEngine.java @@ -1,8 +1,8 @@ package crazypants.enderio.machine.generator.combustion; import net.minecraft.entity.player.InventoryPlayer; -import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerCombustionEngine extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index 7a1b072c..fd6353c9 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -9,21 +9,21 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; import crazypants.enderio.fluid.Fluids; -import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; -public class GuiCombustionGenerator extends GuiMachineBase { +public class GuiCombustionGenerator extends GuiPoweredMachineBase { private TileCombustionGenerator gen; public GuiCombustionGenerator(InventoryPlayer par1InventoryPlayer, TileCombustionGenerator te) { super(te, new ContainerCombustionEngine(par1InventoryPlayer, te)); - this.gen = te; + gen = te; addToolTip(new GuiToolTip(new Rectangle(114, 21, 15, 47), "") { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index e8f4387c..5dcb6b46 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -9,14 +9,14 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; @SideOnly(Side.CLIENT) -public class GuiStirlingGenerator extends GuiMachineBase { +public class GuiStirlingGenerator extends GuiPoweredMachineBase { private TileEntityStirlingGenerator entity; diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java b/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java index b0c233ee..b6270227 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/StirlingGeneratorContainer.java @@ -3,8 +3,8 @@ package crazypants.enderio.machine.generator.stirling; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class StirlingGeneratorContainer extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java index 5428fdfa..a539b3c1 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/ContainerZombieGenerator.java @@ -1,8 +1,8 @@ package crazypants.enderio.machine.generator.zombie; import net.minecraft.entity.player.InventoryPlayer; -import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerZombieGenerator extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index 0a99c8e4..66df0b07 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -9,15 +9,15 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; import crazypants.enderio.fluid.Fluids; -import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; -public class GuiZombieGenerator extends GuiMachineBase { +public class GuiZombieGenerator extends GuiPoweredMachineBase { private TileZombieGenerator gen; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java similarity index 97% rename from src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java rename to src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 985f90ef..361b1d72 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine; +package crazypants.enderio.machine.gui; import java.awt.Point; import java.util.ArrayList; @@ -6,6 +6,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.SlotDefinition; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java similarity index 63% rename from src/main/java/crazypants/enderio/machine/GuiMachineBase.java rename to src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index e9ccc49e..77734843 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -1,7 +1,4 @@ -package crazypants.enderio.machine; - -import java.awt.Rectangle; -import java.util.List; +package crazypants.enderio.machine.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.Container; @@ -14,9 +11,10 @@ import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.SlotDefinition; import crazypants.gui.GuiContainerBase; -import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; import crazypants.util.BlockCoord; import crazypants.util.Lang; @@ -27,12 +25,6 @@ public abstract class GuiMachineBase extends GuiContainerBase { public static final Vector4f PUSH_COLOR = new Vector4f(0.8f, 0.4f, 0.1f, 0.5f); public static final Vector4f PULL_COLOR = new Vector4f(0.1f, 0.4f, 0.8f, 0.5f); - protected static final int POWER_Y = 14; - protected final int POWER_X = 15; - protected static final int POWER_WIDTH = 10; - protected static final int POWER_HEIGHT = 42; - protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - public static final int BUTTON_SIZE = 16; private static final int CONFIG_ID = 8962349; @@ -44,22 +36,10 @@ public abstract class GuiMachineBase extends GuiContainerBase { protected IconButtonEIO configB; - public GuiMachineBase(AbstractMachineEntity machine, Container container) { - super(container); + protected GuiMachineBase(AbstractMachineEntity machine, Container par1Container) { + super(par1Container); tileEntity = machine; - if(renderPowerBar()) { - addToolTip(new GuiToolTip(new Rectangle(getPowerX(), getPowerY(), getPowerWidth(), getPowerHeight()), "") { - @Override - protected void updateText() { - text.clear(); - if(renderPowerBar()) { - updatePowerBarTooltip(text); - } - } - - }); - } xSize = getXSize(); ySize = getYSize(); int x = getXSize() - 5 - BUTTON_SIZE; @@ -82,22 +62,44 @@ public abstract class GuiMachineBase extends GuiContainerBase { addOverlay(configOverlay); } + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if(b.id == CONFIG_ID) { + boolean vis = !configOverlay.isVisible(); + configOverlay.setVisible(vis); + } + } + + @Override + public void initGui() { + super.initGui(); + redstoneButton.onGuiInit(); + configB.onGuiInit(); + } + protected boolean showRecipeButton() { return EnderIO.proxy.isNeiInstalled(); } - protected String getPowerOutputLabel() { - return "Max: "; - } - - protected int getPowerOutputValue() { - return tileEntity.getPowerUsePerTick(); - } - - protected void updatePowerBarTooltip(List text) { - text.add(getPowerOutputLabel() + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr()); - text.add(PowerDisplayUtil.formatStoredPower(tileEntity.getEnergyStored(), tileEntity.getCapacitor().getMaxEnergyStored())); + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + + for (int i = 0; i < buttonList.size(); ++i) { + GuiButton guibutton = (GuiButton) buttonList.get(i); + guibutton.drawButton(mc, 0, 0); + } + + if(showRecipeButton()) { + IconEIO.RECIPE.renderIcon(k + 155, l + 43, 16, 16, 0, true); + } + + renderSlotHighlights(); + } public void renderSlotHighlights() { @@ -109,7 +111,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { } } } - + public void renderSlotHighlights(IoMode mode) { SlotDefinition slotDef = tileEntity.getSlotDefinition(); if(slotDef.getNumInputSlots() > 0 && (mode == IoMode.PULL || mode == IoMode.PUSH_PULL)) { @@ -135,77 +137,4 @@ public abstract class GuiMachineBase extends GuiContainerBase { GL11.glDisable(GL11.GL_BLEND); } - public void renderPowerBar(int k, int l) { - if(renderPowerBar()) { - int i1 = tileEntity.getEnergyStoredScaled(getPowerHeight()); - // x, y, u, v, width, height - drawTexturedModalRect(k + getPowerX(), l + (getPowerY() + getPowerHeight()) - i1, getPowerU(), getPowerV(), getPowerWidth(), i1); - } - } - - protected int getPowerX() { - return POWER_X; - } - - protected int getPowerY() { - return POWER_Y; - } - - protected int getPowerWidth() { - return POWER_WIDTH; - } - - protected int getPowerHeight() { - return POWER_HEIGHT; - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == CONFIG_ID) { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); - } - } - - @Override - public void initGui() { - super.initGui(); - redstoneButton.onGuiInit(); - configB.onGuiInit(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; - renderPowerBar(k, l); - - for (int i = 0; i < buttonList.size(); ++i) { - GuiButton guibutton = (GuiButton) this.buttonList.get(i); - guibutton.drawButton(this.mc, 0, 0); - } - - if(showRecipeButton()) { - IconEIO.RECIPE.renderIcon(k + 155, l + 43, 16, 16, 0, true); - } - - renderSlotHighlights(); - - } - - protected int getPowerV() { - return 31; - } - - protected int getPowerU() { - return 176; - } - - protected boolean renderPowerBar() { - return true; - } - } diff --git a/src/main/java/crazypants/enderio/machine/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java similarity index 95% rename from src/main/java/crazypants/enderio/machine/GuiOverlayIoConfig.java rename to src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index bf49fa38..16f6af0e 100644 --- a/src/main/java/crazypants/enderio/machine/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine; +package crazypants.enderio.machine.gui; import java.awt.Color; import java.awt.Rectangle; @@ -13,6 +13,8 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IoConfigRenderer; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; +import crazypants.enderio.machine.IIoConfigurable; +import crazypants.enderio.machine.IoMode; import crazypants.gui.IGuiScreen; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java new file mode 100644 index 00000000..c9c0b28d --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -0,0 +1,103 @@ +package crazypants.enderio.machine.gui; + +import java.awt.Rectangle; +import java.util.List; + +import net.minecraft.inventory.Container; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.machine.AbstractPoweredMachineEntity; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.gui.GuiToolTip; + +public abstract class GuiPoweredMachineBase extends GuiMachineBase { + + protected static final int POWER_Y = 14; + protected final int POWER_X = 15; + protected static final int POWER_WIDTH = 10; + protected static final int POWER_HEIGHT = 42; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + + private AbstractPoweredMachineEntity tileEntity; + + public GuiPoweredMachineBase(AbstractPoweredMachineEntity machine, Container container) { + super(machine, container); + tileEntity = machine; + if(renderPowerBar()) { + addToolTip(new GuiToolTip(new Rectangle(getPowerX(), getPowerY(), getPowerWidth(), getPowerHeight()), "") { + + @Override + protected void updateText() { + text.clear(); + if(renderPowerBar()) { + updatePowerBarTooltip(text); + } + } + + }); + } + } + + protected String getPowerOutputLabel() { + return "Max: "; + } + + protected int getPowerOutputValue() { + return tileEntity.getPowerUsePerTick(); + } + + protected void updatePowerBarTooltip(List text) { + text.add(getPowerOutputLabel() + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + PowerDisplayUtil.abrevation() + + PowerDisplayUtil.perTickStr()); + text.add(PowerDisplayUtil.formatStoredPower(tileEntity.getEnergyStored(), tileEntity.getCapacitor().getMaxEnergyStored())); + } + + public void renderPowerBar(int k, int l) { + if(renderPowerBar()) { + int i1 = tileEntity.getEnergyStoredScaled(getPowerHeight()); + // x, y, u, v, width, height + drawTexturedModalRect(k + getPowerX(), l + (getPowerY() + getPowerHeight()) - i1, getPowerU(), getPowerV(), getPowerWidth(), i1); + } + } + + protected int getPowerX() { + return POWER_X; + } + + protected int getPowerY() { + return POWER_Y; + } + + protected int getPowerWidth() { + return POWER_WIDTH; + } + + protected int getPowerHeight() { + return POWER_HEIGHT; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + renderPowerBar(k, l); + + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + } + + protected int getPowerV() { + return 31; + } + + protected int getPowerU() { + return 176; + } + + protected boolean renderPowerBar() { + return true; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java index a432c0c9..535ed2e4 100644 --- a/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/ContainerKillerJoe.java @@ -3,8 +3,8 @@ package crazypants.enderio.machine.killera; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerKillerJoe extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java index faae248a..c7d00599 100644 --- a/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/GuiKillerJoe.java @@ -1,30 +1,21 @@ package crazypants.enderio.machine.killera; -import java.awt.Color; import java.awt.Rectangle; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.GuiMachineBase; import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.PacketRedstoneMode; -import crazypants.enderio.machine.generator.zombie.ContainerZombieGenerator; -import crazypants.enderio.machine.generator.zombie.TileZombieGenerator; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.machine.gui.GuiMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketGivePlayerXP; import crazypants.gui.GuiToolTip; -import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; import crazypants.util.SoundUtil; @@ -87,11 +78,6 @@ public class GuiKillerJoe extends GuiMachineBase { return false; } - @Override - protected boolean renderPowerBar() { - return false; - } - @Override public void renderSlotHighlights(IoMode mode) { super.renderSlotHighlights(mode); diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 4a28a669..e0a7b69e 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -317,13 +317,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle return hooverBounds; } - //------------------------------- Power - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return false; - } - //------------------------------- Fluid Stuff private void useNutrient() { @@ -478,8 +471,4 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } } - @Override - public boolean displayPower() { - return false; - } } diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index 1f429415..3f5eaa5e 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -12,14 +12,14 @@ import crazypants.enderio.conduit.power.NetworkPowerManager; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.power.PowerTracker; import crazypants.enderio.conduit.redstone.Signal; -import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.AbstractPowerConsumerEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.DyeColor; -public class TilePowerMonitor extends AbstractMachineEntity implements IInternalPoweredTile { +public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IInternalPoweredTile { int energyPerTick = 1; diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java b/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java index 8decea36..63bd9596 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPainter.java @@ -1,16 +1,17 @@ package crazypants.enderio.machine.painter; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.AbstractPoweredMachineEntity; public class BlockPainter extends AbstractMachineBlock { @@ -43,7 +44,7 @@ public class BlockPainter extends AbstractMachineBlock { @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); - return new GuiPainter(player.inventory, (AbstractMachineEntity) te); + return new GuiPainter(player.inventory, (AbstractPoweredMachineEntity) te); } @Override diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index cc003138..1a98e0e2 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -7,16 +7,17 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.AbstractPoweredMachineEntity; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.RenderUtil; import crazypants.vecmath.Vector4f; @SideOnly(Side.CLIENT) -public class GuiPainter extends GuiMachineBase { +public class GuiPainter extends GuiPoweredMachineBase { private AbstractMachineEntity tileEntity; - public GuiPainter(InventoryPlayer par1InventoryPlayer, AbstractMachineEntity furnaceInventory) { + public GuiPainter(InventoryPlayer par1InventoryPlayer, AbstractPoweredMachineEntity furnaceInventory) { super(furnaceInventory, new PainterContainer(par1InventoryPlayer, furnaceInventory)); tileEntity = furnaceInventory; } @@ -32,7 +33,7 @@ public class GuiPainter extends GuiMachineBase { int k = (width - xSize) / 2; int l = (height - ySize) / 2; - drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + drawTexturedModalRect(k, l, 0, 0, xSize, ySize); int i1; i1 = tileEntity.getProgressScaled(24); diff --git a/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java b/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java index 1099f7cf..777fadcf 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java +++ b/src/main/java/crazypants/enderio/machine/painter/PainterContainer.java @@ -3,8 +3,8 @@ package crazypants.enderio.machine.painter; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.gui.AbstractMachineContainer; public class PainterContainer extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java index a62bdd22..111f3e52 100644 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java @@ -17,11 +17,11 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.machine.GuiMachineBase; -import crazypants.enderio.machine.GuiOverlayIoConfig; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; @@ -78,7 +78,7 @@ public class GuiCapacitorBank extends GuiContainerBase { }); - int x = xSize - rightMargin - GuiMachineBase.BUTTON_SIZE - 21; + int x = xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE - 21; int y = inputY; inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { @@ -165,7 +165,7 @@ public class GuiCapacitorBank extends GuiContainerBase { configB.onGuiInit(); - int x = guiLeft + xSize - rightMargin - GuiMachineBase.BUTTON_SIZE; + int x = guiLeft + xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE; int y = guiTop + inputY; FontRenderer fontRenderer = getFontRenderer(); diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java index 29b9652d..f1642585 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java @@ -2,27 +2,19 @@ package crazypants.enderio.machine.slicensplice; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; -import crazypants.enderio.machine.soul.BlockSoulBinder; -import crazypants.enderio.machine.soul.ContainerSoulBinder; -import crazypants.enderio.machine.soul.GuiSoulBinder; -import crazypants.enderio.machine.soul.SoulBinderSpawnerRecipe; -import crazypants.enderio.machine.soul.TileSoulBinder; -import crazypants.vecmath.Vector3f; +import crazypants.enderio.machine.AbstractPoweredMachineEntity; public class BlockSliceAndSplice extends AbstractMachineBlock { @@ -49,7 +41,7 @@ public class BlockSliceAndSplice extends AbstractMachineBlock