From 92604141773cded34af8b9abedb5f89315517ea2 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 3 Mar 2015 18:18:32 -0500 Subject: [PATCH] Finished implementing Induction Matrix core functionality, just about everything works! Need to redesign GUI to include separate gauge for output rate --- .../client/gui/GuiInductionMatrix.java | 34 +++--- .../mekanism/common/base/IEnergyWrapper.java | 31 ++++++ .../mekanism/common/block/BlockBasic.java | 4 +- .../content/matrix/MatrixUpdateProtocol.java | 16 ++- .../matrix/SynchronizedMatrixData.java | 4 +- .../common/tile/TileEntityChargepad.java | 2 +- .../common/tile/TileEntityElectricBlock.java | 23 ++-- .../common/tile/TileEntityElectricPump.java | 2 +- .../common/tile/TileEntityEnergyCube.java | 2 +- .../common/tile/TileEntityEntangledBlock.java | 5 +- .../tile/TileEntityFluidicPlenisher.java | 2 +- .../tile/TileEntityInductionCasing.java | 83 +++++++++++++- .../common/tile/TileEntityInductionCell.java | 6 +- .../common/tile/TileEntityInductionPort.java | 101 +++++++++++------- .../mekanism/common/tile/TileEntityLaser.java | 2 +- .../tile/TileEntityLogisticalSorter.java | 2 +- .../tile/TileEntitySeismicVibrator.java | 2 +- .../java/mekanism/common/util/CableUtils.java | 26 ++--- .../mekanism/common/util/ChargeUtils.java | 62 ++++++----- .../common/tile/TileEntityGenerator.java | 2 +- .../tile/reactor/TileEntityReactorBlock.java | 2 +- .../tile/reactor/TileEntityReactorPort.java | 2 +- 22 files changed, 273 insertions(+), 142 deletions(-) create mode 100644 src/main/java/mekanism/common/base/IEnergyWrapper.java diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 8f3d0cc01..c8a705154 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.tile.TileEntityInductionCasing; @@ -32,18 +34,15 @@ public class GuiInductionMatrix extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); - /*fontRendererObj.drawString(MekanismUtils.localize("gui.volume") + ": " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00); - fontRendererObj.drawString(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ":" : MekanismUtils.localize("gui.noFluid"), 53, 44, 0x00CD00); - - if(tileEntity.structure.fluidStored != null) - { - fontRendererObj.drawString(tileEntity.structure.fluidStored.amount + "mB", 53, 53, 0x00CD00); - } + fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ":", 53, 26, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()), 53, 35, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.localize("gui.output") + ":", 53, 44, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.structure.outputCap), 53, 53, 0x00CD00); if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); - }*/ + drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), xAxis, yAxis); + } super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @@ -59,20 +58,15 @@ public class GuiInductionMatrix extends GuiMekanism int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - /*if(tileEntity.getScaledFluidLevel(58) > 0) + if(tileEntity.getScaledEnergyLevel(58) > 0) { - displayGauge(7, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 0); - displayGauge(23, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 1); - }*/ + displayGauge(7, 14, tileEntity.getScaledEnergyLevel(58), 0); + displayGauge(23, 14, tileEntity.getScaledEnergyLevel(58), 1); + } } - public void displayGauge(int xPos, int yPos, int scale, FluidStack fluid, int side /*0-left, 1-right*/) + public void displayGauge(int xPos, int yPos, int scale, int side /*0-left, 1-right*/) { - if(fluid == null) - { - return; - } - int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; @@ -93,7 +87,7 @@ public class GuiInductionMatrix extends GuiMekanism } mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); + drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, MekanismRenderer.energyIcon, 16, 16 - (16 - renderRemaining)); start+=16; if(renderRemaining == 0 || scale == 0) diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java new file mode 100644 index 000000000..9bbde03fa --- /dev/null +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -0,0 +1,31 @@ +package mekanism.common.base; + +import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergySource; +import ic2.api.tile.IEnergyStorage; + +import java.util.EnumSet; + +import mekanism.api.energy.ICableOutputter; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyStorage; +import net.minecraft.inventory.IInventory; +import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; + +@InterfaceList({ + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), + @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), + @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), + @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), +}) +public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter, IInventory +{ + public EnumSet getOutputtingSides(); + + public EnumSet getConsumingSides(); + + public double getMaxOutput(); +} diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index eca28b752..222f646ea 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -183,8 +183,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[0][0] = ctms[0][0].mainTextureData.icon; icons[1][0] = ctms[1][0].mainTextureData.icon; - icons[2][0] = ctms[2][0].facingOverride.icon; - icons[2][1] = ctms[2][1].facingOverride.icon; + //icons[2][0] = ctms[2][0].facingOverride.icon; + //icons[2][1] = ctms[2][1].facingOverride.icon; icons[2][0] = register.registerIcon("mekanism:InductionPortInput"); icons[2][1] = register.registerIcon("mekanism:InductionPortOutput"); icons[3][0] = register.registerIcon("mekanism:InductionCellBasic"); diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index 80c96bc99..1c77f3d6d 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -83,6 +83,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol { structure.cells.add(coord); structure.storageCap += ((TileEntityInductionCell)tile).tier.MAX_ELECTRICITY; + structure.electricityStored += ((TileEntityInductionCell)tile).getEnergy(); } else if(tile instanceof TileEntityInductionProvider) { @@ -95,13 +96,13 @@ public class MatrixUpdateProtocol extends UpdateProtocol @Override protected void onStructureDestroyed(SynchronizedMatrixData structure) { + if(structure.electricityStored <= 0) + { + return; + } + for(Coord4D coord : structure.cells) { - if(structure.electricityStored == 0) - { - break; - } - if(coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntityInductionCell) { TileEntityInductionCell cell = (TileEntityInductionCell)coord.getTileEntity(pointer.getWorldObj()); @@ -110,6 +111,11 @@ public class MatrixUpdateProtocol extends UpdateProtocol cell.setEnergy(cell.getEnergy()+toAdd); structure.electricityStored -= toAdd; } + + if(structure.electricityStored <= 0) + { + break; + } } } } diff --git a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java index 6744e29d6..31a19f251 100644 --- a/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java +++ b/src/main/java/mekanism/common/content/matrix/SynchronizedMatrixData.java @@ -17,8 +17,10 @@ public class SynchronizedMatrixData extends SynchronizedData providers = new HashSet(); - public double storageCap; + public double remainingOutput; + public double lastOutput; + public double storageCap; public double outputCap; @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 410baeee3..16b68d333 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -139,7 +139,7 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.of(ForgeDirection.DOWN, ForgeDirection.getOrientation(facing).getOpposite()); } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 186e7ed83..c034be3e8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -4,10 +4,7 @@ import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.tile.IEnergyConductor; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergyTile; -import ic2.api.tile.IEnergyStorage; import io.netty.buffer.ByteBuf; import java.util.ArrayList; @@ -15,27 +12,16 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.energy.ICableOutputter; -import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.common.base.IEnergyWrapper; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; -@InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), - @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), -}) -public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter +public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IEnergyWrapper { /** How much energy is stored in this block. */ public double electricityStored; @@ -107,18 +93,21 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } } + @Override public EnumSet getOutputtingSides() { return EnumSet.noneOf(ForgeDirection.class); } - protected EnumSet getConsumingSides() + @Override + public EnumSet getConsumingSides() { EnumSet set = EnumSet.allOf(ForgeDirection.class); set.remove(ForgeDirection.UNKNOWN); return set; } + @Override public double getMaxOutput() { return 0; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index e7da5639f..dc50e1be4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -377,7 +377,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 55c5bcbe6..865117959 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -107,7 +107,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { EnumSet set = EnumSet.allOf(ForgeDirection.class); set.removeAll(getOutputtingSides()); diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java index 51bcb7f6a..fe9d363f3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java @@ -72,16 +72,19 @@ public class TileEntityEntangledBlock extends TileEntityElectricBlock implements return data; } + @Override public EnumSet getOutputtingSides() { return sharedInventory == null ? nothing : EnumSet.of(ForgeDirection.UP); } - protected EnumSet getConsumingSides() + @Override + public EnumSet getConsumingSides() { return sharedInventory == null ? nothing : EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN, ForgeDirection.UP)); } + @Override public double getMaxOutput() { return sharedInventory == null ? 0 : 1000; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 3525e3fa7..70b2101c8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -395,7 +395,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 9decdcca5..488f17a83 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -1,13 +1,19 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; import mekanism.common.content.matrix.MatrixUpdateProtocol; import mekanism.common.content.matrix.SynchronizedMatrixData; import mekanism.common.multiblock.MultiblockManager; +import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; -public class TileEntityInductionCasing extends TileEntityMultiblock +public class TileEntityInductionCasing extends TileEntityMultiblock implements IStrictEnergyStorage { public TileEntityInductionCasing() { @@ -19,6 +25,54 @@ public class TileEntityInductionCasing extends TileEntityMultiblock getOutputtingSides() + { + if(structure != null && mode == true) + { + EnumSet set = EnumSet.allOf(ForgeDirection.class); + set.remove(ForgeDirection.UNKNOWN); + return set; + } + + return EnumSet.noneOf(ForgeDirection.class); + } + + @Override + public EnumSet getConsumingSides() + { + if(structure != null && mode == false) + { + EnumSet set = EnumSet.allOf(ForgeDirection.class); + set.remove(ForgeDirection.UNKNOWN); + return set; + } + + return EnumSet.noneOf(ForgeDirection.class); } @Override @@ -105,31 +139,10 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } } + @Override public double getMaxOutput() { - return structure != null ? structure.outputCap : 0; - } - - @Override - public double getEnergy() - { - return structure != null ? structure.electricityStored : 0; - } - - @Override - public void setEnergy(double energy) - { - if(structure != null) - { - structure.electricityStored = Math.max(Math.min(energy, getMaxEnergy()), 0); - MekanismUtils.saveChunk(this); - } - } - - @Override - public double getMaxEnergy() - { - return structure != null ? structure.storageCap : 0; + return structure != null ? structure.remainingOutput : 0; } @Override @@ -215,7 +228,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "CoFHAPI|energy") public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(structure != null && mode == false) + if(getConsumingSides().contains(from)) { double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive* general.FROM_TE); @@ -234,13 +247,14 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "CoFHAPI|energy") public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - if(structure != null && mode == true) + if(getOutputtingSides().contains(from)) { - double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract* general.FROM_TE)); + double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_TE)); if(!simulate) { setEnergy(getEnergy() - toSend); + structure.remainingOutput -= toSend; } return (int)Math.round(toSend* general.TO_TE); @@ -303,27 +317,27 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "IC2") public boolean isTeleporterCompatible(ForgeDirection side) { - return structure != null && mode == true; + return canOutputTo(side); } @Override public boolean canOutputTo(ForgeDirection side) { - return structure != null && mode == true; + return getOutputtingSides().contains(side); } @Override @Method(modid = "IC2") public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { - return structure != null && mode == false; + return getConsumingSides().contains(direction); } @Override @Method(modid = "IC2") public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) { - return structure != null && mode == true && receiver instanceof IEnergyConductor; + return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; } @Override @@ -364,7 +378,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override public boolean canReceiveEnergy(ForgeDirection side) { - return structure != null && mode == false; + return getConsumingSides().contains(side); } @Override @@ -390,13 +404,18 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "IC2") public void drawEnergy(double amount) { - setEnergy(Math.max(getEnergy() - (amount*general.FROM_IC2), 0)); + if(structure != null) + { + double toDraw = Math.min(amount*general.FROM_IC2, getMaxOutput()); + setEnergy(Math.max(getEnergy() - toDraw, 0)); + structure.remainingOutput -= toDraw; + } } @Override public double transferEnergyToAcceptor(ForgeDirection side, double amount) { - if(structure == null || mode == true) + if(!getConsumingSides().contains(side)) { return 0; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 43ea59113..aa765197d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -95,7 +95,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 61ee0377d..ce1677d40 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -555,7 +555,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.noneOf(ForgeDirection.class); } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index e39c0d952..59326e2c2 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -188,7 +188,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.of(ForgeDirection.UP); } diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index d02e2e985..a731e74ac 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,5 +1,10 @@ package mekanism.common.util; +import ic2.api.energy.EnergyNet; +import ic2.api.energy.tile.IEnergyAcceptor; +import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergySource; + import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -11,18 +16,13 @@ import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.base.IEnergyWrapper; import mekanism.common.tile.TileEntityElectricBlock; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; -import ic2.api.energy.EnergyNet; -import ic2.api.energy.tile.IEnergyAcceptor; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.energy.tile.IEnergySource; public final class CableUtils { @@ -218,16 +218,16 @@ public final class CableUtils return false; } - public static void emit(TileEntityElectricBlock emitter) + public static void emit(IEnergyWrapper emitter) { - if(!emitter.getWorldObj().isRemote && MekanismUtils.canFunction(emitter)) + if(!((TileEntity)emitter).getWorldObj().isRemote && MekanismUtils.canFunction((TileEntity)emitter)) { double energyToSend = Math.min(emitter.getEnergy(), emitter.getMaxOutput()); if(energyToSend > 0) { List outputtingSides = new ArrayList(); - boolean[] connectable = getConnections(emitter, emitter.getOutputtingSides()); + boolean[] connectable = getConnections((TileEntity)emitter, emitter.getOutputtingSides()); for(ForgeDirection side : emitter.getOutputtingSides()) { @@ -258,7 +258,7 @@ public final class CableUtils } } - private static double emit_do(TileEntityElectricBlock emitter, List outputtingSides, double totalToSend, boolean tryAgain) + private static double emit_do(IEnergyWrapper emitter, List outputtingSides, double totalToSend, boolean tryAgain) { double remains = totalToSend%outputtingSides.size(); double splitSend = (totalToSend-remains)/outputtingSides.size(); @@ -268,7 +268,7 @@ public final class CableUtils for(ForgeDirection side : outputtingSides) { - TileEntity tileEntity = Coord4D.get(emitter).getFromSide(side).getTileEntity(emitter.getWorldObj()); + TileEntity tileEntity = Coord4D.get((TileEntity)emitter).getFromSide(side).getTileEntity(((TileEntity)emitter).getWorldObj()); double toSend = splitSend+remains; remains = 0; @@ -289,7 +289,7 @@ public final class CableUtils return sent; } - private static double emit_do_do(TileEntityElectricBlock from, TileEntity tileEntity, ForgeDirection side, double currentSending, boolean tryAgain) + private static double emit_do_do(IEnergyWrapper from, TileEntity tileEntity, ForgeDirection side, double currentSending, boolean tryAgain) { double sent = 0; @@ -314,7 +314,7 @@ public final class CableUtils } else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) { - if(((IEnergySink)tileEntity).acceptsEnergyFrom(from, side.getOpposite())) + if(((IEnergySink)tileEntity).acceptsEnergyFrom((TileEntity)from, side.getOpposite())) { double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)tileEntity).getSinkTier())*general.FROM_IC2); toSend = Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2); diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index 6e1d61671..0485a49f0 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -1,17 +1,17 @@ package mekanism.common.util; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; +import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; -import mekanism.common.tile.TileEntityElectricBlock; - +import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; public final class ChargeUtils { @@ -20,42 +20,44 @@ public final class ChargeUtils * @param slotID - ID of the slot of which to charge * @param storer - TileEntity the item is being charged in */ - public static void discharge(int slotID, TileEntityElectricBlock storer) + public static void discharge(int slotID, IStrictEnergyStorage storer) { - if(storer.inventory[slotID] != null && storer.getEnergy() < storer.getMaxEnergy()) + IInventory inv = (TileEntityContainerBlock)storer; + + if(inv.getStackInSlot(slotID) != null && storer.getEnergy() < storer.getMaxEnergy()) { - if(storer.inventory[slotID].getItem() instanceof IEnergizedItem) + if(inv.getStackInSlot(slotID).getItem() instanceof IEnergizedItem) { - storer.setEnergy(storer.getEnergy() + EnergizedItemManager.discharge(storer.inventory[slotID], storer.getMaxEnergy() - storer.getEnergy())); + storer.setEnergy(storer.getEnergy() + EnergizedItemManager.discharge(inv.getStackInSlot(slotID), storer.getMaxEnergy() - storer.getEnergy())); } - else if(MekanismUtils.useIC2() && storer.inventory[slotID].getItem() instanceof IElectricItem) + else if(MekanismUtils.useIC2() && inv.getStackInSlot(slotID).getItem() instanceof IElectricItem) { - IElectricItem item = (IElectricItem)storer.inventory[slotID].getItem(); + IElectricItem item = (IElectricItem)inv.getStackInSlot(slotID).getItem(); - if(item.canProvideEnergy(storer.inventory[slotID])) + if(item.canProvideEnergy(inv.getStackInSlot(slotID))) { - double gain = ElectricItem.manager.discharge(storer.inventory[slotID], (int)((storer.getMaxEnergy() - storer.getEnergy())* general.TO_IC2), 4, true, true, false)* general.FROM_IC2; + double gain = ElectricItem.manager.discharge(inv.getStackInSlot(slotID), (int)((storer.getMaxEnergy() - storer.getEnergy())* general.TO_IC2), 4, true, true, false)* general.FROM_IC2; storer.setEnergy(storer.getEnergy() + gain); } } - else if(MekanismUtils.useRF() && storer.inventory[slotID].getItem() instanceof IEnergyContainerItem) + else if(MekanismUtils.useRF() && inv.getStackInSlot(slotID).getItem() instanceof IEnergyContainerItem) { - ItemStack itemStack = storer.inventory[slotID]; - IEnergyContainerItem item = (IEnergyContainerItem)storer.inventory[slotID].getItem(); + ItemStack itemStack = inv.getStackInSlot(slotID); + IEnergyContainerItem item = (IEnergyContainerItem)inv.getStackInSlot(slotID).getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); int toTransfer = (int)Math.round(Math.min(itemEnergy, ((storer.getMaxEnergy() - storer.getEnergy())* general.TO_TE))); storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); } - else if(storer.inventory[slotID].getItem() == Items.redstone && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) + else if(inv.getStackInSlot(slotID).getItem() == Items.redstone && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) { storer.setEnergy(storer.getEnergy() + general.ENERGY_PER_REDSTONE); - storer.inventory[slotID].stackSize--; + inv.getStackInSlot(slotID).stackSize--; - if(storer.inventory[slotID].stackSize <= 0) + if(inv.getStackInSlot(slotID).stackSize <= 0) { - storer.inventory[slotID] = null; + inv.setInventorySlotContents(slotID, null); } } } @@ -66,23 +68,25 @@ public final class ChargeUtils * @param slotID - ID of the slot of which to discharge * @param storer - TileEntity the item is being discharged in */ - public static void charge(int slotID, TileEntityElectricBlock storer) + public static void charge(int slotID, IStrictEnergyStorage storer) { - if(storer.inventory[slotID] != null && storer.getEnergy() > 0) + IInventory inv = (TileEntityContainerBlock)storer; + + if(inv.getStackInSlot(slotID) != null && storer.getEnergy() > 0) { - if(storer.inventory[slotID].getItem() instanceof IEnergizedItem) + if(inv.getStackInSlot(slotID).getItem() instanceof IEnergizedItem) { - storer.setEnergy(storer.getEnergy() - EnergizedItemManager.charge(storer.inventory[slotID], storer.getEnergy())); + storer.setEnergy(storer.getEnergy() - EnergizedItemManager.charge(inv.getStackInSlot(slotID), storer.getEnergy())); } - else if(Mekanism.hooks.IC2APILoaded && storer.inventory[slotID].getItem() instanceof IElectricItem) + else if(Mekanism.hooks.IC2APILoaded && inv.getStackInSlot(slotID).getItem() instanceof IElectricItem) { - double sent = ElectricItem.manager.charge(storer.inventory[slotID], (int)(storer.getEnergy()* general.TO_IC2), 4, true, false)* general.FROM_IC2; + double sent = ElectricItem.manager.charge(inv.getStackInSlot(slotID), (int)(storer.getEnergy()* general.TO_IC2), 4, true, false)* general.FROM_IC2; storer.setEnergy(storer.getEnergy() - sent); } - else if(MekanismUtils.useRF() && storer.inventory[slotID].getItem() instanceof IEnergyContainerItem) + else if(MekanismUtils.useRF() && inv.getStackInSlot(slotID).getItem() instanceof IEnergyContainerItem) { - ItemStack itemStack = storer.inventory[slotID]; - IEnergyContainerItem item = (IEnergyContainerItem)storer.inventory[slotID].getItem(); + ItemStack itemStack = inv.getStackInSlot(slotID); + IEnergyContainerItem item = (IEnergyContainerItem)inv.getStackInSlot(slotID).getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getMaxEnergyStored(itemStack) - item.getEnergyStored(itemStack))); int toTransfer = (int)Math.round(Math.min(itemEnergy, (storer.getEnergy()* general.TO_TE))); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 3bac24a72..b80cbc9ed 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -105,7 +105,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.noneOf(ForgeDirection.class); } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index e33a30901..327f9a876 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -84,7 +84,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.noneOf(ForgeDirection.class); } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 5c1139225..03a5bb4e2 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -209,7 +209,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - protected EnumSet getConsumingSides() + public EnumSet getConsumingSides() { return EnumSet.noneOf(ForgeDirection.class); }