diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 4c94de1f5..488e41815 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -212,11 +212,12 @@ public class EnergyNetwork extends DynamicNetwork 0; } @Override @@ -250,5 +260,15 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { return false; } + + public long toTesla(double joules) + { + return (long)Math.round(joules*general.TO_TESLA); + } + + public double fromTesla(double tesla) + { + return tesla*general.FROM_TESLA; + } } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java index f36f99a40..7e2dc6cd1 100644 --- a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java +++ b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java @@ -1,8 +1,5 @@ package mekanism.common.base; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.FluidTankProperties; @@ -44,19 +41,4 @@ public class FluidHandlerWrapper implements IFluidHandler { return wrapper.drain(side, maxDrain, doDrain); } - - public static class FluidHandlerWrapperManager - { - public Map wrappers = new HashMap(); - - public FluidHandlerWrapper getWrapper(IFluidHandlerWrapper wrapper, EnumFacing facing) - { - if(wrappers.get(facing) == null) - { - wrappers.put(facing, new FluidHandlerWrapper(wrapper, facing)); - } - - return wrappers.get(facing); - } - } } diff --git a/src/main/java/mekanism/common/base/FluidItemWrapper.java b/src/main/java/mekanism/common/base/FluidItemWrapper.java new file mode 100644 index 000000000..3aa348d35 --- /dev/null +++ b/src/main/java/mekanism/common/base/FluidItemWrapper.java @@ -0,0 +1,72 @@ +package mekanism.common.base; + +import mekanism.common.capabilities.ItemCapabilityWrapper.ItemCapability; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankProperties; +import net.minecraftforge.fluids.capability.IFluidHandler; + +public class FluidItemWrapper extends ItemCapability implements IFluidHandler +{ + @Override + public FluidTankProperties[] getTankProperties() + { + return new FluidTankProperties[] { new FluidTankProperties(getItem().getFluid(getStack()), getItem().getCapacity(getStack())) }; + } + + @Override + public int fill(FluidStack resource, boolean doFill) + { + if(getStack().stackSize != 1) + { + return 0; + } + + return getItem().fill(getStack(), resource, doFill); + } + + @Override + public FluidStack drain(FluidStack resource, boolean doDrain) + { + if(getStack().stackSize != 1 || resource == null) + { + return null; + } + + FluidStack canDrain = drain(resource.amount, false); + + if(canDrain != null) + { + if(canDrain.isFluidEqual(resource)) + { + return drain(resource.amount, doDrain); + } + } + + return null; + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) + { + if(getStack().stackSize != 1) + { + return null; + } + + return getItem().drain(getStack(), maxDrain, doDrain); + } + + public IFluidContainerItem getItem() + { + return (IFluidContainerItem)getStack().getItem(); + } + + @Override + public boolean canProcess(Capability cap) + { + return cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY; + } +} diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 87336931e..67ea46dc1 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -10,6 +10,7 @@ import mekanism.common.security.ISecurityTile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import cofh.api.energy.IEnergyProvider; @@ -18,7 +19,7 @@ import cofh.api.energy.IEnergyReceiver; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), }) -public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData, ISecurityTile +public interface IAdvancedBoundingBlock extends ICapabilityProvider, IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IComputerIntegration, ISpecialConfigData, ISecurityTile { public int[] getBoundSlots(Coord4D location, EnumFacing side); diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 35d2ceeee..ca073a07f 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -28,4 +28,6 @@ public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, I public EnumSet getConsumingSides(); public double getMaxOutput(); + + public double removeEnergyFromProvider(EnumFacing side, double amount); } diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/common/capabilities/Capabilities.java index 9ba7b471e..0190d3abe 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -16,6 +16,9 @@ import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ITileNetwork; +import net.darkhax.tesla.api.ITeslaConsumer; +import net.darkhax.tesla.api.ITeslaHolder; +import net.darkhax.tesla.api.ITeslaProducer; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; @@ -72,6 +75,15 @@ public class Capabilities @CapabilityInject(ILogisticalTransporter.class) public static Capability LOGISTICAL_TRANSPORTER_CAPABILITY = null; + @CapabilityInject(ITeslaConsumer.class) + public static Capability TESLA_CONSUMER_CAPABILITY = null; + + @CapabilityInject(ITeslaProducer.class) + public static Capability TESLA_PRODUCER_CAPABILITY = null; + + @CapabilityInject(ITeslaHolder.class) + public static Capability TESLA_HOLDER_CAPABILITY = null; + public static void registerCapabilities() { DefaultStrictEnergyStorage.register(); diff --git a/src/main/java/mekanism/common/capabilities/CapabilityWrapperManager.java b/src/main/java/mekanism/common/capabilities/CapabilityWrapperManager.java new file mode 100644 index 000000000..7a8059e67 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/CapabilityWrapperManager.java @@ -0,0 +1,35 @@ +package mekanism.common.capabilities; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.util.EnumFacing; + +public class CapabilityWrapperManager +{ + public Map wrappers = new HashMap(); + + public Class typeClass; + public Class wrapperClass; + + public CapabilityWrapperManager(Class type, Class wrapper) + { + typeClass = type; + wrapperClass = wrapper; + } + + public WRAPPER getWrapper(IMPL impl, EnumFacing facing) + { + try { + if(wrappers.get(facing) == null) + { + WRAPPER wrapper = wrapperClass.getConstructor(typeClass, EnumFacing.class).newInstance(impl, facing); + wrappers.put(facing, wrapper); + } + } catch(Exception e) { + e.printStackTrace(); + } + + return wrappers.get(facing); + } +} diff --git a/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java new file mode 100644 index 000000000..13739ef2e --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/ItemCapabilityWrapper.java @@ -0,0 +1,67 @@ +package mekanism.common.capabilities; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; + +public class ItemCapabilityWrapper implements ICapabilityProvider +{ + private List capabilities = new ArrayList(); + + protected final ItemStack itemStack; + + public ItemCapabilityWrapper(ItemStack stack, ItemCapability... caps) + { + itemStack = stack; + + for(ItemCapability c : caps) + { + c.wrapper = this; + capabilities.add(c); + } + } + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) + { + for(ItemCapability cap : capabilities) + { + if(cap.canProcess(capability)) + { + return true; + } + } + + return false; + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) + { + for(ItemCapability cap : capabilities) + { + if(cap.canProcess(capability)) + { + return (T)cap; + } + } + + return null; + } + + public static abstract class ItemCapability + { + private ItemCapabilityWrapper wrapper; + + public abstract boolean canProcess(Capability capability); + + public ItemStack getStack() + { + return wrapper.itemStack; + } + } +} diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 2bbd99ebf..708189904 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -8,9 +8,11 @@ import ic2.api.recipe.Recipes; import java.util.List; import li.cil.oc.api.Driver; +import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.Resource; +import mekanism.common.multipart.TransmitterType; //import mekanism.common.multipart.TransmitterType; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; @@ -35,6 +37,7 @@ public final class MekanismHooks public boolean TELoaded = false; public boolean CCLoaded = false; public boolean AE2Loaded = false; + public boolean TeslaLoaded = false; public boolean MetallurgyCoreLoaded = false; public boolean MetallurgyBaseLoaded = false; @@ -47,6 +50,7 @@ public final class MekanismHooks if(Loader.isModLoaded("ThermalExpansion")) TELoaded = true; if(Loader.isModLoaded("ComputerCraft")) CCLoaded = true; if(Loader.isModLoaded("appliedenergistics2")) AE2Loaded = true; + if(Loader.isModLoaded("Tesla")) TeslaLoaded = true; if(Loader.isModLoaded("Metallurgy3Core")) { @@ -149,14 +153,15 @@ public final class MekanismHooks } @Method(modid = "appliedenergistics2") - public void registerAE2P2P() { + public void registerAE2P2P() + { String energyP2P = "add-p2p-attunement-rf-power"; + if(IC2Loaded) { energyP2P = "add-p2p-attunement-ic2-power"; } -/* for(TransmitterType type : TransmitterType.values()) { if(type.getTransmission().equals(TransmissionType.ITEM)) @@ -177,8 +182,6 @@ public final class MekanismHooks continue; } - } -*/ - + } } } diff --git a/src/main/java/mekanism/common/integration/OCDriver.java b/src/main/java/mekanism/common/integration/OCDriver.java index 22d520075..077aa5796 100644 --- a/src/main/java/mekanism/common/integration/OCDriver.java +++ b/src/main/java/mekanism/common/integration/OCDriver.java @@ -9,16 +9,17 @@ import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.ManagedPeripheral; import li.cil.oc.api.network.Visibility; -import li.cil.oc.api.prefab.DriverTileEntity; +import li.cil.oc.api.prefab.DriverSidedTileEntity; import li.cil.oc.api.prefab.ManagedEnvironment; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** * Created by aidancbrady on 7/20/15. */ -public class OCDriver extends DriverTileEntity +public class OCDriver extends DriverSidedTileEntity { @Override public Class getTileEntityClass() @@ -27,7 +28,7 @@ public class OCDriver extends DriverTileEntity } @Override - public ManagedEnvironment createEnvironment(World world, BlockPos pos) + public ManagedEnvironment createEnvironment(World world, BlockPos pos, EnumFacing side) { TileEntity tile = world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/integration/TeslaIntegration.java b/src/main/java/mekanism/common/integration/TeslaIntegration.java new file mode 100644 index 000000000..fe6afb1d5 --- /dev/null +++ b/src/main/java/mekanism/common/integration/TeslaIntegration.java @@ -0,0 +1,58 @@ +package mekanism.common.integration; + +import mekanism.api.MekanismConfig.general; +import mekanism.common.base.IEnergyWrapper; +import mekanism.common.tile.TileEntityElectricBlock; +import net.darkhax.tesla.api.ITeslaConsumer; +import net.darkhax.tesla.api.ITeslaHolder; +import net.darkhax.tesla.api.ITeslaProducer; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; + +@InterfaceList({ + @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "Tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "Tesla") +}) +public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaProducer +{ + public IEnergyWrapper tileEntity; + + public EnumFacing side; + + public TeslaIntegration(TileEntityElectricBlock tile, EnumFacing facing) + { + tileEntity = tile; + side = facing; + } + + @Override + @Method(modid = "Tesla") + public long getStoredPower() + { + return (long)Math.round(tileEntity.getEnergy()*general.TO_TESLA); + } + + @Override + @Method(modid = "Tesla") + public long getCapacity() + { + return (long)Math.round(tileEntity.getMaxEnergy()*general.TO_TESLA); + } + + @Override + @Method(modid = "Tesla") + public long takePower(long power, boolean simulated) + { + return (long)Math.round(tileEntity.removeEnergyFromProvider(side, power*general.FROM_TESLA)*general.TO_TESLA); + } + + @Override + @Method(modid = "Tesla") + public long givePower(long power, boolean simulated) + { + return (long)Math.round(tileEntity.transferEnergyToAcceptor(side, power*general.FROM_TESLA)*general.TO_TESLA); + } +} diff --git a/src/main/java/mekanism/common/integration/TeslaItemWrapper.java b/src/main/java/mekanism/common/integration/TeslaItemWrapper.java new file mode 100644 index 000000000..0664a337d --- /dev/null +++ b/src/main/java/mekanism/common/integration/TeslaItemWrapper.java @@ -0,0 +1,88 @@ +package mekanism.common.integration; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.energy.IEnergizedItem; +import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.ItemCapabilityWrapper.ItemCapability; +import net.darkhax.tesla.api.ITeslaConsumer; +import net.darkhax.tesla.api.ITeslaHolder; +import net.darkhax.tesla.api.ITeslaProducer; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; + +@InterfaceList({ + @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "Tesla"), + @Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "Tesla") +}) +public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, ITeslaConsumer, ITeslaProducer +{ + @Override + public boolean canProcess(Capability capability) + { + return capability == Capabilities.TESLA_HOLDER_CAPABILITY || + capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getItem().canReceive(getStack()) || + capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getItem().canSend(getStack()); + } + + public IEnergizedItem getItem() + { + return (IEnergizedItem)getStack().getItem(); + } + + @Override + @Method(modid = "Tesla") + public long takePower(long power, boolean simulated) + { + if(getItem().canSend(getStack())) + { + long energyRemaining = getStoredPower(); + long toSend = Math.min(power, energyRemaining); + + if(!simulated) + { + getItem().setEnergy(getStack(), getItem().getEnergy(getStack()) - toSend*general.FROM_TESLA); + } + + return toSend; + } + + return 0; + } + + @Override + @Method(modid = "Tesla") + public long givePower(long power, boolean simulated) + { + if(getItem().canReceive(getStack())) + { + long energyNeeded = getCapacity()-getStoredPower(); + long toReceive = Math.min(power, energyNeeded); + + if(!simulated) + { + getItem().setEnergy(getStack(), getItem().getEnergy(getStack()) + toReceive*general.FROM_TESLA); + } + + return toReceive; + } + + return 0; + } + + @Override + @Method(modid = "Tesla") + public long getStoredPower() + { + return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); + } + + @Override + @Method(modid = "Tesla") + public long getCapacity() + { + return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA); + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index ab3687a90..74d3bf64e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -18,7 +18,9 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; +import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.integration.TeslaItemWrapper; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; @@ -39,6 +41,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -344,4 +347,10 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS { return hasSecurity(stack); } + + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) + { + return new ItemCapabilityWrapper(stack, new TeslaItemWrapper()); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 44006958a..bd3646f26 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -18,6 +18,7 @@ import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; +import mekanism.common.base.FluidItemWrapper; import mekanism.common.base.IFactory; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; @@ -28,7 +29,9 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.integration.TeslaItemWrapper; import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; @@ -69,7 +72,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.capability.wrappers.FluidContainerItemWrapper; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -902,6 +904,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { - return new FluidContainerItemWrapper(this, stack); + return new ItemCapabilityWrapper(stack, new FluidItemWrapper(), new TeslaItemWrapper()); } } diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 075091c90..8c803bcf0 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -9,7 +9,9 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; +import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.integration.TeslaItemWrapper; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -17,6 +19,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -113,14 +117,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy* general.FROM_RF, energyNeeded); + double toReceive = Math.min(energy*general.FROM_RF, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_RF); + return (int)Math.round(toReceive*general.TO_RF); } return 0; @@ -132,14 +136,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy* general.FROM_RF), energyRemaining); + double toSend = Math.min((energy*general.FROM_RF), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend* general.TO_RF); + return (int)Math.round(toSend*general.TO_RF); } return 0; @@ -148,13 +152,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public int getEnergyStored(ItemStack theItem) { - return (int)Math.round(getEnergy(theItem)* general.TO_RF); + return (int)Math.round(getEnergy(theItem)*general.TO_RF); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)Math.round(getMaxEnergy(theItem)* general.TO_RF); + return (int)Math.round(getMaxEnergy(theItem)*general.TO_RF); } @Override @@ -163,4 +167,10 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec { return IC2ItemManager.getManager(this); } + + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) + { + return new ItemCapabilityWrapper(stack, new TeslaItemWrapper()); + } } diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 786d61b25..ae0e16460 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -11,7 +11,9 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; +import mekanism.common.capabilities.ItemCapabilityWrapper; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.integration.TeslaItemWrapper; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -25,7 +27,9 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.fml.common.Optional.Interface; @@ -135,14 +139,14 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy* general.FROM_RF, energyNeeded); + double toReceive = Math.min(energy*general.FROM_RF, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_RF); + return (int)Math.round(toReceive*general.TO_RF); } return 0; @@ -215,4 +219,10 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } } } + + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) + { + return new ItemCapabilityWrapper(stack, new TeslaItemWrapper()); + } } diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index 944cbbf24..cdd803479 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -7,8 +7,9 @@ import mekanism.common.FluidNetwork; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.PipeTier; -import mekanism.common.base.FluidHandlerWrapper.FluidHandlerWrapperManager; +import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; +import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.util.PipeUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; @@ -316,7 +317,7 @@ public class PartMechanicalPipe extends PartTransmitter T getCapability(Capability capability, EnumFacing side) diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 93d23be15..1001945d4 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -21,16 +21,24 @@ import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; +import net.darkhax.tesla.api.ITeslaConsumer; +import net.darkhax.tesla.api.ITeslaProducer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fml.common.Optional.Interface; +import net.minecraftforge.fml.common.Optional.InterfaceList; +import net.minecraftforge.fml.common.Optional.Method; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; -public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider +@InterfaceList({ + @Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla") +}) +public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, ITeslaConsumer { public Tier.CableTier tier; @@ -86,9 +94,22 @@ public class PartUniversalCable extends PartTransmitter 0) + { + toDraw -= takeEnergy(received, true); + } + + producer.takePower((long)(toDraw*general.TO_TESLA), false); + } else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider) { - double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(canDraw*general.TO_RF), true) * general.FROM_RF; + double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(canDraw*general.TO_RF), true)*general.FROM_RF; double toDraw = received; if(received > 0) @@ -233,12 +254,7 @@ public class PartUniversalCable extends PartTransmitter T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || + capability == Capabilities.TESLA_CONSUMER_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 3277cb5bd..561164085 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -6,7 +6,6 @@ import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.base.IAdvancedBoundingBlock; -import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.util.InventoryUtils; import net.minecraft.entity.player.EntityPlayer; @@ -472,21 +471,22 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == Capabilities.ENERGY_STORAGE_CAPABILITY - || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY - || capability == Capabilities.CONFIG_CARD_CAPABILITY - || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY - || super.hasCapability(capability, facing); + if(getInv() == null) + { + return super.hasCapability(capability, facing); + } + + return getInv().hasCapability(capability, facing); } @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY - || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY - || capability == Capabilities.CONFIG_CARD_CAPABILITY - || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) - return (T)this; - return super.getCapability(capability, facing); + if(getInv() == null) + { + return super.getCapability(capability, facing); + } + + return getInv().getCapability(capability, facing); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 8cf4a3fd6..5340044d0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -16,6 +16,8 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.CapabilityWrapperManager; +import mekanism.common.integration.TeslaIntegration; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -408,6 +410,20 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return toUse; } + + @Override + public double removeEnergyFromProvider(EnumFacing side, double amount) + { + if(!(getOutputtingSides().contains(side) || side == null)) + { + return 0; + } + + double toGive = Math.min(getEnergy(), amount); + setEnergy(getEnergy() - toGive); + + return toGive; + } @Override public boolean hasCapability(Capability capability, EnumFacing facing) @@ -415,16 +431,30 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || capability == Capabilities.TESLA_HOLDER_CAPABILITY + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing)) || super.hasCapability(capability, facing); } + + private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager(IEnergyWrapper.class, TeslaIntegration.class); @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) - return (T)this; - if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || + capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) + { return (T)this; + } + + if(capability == Capabilities.TESLA_HOLDER_CAPABILITY + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing))) + { + return (T)teslaManager.getWrapper(this, facing); + } + return super.getCapability(capability, facing); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index b30d3ba6d..63d5fadf2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -22,6 +22,8 @@ import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.CapabilityWrapperManager; +import mekanism.common.integration.TeslaIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; import mekanism.common.util.LangUtils; @@ -435,6 +437,20 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return toUse; } + + @Override + public double removeEnergyFromProvider(EnumFacing side, double amount) + { + if(!getOutputtingSides().contains(side)) + { + return 0; + } + + double toGive = Math.min(getEnergy(), amount); + setEnergy(getEnergy() - toGive); + + return toGive; + } @Override public EnumActionResult onSneakRightClick(EntityPlayer player, EnumFacing side) @@ -488,17 +504,30 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY - || capability == Capabilities.CONFIGURABLE_CAPABILITY + || capability == Capabilities.TESLA_HOLDER_CAPABILITY + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing)) || super.hasCapability(capability, facing); } + + private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager(TileEntityElectricBlock.class, TeslaIntegration.class); @Override public T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) - return (T)this; - if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY) + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || + capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) + { return (T)this; + } + + if(capability == Capabilities.TESLA_HOLDER_CAPABILITY + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing))) + { + return (T)teslaManager.getWrapper(this, facing); + } + return super.getCapability(capability, facing); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index c45b588a9..6856cf533 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -18,6 +18,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; +import net.darkhax.tesla.api.ITeslaConsumer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -72,13 +73,9 @@ public final class CableUtils { return false; } - - if(isConnectable(cableEntity, tile, side)) - { - return true; - } - return isOutputter(tile, side) || (MekanismUtils.useRF() && tile instanceof IEnergyConnection && ((IEnergyConnection)tile).canConnectEnergy(side.getOpposite())); + return isAcceptor(cableEntity, tile, side) || isOutputter(tile, side) || + (MekanismUtils.useRF() && tile instanceof IEnergyConnection && ((IEnergyConnection)tile).canConnectEnergy(side.getOpposite())); } /** @@ -125,6 +122,11 @@ public final class CableUtils } } + if(MekanismUtils.useTesla() && CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_PRODUCER_CAPABILITY, side.getOpposite())) + { + return true; + } + if(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) { return true; @@ -143,7 +145,7 @@ public final class CableUtils return false; } - public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side) + public static boolean isAcceptor(TileEntity orig, TileEntity tileEntity, EnumFacing side) { if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { @@ -157,12 +159,9 @@ public final class CableUtils return true; } } - else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite())) + else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite())) { - if(CapabilityUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) - { - return true; - } + return true; } else if(MekanismUtils.useIC2()) { @@ -176,9 +175,9 @@ public final class CableUtils } } } - else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection) + else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { - if(((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) + if(((IEnergyReceiver)tileEntity).canConnectEnergy(side.getOpposite())) { return true; } @@ -271,6 +270,11 @@ public final class CableUtils sent += acceptor.transferEnergyToAcceptor(side.getOpposite(), currentSending); } } + else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite())) + { + ITeslaConsumer consumer = CapabilityUtils.getCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite()); + sent += consumer.givePower((long)Math.round(currentSending*general.TO_TESLA), false); + } else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { IEnergyReceiver handler = (IEnergyReceiver)tileEntity; @@ -282,13 +286,15 @@ public final class CableUtils sent += used*general.FROM_RF; } } - else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) + else if(MekanismUtils.useIC2()) { - if(((IEnergySink)tileEntity).acceptsEnergyFrom(from, side.getOpposite())) + IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); + + if(tile instanceof IEnergySink && ((IEnergySink)tile).acceptsEnergyFrom(from, side.getOpposite())) { - double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)tileEntity).getSinkTier())*general.FROM_IC2); - toSend = Math.min(Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2), Integer.MAX_VALUE); - sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2)); + double toSend = Math.min(currentSending*general.TO_IC2, EnergyNet.instance.getPowerFromTier(((IEnergySink)tile).getSinkTier())); + toSend = Math.min(Math.min(toSend, ((IEnergySink)tile).getDemandedEnergy()), Integer.MAX_VALUE); + sent += (toSend - (((IEnergySink)tile).injectEnergy(side.getOpposite(), toSend, 0)))*general.FROM_IC2; } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 40260aa6b..ce83f8699 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1214,7 +1214,7 @@ public final class MekanismUtils */ public static boolean useTesla() { - return !general.blacklistTesla; + return Mekanism.hooks.TeslaLoaded && !general.blacklistTesla; } /** diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 79e48df17..8a2f4eaa3 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -15,6 +15,9 @@ import mekanism.api.MekanismConfig.general; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IEnergyWrapper; import mekanism.common.base.IFluidHandlerWrapper; +import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.CapabilityWrapperManager; +import mekanism.common.integration.TeslaIntegration; import mekanism.common.tile.TileEntityGasTank.GasMode; import mekanism.common.util.CableUtils; import mekanism.common.util.LangUtils; @@ -29,15 +32,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fml.common.Optional.Interface; -import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.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") -}) public class TileEntityTurbineValve extends TileEntityTurbineCasing implements IFluidHandlerWrapper, IEnergyWrapper { public boolean ic2Registered = false; @@ -239,7 +235,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Method(modid = "IC2") public int addEnergy(int amount) { - return (int)Math.round(getEnergy()*general.TO_IC2); + return 0; } @Override @@ -340,6 +336,20 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { return 0; } + + @Override + public double removeEnergyFromProvider(EnumFacing side, double amount) + { + if(!getOutputtingSides().contains(side)) + { + return 0; + } + + double toGive = Math.min(getEnergy(), amount); + setEnergy(getEnergy() - toGive); + + return toGive; + } @Override public FluidTankInfo[] getTankInfo(EnumFacing from) @@ -405,7 +415,11 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY + || capability == Capabilities.ENERGY_STORAGE_CAPABILITY + || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || capability == Capabilities.TESLA_HOLDER_CAPABILITY + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing))) { return true; } @@ -413,6 +427,8 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I return super.hasCapability(capability, side); } + + private CapabilityWrapperManager teslaManager = new CapabilityWrapperManager(IEnergyWrapper.class, TeslaIntegration.class); @Override public T getCapability(Capability capability, EnumFacing side) @@ -423,6 +439,12 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { return (T)new FluidHandlerWrapper(this, side); } + + if(capability == Capabilities.TESLA_HOLDER_CAPABILITY + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing))) + { + return (T)teslaManager.getWrapper(this, facing); + } } return super.getCapability(capability, side);