diff --git a/src/main/java/binnie/core/machines/base/DefaultPower.java b/src/main/java/binnie/core/machines/base/DefaultPower.java index 32edf6d0..5d5147a3 100644 --- a/src/main/java/binnie/core/machines/base/DefaultPower.java +++ b/src/main/java/binnie/core/machines/base/DefaultPower.java @@ -5,6 +5,8 @@ import binnie.core.machines.power.PowerInfo; import binnie.core.machines.power.PowerInterface; class DefaultPower implements IPoweredMachine { + public static final DefaultPower INSTANCE = new DefaultPower(); + @Override public PowerInfo getPowerInfo() { return new PowerInfo(this, 0.0f); @@ -32,21 +34,6 @@ class DefaultPower implements IPoweredMachine { // @Optional.Method(modid = "IC2") // public boolean acceptsEnergyFrom(final TileEntity emitter, final EnumFacing direction) { // return false; -// } - -// @Override -// public int getEnergyStored(final EnumFacing from) { -// return 0; -// } -// -// @Override -// public int getMaxEnergyStored(final EnumFacing from) { -// return 0; -// } -// -// @Override -// public boolean canConnectEnergy(final EnumFacing from) { -// return false; // } @Override @@ -54,13 +41,34 @@ class DefaultPower implements IPoweredMachine { return null; } -// @Override -// public int receiveEnergy(EnumFacing enumFacing, int i, boolean b) { -// return 0; -// } -// -// @Override -// public int extractEnergy(EnumFacing enumFacing, int i, boolean b) { -// return 0; -// } + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { + return 0; + } + + @Override + public int extractEnergy(int maxExtract, boolean simulate) { + return 0; + } + + @Override + public int getEnergyStored() { + return 0; + } + + @Override + public int getMaxEnergyStored() { + return 0; + } + + @Override + public boolean canExtract() { + return false; + } + + @Override + public boolean canReceive() { + return false; + } + } diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index 2847d927..34937ca5 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -9,6 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -30,7 +32,7 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi public IPoweredMachine getPower() { final IPoweredMachine inv = Machine.getInterface(IPoweredMachine.class, this); - return (inv == null || inv == this) ? new DefaultPower() : inv; + return (inv == null || inv == this) ? DefaultPower.INSTANCE : inv; } @Override @@ -241,30 +243,48 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi // return this.getPower().acceptsEnergyFrom(emitter, direction); // } -// @Override -// public int receiveEnergy(final EnumFacing from, final int maxReceive, final boolean simulate) { -// return this.getPower().receiveEnergy(from, maxReceive, simulate); -// } -// -// @Override -// public int extractEnergy(final EnumFacing from, final int maxExtract, final boolean simulate) { -// return this.getPower().extractEnergy(from, maxExtract, simulate); -// } -// -// @Override -// public int getEnergyStored(final EnumFacing from) { -// return this.getPower().getEnergyStored(from); -// } -// -// @Override -// public int getMaxEnergyStored(final EnumFacing from) { -// return this.getPower().getMaxEnergyStored(from); -// } -// -// @Override -// public boolean canConnectEnergy(final EnumFacing from) { -// return this.getPower().canConnectEnergy(from); -// } + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { + return this.getPower().receiveEnergy(maxReceive, simulate); + } + + @Override + public int extractEnergy(int maxExtract, boolean simulate) { + return this.getPower().extractEnergy(maxExtract, simulate); + } + + @Override + public int getEnergyStored() { + return this.getPower().getEnergyStored(); + } + + @Override + public int getMaxEnergyStored() { + return this.getPower().getMaxEnergyStored(); + } + + @Override + public boolean canExtract() { + return this.getPower().canExtract(); + } + + @Override + public boolean canReceive() { + return this.getPower().canReceive(); + } + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) { + return (capability == CapabilityEnergy.ENERGY && (canExtract() || canReceive())) || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) { + if (capability == CapabilityEnergy.ENERGY) { + return (T) this; + } + return super.getCapability(capability, facing); + } @Override public PowerInterface getInterface() { diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index df66a008..4eeb2c6f 100644 --- a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -94,31 +94,35 @@ public class ComponentPowerReceptor extends MachineComponent implements IPowered // return this.acceptsPowerSystem(PowerSystem.EU); // } -// @Override -// public int receiveEnergy(final EnumFacing from, final int maxReceive, final boolean simulate) { -// return (int) this.container.addEnergy(PowerSystem.RF, maxReceive, !simulate); -// } -// -// @Override -// public int extractEnergy(final EnumFacing from, final int maxExtract, final boolean simulate) { -// return this.container.useEnergy(maxExtract, simulate); -// } -// -// @Override -// public int getEnergyStored(final EnumFacing from) { -// return (int) this.container.getEnergy(PowerSystem.RF); -// } -// -// @Override -// public int getMaxEnergyStored(final EnumFacing from) { -// return (int) this.container.getCapacity(PowerSystem.RF); -// } -// -// @Override -// public boolean canConnectEnergy(final EnumFacing from) { -// final boolean can = this.acceptsPowerSystem(PowerSystem.RF); -// return can; -// } + @Override + public int receiveEnergy(final int maxReceive, final boolean simulate) { + return (int) this.container.addEnergy(PowerSystem.RF, maxReceive, !simulate); + } + + @Override + public int extractEnergy(final int maxExtract, final boolean simulate) { + return this.container.useEnergy(maxExtract, simulate); + } + + @Override + public int getEnergyStored() { + return (int) this.container.getEnergy(PowerSystem.RF); + } + + @Override + public int getMaxEnergyStored() { + return (int) this.container.getCapacity(PowerSystem.RF); + } + + @Override + public boolean canReceive() { + return this.acceptsPowerSystem(PowerSystem.RF); + } + + @Override + public boolean canExtract() { + return false; + } @Override public PowerInterface getInterface() { diff --git a/src/main/java/binnie/core/machines/power/IPoweredMachine.java b/src/main/java/binnie/core/machines/power/IPoweredMachine.java index c1ddf3f2..55933cdd 100644 --- a/src/main/java/binnie/core/machines/power/IPoweredMachine.java +++ b/src/main/java/binnie/core/machines/power/IPoweredMachine.java @@ -1,10 +1,11 @@ package binnie.core.machines.power; +import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.common.Optional; @Optional.Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2") -//TODO ic2 and RF energy -public interface IPoweredMachine //extends /*IEnergySink, IEnergyHandler, IEnergyReceiver, IEnergyProvider*/ +//TODO ic2 energy +public interface IPoweredMachine extends IEnergyStorage/*IEnergySink*/ { PowerInfo getPowerInfo();