diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index af8b08ac..6f79e55a 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -139,7 +139,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { return usePower(getPowerUsePerTick()); } - protected int usePower(int wantToUse) { + public int usePower(int wantToUse) { int used = Math.min(getEnergyStored(), wantToUse); setEnergyStored( Math.max(0, getEnergyStored() - used)); currentTask.update(used); diff --git a/src/main/java/crazypants/enderio/machine/ContinuousTask.java b/src/main/java/crazypants/enderio/machine/ContinuousTask.java new file mode 100644 index 00000000..e4982b1e --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/ContinuousTask.java @@ -0,0 +1,56 @@ +package crazypants.enderio.machine; + +import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import net.minecraft.nbt.NBTTagCompound; + +public class ContinuousTask implements IPoweredTask { + + float powerUserPerTick; + + public ContinuousTask(float powerUsePerTick) { + this.powerUserPerTick = powerUsePerTick; + } + + @Override + public void writeToNBT(NBTTagCompound nbtRoot) { + } + + @Override + public void update(float availableEnergy) { + } + + @Override + public boolean isComplete() { + return false; + } + + @Override + public float getRequiredEnergy() { + return powerUserPerTick; + } + + @Override + public IMachineRecipe getRecipe() { + return null; + } + + @Override + public float getProgress() { + return 0.5f; + } + + @Override + public ResultStack[] getCompletedResult() { + return new ResultStack[0]; + } + + @Override + public float getChance() { + return 1; + } + + @Override + public MachineRecipeInput[] getInputs() { + return new MachineRecipeInput[0]; + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java index c3749091..8a09def7 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine; import java.awt.Rectangle; +import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.Container; @@ -53,10 +54,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { protected void updateText() { text.clear(); if(renderPowerBar()) { - text.add(getPowerOutputText() + PowerDisplayUtil.formatPower(tileEntity.getPowerUsePerTick()) + " " + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr()); - //text.add() - text.add(PowerDisplayUtil.formatStoredPower(tileEntity.getEnergyStored(), tileEntity.getCapacitor().getMaxEnergyStored())); + updatePowerBarTooltip(text); } } @@ -88,9 +86,19 @@ public abstract class GuiMachineBase extends GuiContainerBase { return EnderIO.proxy.isNeiInstalled(); } - protected String getPowerOutputText() { + 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 renderSlotHighlights(IoMode mode) { SlotDefinition slotDef = tileEntity.getSlotDefinition(); diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 103be70a..ded40183 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -45,7 +45,7 @@ public class GuiFarmStation extends GuiMachineBase { return false; } - protected String getPowerOutputText() { + protected String getPowerOutputLabel() { return "Base Use: "; } } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index d9f8a39d..45ea17bd 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -20,10 +20,9 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; -import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.IMachineRecipe.ResultStack; +import crazypants.enderio.machine.ContinuousTask; import crazypants.enderio.machine.IPoweredTask; -import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.farm.farmers.FarmersCommune; import crazypants.enderio.machine.farm.farmers.IHarvestResult; @@ -546,7 +545,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } IPoweredTask createTask() { - return new DummyTask(getPowerUsePerTick()); + return new ContinuousTask(getPowerUsePerTick()); } @Override @@ -555,56 +554,4 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { nbtRoot.setBoolean("isActive", isActive()); } - private static class DummyTask implements IPoweredTask { - - float powerUserPerTick; - - public DummyTask(float powerUsePerTick) { - this.powerUserPerTick = powerUsePerTick; - } - - @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - } - - @Override - public void update(float availableEnergy) { - } - - @Override - public boolean isComplete() { - return false; - } - - @Override - public float getRequiredEnergy() { - return powerUserPerTick; - } - - @Override - public IMachineRecipe getRecipe() { - return null; - } - - @Override - public float getProgress() { - return 0.5f; - } - - @Override - public ResultStack[] getCompletedResult() { - return new ResultStack[0]; - } - - @Override - public float getChance() { - return 1; - } - - @Override - public MachineRecipeInput[] getInputs() { - return new MachineRecipeInput[0]; - } - } - } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java index 634ed452..65b499f7 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -19,8 +19,8 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.generator.PowerDistributor; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDistributor; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; 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 a41020a3..e83d7622 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -11,9 +11,9 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.generator.PowerDistributor; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.PowerDistributor; import crazypants.util.BlockCoord; public class TileEntityStirlingGenerator extends AbstractMachineEntity implements ISidedInventory { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index 40b5ed98..e36553d4 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -16,8 +16,8 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.generator.PowerDistributor; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDistributor; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 25a4ba2a..32dd0711 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.transceiver; +import java.util.Random; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -78,4 +80,10 @@ public class BlockTransceiver extends AbstractMachineBlock { public boolean renderAsNormalBlock() { return false; } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + } + + } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index 45eb64aa..54af3080 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -10,8 +10,10 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import crazypants.enderio.Log; +import crazypants.enderio.config.Config; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.ForgeDirection; public class ServerChannelRegister extends ChannelRegister { @@ -98,5 +100,20 @@ public class ServerChannelRegister extends ChannelRegister { trans.removeSendChanel(channel); } } + + public void sendPower(TileTransceiver sender, int canSend, Channel channel) { + //TODO: Round robin somehow + for(TileTransceiver trans : transceivers) { + if(trans != sender && trans.getRecieveChannels(ChannelType.POWER).contains(channel)) { + double invLoss = 1 - Config.transceiverEnergyLoss; + int canSendWithLoss = (int)Math.round(canSend * invLoss); + int recieved = trans.receiveEnergy(ForgeDirection.UNKNOWN, canSendWithLoss, false); + if(recieved > 0) { + int recievedPlusLoss = (int)Math.round(recieved / invLoss); + sender.usePower(recievedPlusLoss); + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index 28cd54a5..740fbfec 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -5,57 +5,58 @@ import java.util.Collection; import java.util.EnumMap; import java.util.List; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; +import crazypants.enderio.machine.ContinuousTask; +import crazypants.enderio.machine.IMachineRecipe; +import crazypants.enderio.machine.IPoweredTask; +import crazypants.enderio.machine.PoweredTask; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.BasicCapacitor; +import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.PowerDistributor; +import crazypants.vecmath.VecmathUtil; public class TileTransceiver extends AbstractPoweredTaskEntity { + //Power will only be sent to other transceivers is the buffer is higher than this amount + private static final float MIN_POWER_TO_SEND = 0.5f; + private final EnumMap> sendChannels = new EnumMap>(ChannelType.class); private final EnumMap> recieveChannels = new EnumMap>(ChannelType.class); + private ICapacitor capacitor = new BasicCapacitor(Config.transceiverMaxIoRF * 2, 100000, Config.transceiverMaxIoRF); private boolean sendChannelsDirty = false; private boolean recieveChannelsDirty = false; private boolean registered = false; + private PowerDistributor powerDistributor; + public TileTransceiver() { super(new SlotDefinition(0, 0, 0)); for (ChannelType type : ChannelType.values()) { sendChannels.put(type, new ArrayList()); recieveChannels.put(type, new ArrayList()); } + currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); } - + @Override - public String getMachineName() { - return ModObject.blockTransceiver.unlocalisedName; - } - - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return true; - } - - @Override - public void invalidate() { - super.invalidate(); - if(registered && worldObj != null && !worldObj.isRemote) { - ServerChannelRegister.instance.dergister(this); - registered = false; - } - } - - @Override - public void onChunkUnload() { - super.onChunkUnload(); - if(registered && worldObj != null && !worldObj.isRemote) { - ServerChannelRegister.instance.dergister(this); - registered = false; - } + protected boolean processTasks(boolean redstoneChecksPassed) { + boolean res = super.processTasks(redstoneChecksPassed); + if(!redstoneChecksPassed) { + return res; + } + + processPower(); + return res; } @Override @@ -79,6 +80,24 @@ public class TileTransceiver extends AbstractPoweredTaskEntity { } } } + + @Override + public void invalidate() { + super.invalidate(); + if(registered && worldObj != null && !worldObj.isRemote) { + ServerChannelRegister.instance.dergister(this); + registered = false; + } + } + + @Override + public void onChunkUnload() { + super.onChunkUnload(); + if(registered && worldObj != null && !worldObj.isRemote) { + ServerChannelRegister.instance.dergister(this); + registered = false; + } + } private void removeUnregsiteredChannels(EnumMap> channels) { List toRemove = new ArrayList(); @@ -93,6 +112,30 @@ public class TileTransceiver extends AbstractPoweredTaskEntity { removeChannel(chan, channels); } } + + @Override + public String getMachineName() { + return ModObject.blockTransceiver.unlocalisedName; + } + + @Override + public boolean isActive() { + return hasPower(); + } + + @Override + protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { + return true; + } + + @Override + public ICapacitor getCapacitor() { + return capacitor; + } + + public int getPowerUsePerTick() { + return Config.transceiverUpkeepCostRF; + } public List getSendChannels(ChannelType type) { return sendChannels.get(type); @@ -155,9 +198,11 @@ public class TileTransceiver extends AbstractPoweredTaskEntity { readChannels(nbtRoot, sendChannels, "sendChannels"); readChannels(nbtRoot, recieveChannels, "recieveChannels"); + + currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); } - + static void readChannels(NBTTagCompound nbtRoot, EnumMap> readInto, String key) { for (ChannelType type : ChannelType.values()) { @@ -224,4 +269,41 @@ public class TileTransceiver extends AbstractPoweredTaskEntity { return recieveChannels; } + //Power Handling + + private void processPower() { + List sendTo = getSendChannels(ChannelType.POWER); + int canSend = getMaxSendableEnergy(); + if(canSend > 0 && !sendTo.isEmpty()) { + for(int i=0;i 0;i++) { + ServerChannelRegister.instance.sendPower(this, canSend, sendTo.get(i)); + canSend = getMaxSendableEnergy(); + } + } + canSend = getMaxSendableEnergy(); + if(canSend > 0 && !getRecieveChannels(ChannelType.POWER).isEmpty()) { + if(powerDistributor == null) { + powerDistributor = new PowerDistributor(getLocation()); + } + int used = powerDistributor.transmitEnergy(worldObj, canSend); + usePower(used); + } + } + + private int getMaxSendableEnergy() { + return getEnergyStored() - (int)(MIN_POWER_TO_SEND * getMaxEnergyStored()); + } + + private float getEnergyStoredRatio() { + return (float)getEnergyStored() / getMaxEnergyStored(); + } + + @Override + public void onNeighborBlockChange(Block blockId) { + super.onNeighborBlockChange(blockId); + if(powerDistributor != null) { + powerDistributor.neighboursChanged(); + } + } + } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index 6abb42f6..7a728898 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -6,6 +6,7 @@ import java.util.List; import org.lwjgl.opengl.GL11; +import crazypants.enderio.config.Config; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; @@ -26,35 +27,41 @@ import net.minecraft.entity.player.InventoryPlayer; public class GuiTransceiver extends GuiMachineBase { private static final int TAB_HEIGHT = 24; - + private TileTransceiver entity; private int activeTab = 0; private final List tabs = new ArrayList(); private int tabYOffset = 4; - + ContainerTransceiver container; TileTransceiver transceiver; - + public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { super(te, new ContainerTransceiver(par1InventoryPlayer, te)); this.entity = te; - container = (ContainerTransceiver)inventorySlots; + container = (ContainerTransceiver) inventorySlots; transceiver = te; - + tabs.add(new GeneralTab(this)); tabs.add(new ChannelTab(this, ChannelType.POWER)); tabs.add(new ChannelTab(this, ChannelType.ITEM)); tabs.add(new ChannelTab(this, ChannelType.FLUID)); } + protected void updatePowerBarTooltip(List text) { + text.add("Upkeep: " + PowerDisplayUtil.formatPower(getPowerOutputValue()) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr()); + text.add("Max IO: " + PowerDisplayUtil.formatPower(Config.transceiverMaxIoRF) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr()); + text.add(PowerDisplayUtil.formatStoredPower(transceiver.getEnergyStored(), transceiver.getCapacitor().getMaxEnergyStored())); + } + @Override protected boolean showRecipeButton() { return false; } - + @Override - public int getXSize() { + public int getXSize() { return 256; } @@ -67,9 +74,9 @@ public class GuiTransceiver extends GuiMachineBase { } } } - + @Override - protected void keyTyped(char par1, int par2) { + protected void keyTyped(char par1, int par2) { if(par2 == 1) { for (IGuiOverlay overlay : overlays) { if(overlay.isVisible()) { @@ -79,7 +86,7 @@ public class GuiTransceiver extends GuiMachineBase { } this.mc.thePlayer.closeScreen(); } - + for (int i = 0; i < tabs.size(); i++) { if(i == activeTab) { tabs.get(i).keyTyped(par1, par2); @@ -89,7 +96,7 @@ public class GuiTransceiver extends GuiMachineBase { } @Override - public void initGui() { + public void initGui() { super.initGui(); for (int i = 0; i < tabs.size(); i++) { if(i == activeTab) { @@ -97,9 +104,9 @@ public class GuiTransceiver extends GuiMachineBase { } else { tabs.get(i).deactivate(); } - } + } configB.visible = activeTab == 0; - redstoneButton.visible = activeTab == 0; + redstoneButton.visible = activeTab == 0; } @Override @@ -133,7 +140,7 @@ public class GuiTransceiver extends GuiMachineBase { } @Override - protected void mouseClicked(int x, int y, int par3) { + protected void mouseClicked(int x, int y, int par3) { super.mouseClicked(x, y, par3); int tabLeftX = xSize; @@ -154,7 +161,6 @@ public class GuiTransceiver extends GuiMachineBase { } tabs.get(activeTab).mouseClicked(x, y, par3); } - @Override protected void actionPerformed(GuiButton guiButton) { @@ -183,7 +189,7 @@ public class GuiTransceiver extends GuiMachineBase { } tes.draw(); - + RenderUtil.bindTexture("enderio:textures/gui/transceiver.png"); drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); if(renderPowerBar()) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index cb1916f6..e61ba407 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -53,10 +53,10 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II Tessellator.instance.setColorOpaque_F(f, f, f); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) l1, (float) l2); - model.render(cube, x, y, z); - if(cube.isActive()) { + model.render(cube, x, y, z); + if(cube.isActive()) { renderPower(te.getWorldObj(), x, y, z, true); - } + } GL11.glDisable(GL12.GL_RESCALE_NORMAL); } diff --git a/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java b/src/main/java/crazypants/enderio/power/PowerDistributor.java similarity index 94% rename from src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java rename to src/main/java/crazypants/enderio/power/PowerDistributor.java index 00a7628f..eb4788bb 100644 --- a/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/power/PowerDistributor.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.generator; +package crazypants.enderio.power; import java.util.ArrayList; import java.util.List; @@ -7,8 +7,6 @@ import java.util.ListIterator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import crazypants.enderio.power.IPowerInterface; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; public class PowerDistributor {