diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 27f20bfd..ce1283ad 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -2,6 +2,11 @@ Version 2.2.3 ------------------------------------------------------ +RF Update +EIO machines and generators now implement only IEnergyReciver or IEnergyProvider instead of IEnergyHandler where appropriate +NOTE: This change means EIO will no longer work with old versions of the RF API. If you are getting an incompatible class + change exception it will be due to an installed mod including an old version of the RF API. + New - Added Dark Steel Ladder - Added new Capacitor Banks diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 01fde6cf..755e5ff3 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -18,14 +18,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.Offset; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPowerHandler; import crazypants.util.BlockCoord; @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2") -public interface IConduitBundle extends IInternalPowerReceptor, IFluidHandler, IItemDuct, IGasHandler, IGridHost { +public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, IItemDuct, IGasHandler, IGridHost { TileEntity getEntity(); + @Override BlockCoord getLocation(); // conduits diff --git a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java index ad843e5e..45b1fb4c 100644 --- a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java @@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; import crazypants.enderio.power.ICapacitor; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.IPowerInterface; -public interface IPowerConduit extends IConduit, IInternalPowerReceptor, IExtractor { +public interface IPowerConduit extends IConduit, IInternalPowerHandler, IExtractor { public static final String ICON_KEY = "enderio:powerConduit"; public static final String ICON_KEY_INPUT = "enderio:powerConduitInput"; @@ -24,6 +24,7 @@ public interface IPowerConduit extends IConduit, IInternalPowerReceptor, IExtrac int getMaxEnergyExtracted(ForgeDirection dir); + @Override int getMaxEnergyRecieved(ForgeDirection dir); IIcon getTextureForInputMode(); diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java index c2905d64..3363f046 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java @@ -24,8 +24,9 @@ import crazypants.enderio.conduit.power.NetworkPowerManager; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.power.PowerTracker; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.EnergyHandlerPI; +import crazypants.enderio.power.IInternalPowerReceiver; +import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.Lang; public class PacketConduitProbe implements IMessage, IMessageHandler { @@ -57,7 +58,7 @@ public class PacketConduitProbe implements IMessage, IMessageHandler faceModes; private Map faceDisplayTypes; diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index c5981194..abb01a82 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -348,13 +348,12 @@ public class CapBankNetwork implements ICapBankNetwork { spaceAvailable = Integer.MAX_VALUE; } int res = Math.min(maxReceive, (int) spaceAvailable); - res = Math.min(maxReceive, getMaxInput()); + res = Math.min(res, getMaxInput()); if(!simulate) { if(!type.isCreative()) { addEnergy(res); } } - return res; } diff --git a/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java b/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java new file mode 100644 index 00000000..ce101adf --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/generator/AbstractGeneratorEntity.java @@ -0,0 +1,31 @@ +package crazypants.enderio.machine.generator; + +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.power.IInternalPowerProvider; + +public abstract class AbstractGeneratorEntity extends AbstractMachineEntity implements IInternalPowerProvider { + + //RF API Power + + public AbstractGeneratorEntity(SlotDefinition slotDefinition) { + super(slotDefinition); + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 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 56e3e5ae..07d9a1db 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TileCombustionGenerator.java @@ -11,18 +11,18 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.fluid.FluidFuelRegister; import crazypants.enderio.fluid.IFluidCoolant; import crazypants.enderio.fluid.IFluidFuel; -import crazypants.enderio.fluid.FluidFuelRegister; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.generator.AbstractGeneratorEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerDistributor; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; -public class TileCombustionGenerator extends AbstractMachineEntity implements IFluidHandler { +public class TileCombustionGenerator extends AbstractGeneratorEntity implements IFluidHandler { private final FluidTank coolantTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); private final FluidTank fuelTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); @@ -162,7 +162,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF int lastGenerated = generated; boolean isActive = generateEnergy(); - if(isActive != this.active) { + if(isActive != active) { active = isActive; res = true; } @@ -190,11 +190,6 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IF return res; } - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return 0; - } - private boolean transmitEnergy() { if(getEnergyStored() <= 0) { return false; 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 bd6eac6d..c289e88e 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -6,17 +6,16 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.generator.AbstractGeneratorEntity; 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 { +public class TileEntityStirlingGenerator extends AbstractGeneratorEntity implements ISidedInventory { public static final int ENERGY_PER_TICK = Config.stirlingGeneratorBaseRfPerTick; @@ -43,11 +42,6 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement return "Stirling Generator"; } - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return 0; - } - @Override public boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { return TileEntityFurnace.isItemFuel(itemstack); @@ -110,7 +104,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement @Override public int getPowerUsePerTick() { - return (int)Math.round(ENERGY_PER_TICK * getEnergyMultiplier()); + return Math.round(ENERGY_PER_TICK * getEnergyMultiplier()); } @Override 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 e36553d4..95b1fa14 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.generator.zombie; -import scala.xml.persistent.SetStorage; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,15 +12,15 @@ import net.minecraftforge.fluids.IFluidHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; 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.AbstractGeneratorEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerDistributor; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; -public class TileZombieGenerator extends AbstractMachineEntity implements IFluidHandler { +public class TileZombieGenerator extends AbstractGeneratorEntity implements IFluidHandler { private static int IO_MB_TICK = 250; @@ -46,12 +45,6 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IFluid return ModObject.blockZombieGenerator.unlocalisedName; } - - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return 0; - } @Override public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { @@ -129,7 +122,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IFluid } else { boolean isActive = generateEnergy(); - if(isActive != this.active) { + if(isActive != active) { active = isActive; res = true; } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index 6db56a92..6f6d97ba 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -25,7 +25,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPowerHandler; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; @@ -33,7 +33,7 @@ import crazypants.util.ItemUtil; import crazypants.util.Lang; import crazypants.vecmath.VecmathUtil; -public class TileHyperCube extends TileEntityEio implements IInternalPowerReceptor, IFluidHandler, ISidedInventory, IRedstoneModeControlable { +public class TileHyperCube extends TileEntityEio implements IInternalPowerHandler, IFluidHandler, ISidedInventory, IRedstoneModeControlable { private static final double ENERGY_LOSS = Config.transceiverEnergyLoss; diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 1736a1a9..d6716137 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -17,13 +17,13 @@ import crazypants.enderio.machine.wireless.WirelessChargerController; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.util.ForgeDirectionOffsets; import crazypants.vecmath.Vector3d; -public class TileElectricLight extends TileEntityEio implements IInternalPowerReceptor { +public class TileElectricLight extends TileEntityEio implements IInternalPowerReceiver { private ForgeDirection face = ForgeDirection.DOWN; @@ -446,11 +446,6 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - @Override public boolean canConnectEnergy(ForgeDirection from) { if(!requiresPower) { diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index e5b845c2..1f429415 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -16,10 +16,10 @@ import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.DyeColor; -public class TilePowerMonitor extends AbstractMachineEntity implements IInternalPowerReceptor { +public class TilePowerMonitor extends AbstractMachineEntity implements IInternalPoweredTile { int energyPerTick = 1; diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 615cf9c7..f9204ea4 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -28,7 +28,8 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPowerHandler; +import crazypants.enderio.power.IInternalPoweredTile; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PowerHandlerUtil; @@ -36,7 +37,7 @@ import crazypants.util.BlockCoord; import crazypants.util.Util; import crazypants.vecmath.VecmathUtil; -public class TileCapacitorBank extends TileEntityEio implements IInternalPowerReceptor, IInventory, IIoConfigurable, IPowerStorage { +public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHandler, IInventory, IIoConfigurable, IPowerStorage { static final BasicCapacitor BASE_CAP = new BasicCapacitor(Config.capacitorBankMaxIoRF, Config.capacitorBankMaxStorageRF); @@ -438,7 +439,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } Receptor r = new Receptor(ph, dir, mode); localReceptors.add(r); - if(mode == IoMode.NONE && !(ph.getDelegate() instanceof IInternalPowerReceptor)) { + if(mode == IoMode.NONE && !(ph.getDelegate() instanceof IInternalPoweredTile)) { setIoMode(dir, IoMode.PULL, false); r.mode = IoMode.PULL; render = true; diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index d833af3c..8f2baac1 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -15,12 +15,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.config.Config; import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPowerProvider; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; -public class TileEntitySolarPanel extends TileEntity implements IInternalPowerReceptor { +public class TileEntitySolarPanel extends TileEntity implements IInternalPowerProvider { private BasicCapacitor capacitor; @@ -52,11 +52,6 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe // RF Power - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - @Override public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { return 0; diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 7b8dd655..9cc00dba 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -7,11 +7,11 @@ import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.TileEntityEio; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; -public class TileWirelessCharger extends TileEntityEio implements IInternalPowerReceptor, IWirelessCharger { +public class TileWirelessCharger extends TileEntityEio implements IInternalPowerReceiver, IWirelessCharger { public static final int MAX_ENERGY_STORED = 200000; public static final int MAX_ENERGY_IN = 10000; @@ -123,11 +123,6 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - @Override public int takeEnergy(int max) { int prev = storedEnergyRF; diff --git a/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java b/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java index 91cd7296..34697fc7 100644 --- a/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyHandlerPI.java @@ -15,4 +15,9 @@ public class EnergyHandlerPI extends EnergyReceiverPI { return false; } + @Override + public boolean isOutputOnly() { + return false; + } + } diff --git a/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java b/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java index a2b2690d..e31e50b7 100644 --- a/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java +++ b/src/main/java/crazypants/enderio/power/EnergyReceiverPI.java @@ -1,7 +1,6 @@ package crazypants.enderio.power; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; public class EnergyReceiverPI implements IPowerInterface { @@ -49,7 +48,7 @@ public class EnergyReceiverPI implements IPowerInterface { return 0; } - public static int getPowerRequest(ForgeDirection dir, IEnergyHandler handler) { + public static int getPowerRequest(ForgeDirection dir, IEnergyReceiver handler) { if(handler != null && dir != null && handler.canConnectEnergy(dir)) { return handler.receiveEnergy(dir, 99999999, true); } diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerHandler.java b/src/main/java/crazypants/enderio/power/IInternalPowerHandler.java new file mode 100644 index 00000000..af41c489 --- /dev/null +++ b/src/main/java/crazypants/enderio/power/IInternalPowerHandler.java @@ -0,0 +1,7 @@ +package crazypants.enderio.power; + +import cofh.api.energy.IEnergyHandler; + +public interface IInternalPowerHandler extends IInternalPoweredTile, IEnergyHandler { + +} diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerProvider.java b/src/main/java/crazypants/enderio/power/IInternalPowerProvider.java new file mode 100644 index 00000000..a18a5469 --- /dev/null +++ b/src/main/java/crazypants/enderio/power/IInternalPowerProvider.java @@ -0,0 +1,7 @@ +package crazypants.enderio.power; + +import cofh.api.energy.IEnergyProvider; + +public interface IInternalPowerProvider extends IInternalPoweredTile, IEnergyProvider { + +} diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerReceiver.java b/src/main/java/crazypants/enderio/power/IInternalPowerReceiver.java new file mode 100644 index 00000000..154b8167 --- /dev/null +++ b/src/main/java/crazypants/enderio/power/IInternalPowerReceiver.java @@ -0,0 +1,7 @@ +package crazypants.enderio.power; + +import cofh.api.energy.IEnergyReceiver; + +public interface IInternalPowerReceiver extends IInternalPoweredTile, IEnergyReceiver { + +} diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java b/src/main/java/crazypants/enderio/power/IInternalPoweredTile.java similarity index 56% rename from src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java rename to src/main/java/crazypants/enderio/power/IInternalPoweredTile.java index a861c7bc..38c7c960 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java +++ b/src/main/java/crazypants/enderio/power/IInternalPoweredTile.java @@ -1,20 +1,15 @@ package crazypants.enderio.power; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyHandler; +import cofh.api.energy.IEnergyConnection; -public interface IInternalPowerReceptor extends IEnergyHandler, IPowerContainer { +//IEnergyHandler, +public interface IInternalPoweredTile extends IPowerContainer, IEnergyConnection { int getMaxEnergyRecieved(ForgeDirection dir); - @Override - int getEnergyStored(); - int getMaxEnergyStored(); - @Override - void setEnergyStored(int stored); - /** * Should the power be displayed in WAILA or other places */ diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index 2e902492..058e7cb8 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -46,7 +46,7 @@ public class PowerHandlerUtil { } - public static int recieveInternal(IInternalPowerReceptor target, int maxReceive, ForgeDirection from, boolean simulate) { + public static int recieveInternal(IInternalPoweredTile target, int maxReceive, ForgeDirection from, boolean simulate) { int result = Math.min(target.getMaxEnergyRecieved(from), maxReceive); result = Math.min(target.getMaxEnergyStored() - target.getEnergyStored(), result); if(result > 0 && !simulate) { diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 4b0464c1..2aaf1d0e 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -37,7 +37,7 @@ import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.TileCapacitorBank; -import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.Lang; public class WailaCompat implements IWailaDataProvider { @@ -154,8 +154,8 @@ public class WailaCompat implements IWailaDataProvider { } } - if(te instanceof IInternalPowerReceptor && accessor.getNBTData().hasKey("storedEnergyRF") && !(te instanceof TileCapBank)) { - IInternalPowerReceptor power = (IInternalPowerReceptor) te; + if(te instanceof IInternalPoweredTile && accessor.getNBTData().hasKey("storedEnergyRF") && !(te instanceof TileCapBank)) { + IInternalPoweredTile power = (IInternalPoweredTile) te; if(power.displayPower()) {