diff --git a/src/main/java/mekanism/api/energy/ICableOutputter.java b/src/main/java/mekanism/api/energy/ICableOutputter.java deleted file mode 100644 index 73757cd92..000000000 --- a/src/main/java/mekanism/api/energy/ICableOutputter.java +++ /dev/null @@ -1,18 +0,0 @@ -package mekanism.api.energy; - -import net.minecraft.util.EnumFacing; - -/** - * Implement this if your TileEntity is capable of outputting energy to cables, overriding Mekanism's default implementation. - * @author AidanBrady - * - */ -public interface ICableOutputter -{ - /** - * Whether or not this block can output to a cable on a specific side. - * @param side - side to check - * @return if the block can output - */ - public boolean canOutputTo(EnumFacing side); -} diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java b/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java index 49b6ee226..644aa76e1 100644 --- a/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java +++ b/src/main/java/mekanism/api/energy/IStrictEnergyAcceptor.java @@ -3,21 +3,22 @@ package mekanism.api.energy; import net.minecraft.util.EnumFacing; /** - * Implement this if your TileEntity can accept energy at a floating-point double value from Universal Cables. + * Implement this if your TileEntity can accept energy. * @author AidanBrady * */ -public interface IStrictEnergyAcceptor extends IStrictEnergyStorage +public interface IStrictEnergyAcceptor { /** * Transfer a certain amount of energy to this acceptor. * @param amount - amount to transfer + * @param simulate - if the operation should be simulated * @return energy used */ - public double transferEnergyToAcceptor(EnumFacing side, double amount); + public double acceptEnergy(EnumFacing side, double amount, boolean simulate); /** - * Whether or not this tile entity accepts energy from a certain side. + * Whether or not this tile entity can accept energy from a certain side. * @param side - side to check * @return if tile entity accepts energy */ diff --git a/src/main/java/mekanism/api/energy/IStrictEnergyOutputter.java b/src/main/java/mekanism/api/energy/IStrictEnergyOutputter.java new file mode 100644 index 000000000..ef13c095b --- /dev/null +++ b/src/main/java/mekanism/api/energy/IStrictEnergyOutputter.java @@ -0,0 +1,26 @@ +package mekanism.api.energy; + +import net.minecraft.util.EnumFacing; + +/** + * Implement this if your TileEntity can output energy. + * @author AidanBrady + * + */ +public interface IStrictEnergyOutputter +{ + /** + * Pulls a certain amount of energy from this outputter. + * @param amount - amount to pull + * @param simulate - if the operation should be simulated + * @return energy sent + */ + public double pullEnergy(EnumFacing side, double amount, boolean simulate); + + /** + * Whether or not this tile entity can output energy on a specific side. + * @param side - side to check + * @return if the tile entity outputs energy + */ + public boolean canOutputEnergy(EnumFacing side); +} diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 488e41815..a45ef0ee8 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -179,7 +179,7 @@ public class EnergyNetwork extends DynamicNetwork prev) { diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 8ce84dbbb..549db0d13 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -75,9 +75,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { - return acceptor.transferEnergyToAcceptor(side, amount); + return acceptor.acceptEnergy(side, amount, simulate); } @Override @@ -86,28 +86,10 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor return acceptor.canReceiveEnergy(side); } - @Override - public double getEnergy() - { - return acceptor.getEnergy(); - } - - @Override - public void setEnergy(double energy) - { - acceptor.setEnergy(energy); - } - - @Override - public double getMaxEnergy() - { - return acceptor.getMaxEnergy(); - } - @Override public boolean needsEnergy(EnumFacing side) { - return acceptor.getMaxEnergy() - acceptor.getEnergy() > 0; + return acceptor.acceptEnergy(side, 1, true) > 0; } } @@ -121,9 +103,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { - return fromRF(acceptor.receiveEnergy(side, Math.min(Integer.MAX_VALUE, toRF(amount)), false)); + return fromRF(acceptor.receiveEnergy(side, Math.min(Integer.MAX_VALUE, toRF(amount)), simulate)); } @Override @@ -132,26 +114,6 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor return acceptor.canConnectEnergy(side); } - @Override - public double getEnergy() - { - return fromRF(acceptor.getEnergyStored(null)); - } - - @Override - public void setEnergy(double energy) - { - int rfToSet = toRF(energy); - int amountToReceive = rfToSet - acceptor.getEnergyStored(null); - acceptor.receiveEnergy(null, amountToReceive, false); - } - - @Override - public double getMaxEnergy() - { - return fromRF(acceptor.getMaxEnergyStored(null)); - } - @Override public boolean needsEnergy(EnumFacing side) { @@ -179,7 +141,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { double toTransfer = Math.min(Math.min(acceptor.getDemandedEnergy(), toEU(amount)), Integer.MAX_VALUE); double rejects = acceptor.injectEnergy(side, toTransfer, 0); @@ -193,21 +155,6 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor return acceptor.acceptsEnergyFrom(null, side); } - @Override - public double getEnergy() - { - return 0; - } - - @Override - public void setEnergy(double energy) {} - - @Override - public double getMaxEnergy() - { - return 0; - } - @Override public boolean needsEnergy(EnumFacing side) { @@ -235,7 +182,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { return fromTesla(acceptor.givePower(toTesla(amount), false)); } @@ -246,21 +193,6 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor return acceptor.givePower(1, true) > 0; } - @Override - public double getEnergy() - { - return 0; - } - - @Override - public void setEnergy(double energy) {} - - @Override - public double getMaxEnergy() - { - return 0; - } - @Override public boolean needsEnergy(EnumFacing side) { @@ -288,9 +220,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { - return fromForge(acceptor.receiveEnergy(Math.min(Integer.MAX_VALUE, toForge(amount)), false)); + return fromForge(acceptor.receiveEnergy(Math.min(Integer.MAX_VALUE, toForge(amount)), simulate)); } @Override @@ -299,21 +231,6 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor return acceptor.canReceive(); } - @Override - public double getEnergy() - { - return 0; - } - - @Override - public void setEnergy(double energy) {} - - @Override - public double getMaxEnergy() - { - return 0; - } - @Override public boolean needsEnergy(EnumFacing side) { diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 76a076018..d4e25adab 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -6,8 +6,8 @@ import ic2.api.tile.IEnergyStorage; import java.util.EnumSet; -import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyStorage; import net.minecraft.inventory.IInventory; import net.minecraft.util.EnumFacing; @@ -22,13 +22,11 @@ import cofh.api.energy.IEnergyReceiver; @Interface(iface = "ic2.api.energy.tile.IEnergyEmitter", modid = "IC2"), @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2") }) -public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter, IInventory +public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory { public EnumSet getOutputtingSides(); 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 0190d3abe..b5b4e512c 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -6,7 +6,7 @@ import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.IConfigurable; import mekanism.api.IEvaporationSolar; import mekanism.api.IHeatTransfer; -import mekanism.api.energy.ICableOutputter; +import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.gas.IGasHandler; @@ -33,8 +33,8 @@ public class Capabilities @CapabilityInject(IStrictEnergyAcceptor.class) public static Capability ENERGY_ACCEPTOR_CAPABILITY = null; - @CapabilityInject(ICableOutputter.class) - public static Capability CABLE_OUTPUTTER_CAPABILITY = null; + @CapabilityInject(IStrictEnergyOutputter.class) + public static Capability ENERGY_OUTPUTTER_CAPABILITY = null; @CapabilityInject(IConfigurable.class) public static Capability CONFIGURABLE_CAPABILITY = null; diff --git a/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java b/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java index 6f12aa92b..725338232 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java +++ b/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java @@ -1,6 +1,6 @@ package mekanism.common.capabilities; -import mekanism.api.energy.ICableOutputter; +import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; @@ -8,16 +8,22 @@ import net.minecraftforge.common.capabilities.CapabilityManager; /** * Created by ben on 30/04/16. */ -public class DefaultCableOutputter implements ICableOutputter +public class DefaultCableOutputter implements IStrictEnergyOutputter { + @Override + public double pullEnergy(EnumFacing side, double amount, boolean simulate) + { + return 0; + } + @Override - public boolean canOutputTo(EnumFacing side) + public boolean canOutputEnergy(EnumFacing side) { return true; } - + public static void register() { - CapabilityManager.INSTANCE.register(ICableOutputter.class, new NullStorage<>(), DefaultCableOutputter.class); + CapabilityManager.INSTANCE.register(IStrictEnergyOutputter.class, new NullStorage<>(), DefaultCableOutputter.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java b/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java index 1b9d2bc06..228e5d7fc 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java +++ b/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java @@ -2,32 +2,18 @@ package mekanism.common.capabilities; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.capabilities.DefaultStorageHelper.DefaultStorage; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; -import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 30/04/16. */ -public class DefaultStrictEnergyAcceptor extends DefaultStrictEnergyStorage implements IStrictEnergyAcceptor, INBTSerializable +public class DefaultStrictEnergyAcceptor implements IStrictEnergyAcceptor { - public DefaultStrictEnergyAcceptor() - { - this(0); - } - - public DefaultStrictEnergyAcceptor(double capacity) - { - super(capacity); - } - @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { - double used = Math.min(amount, Math.max(0, getMaxEnergy() - getEnergy())); - setEnergy(getEnergy() + used); - return used; + return 0; } @Override @@ -36,18 +22,6 @@ public class DefaultStrictEnergyAcceptor extends DefaultStrictEnergyStorage impl return true; } - @Override - public NBTTagCompound serializeNBT() - { - return super.serializeNBT(); - } - - @Override - public void deserializeNBT(NBTTagCompound nbt) - { - super.deserializeNBT(nbt); - } - public static void register() { CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new DefaultStorage<>(), DefaultStrictEnergyAcceptor.class); diff --git a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java index c2f489e68..0ccf1ffe1 100644 --- a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java +++ b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java @@ -20,7 +20,7 @@ public class ForgeEnergyCableIntegration implements IEnergyStorage @Override public int receiveEnergy(int maxReceive, boolean simulate) { - return rfToForge(tileEntity.receiveEnergy(side, forgeToRF(maxReceive), simulate)); + return (int)Math.round(tileEntity.acceptEnergy(side, maxReceive*general.FROM_FORGE, simulate)*general.TO_FORGE); } @Override @@ -52,14 +52,4 @@ public class ForgeEnergyCableIntegration implements IEnergyStorage { return tileEntity.canReceiveEnergy(side); } - - public static int rfToForge(int rf) - { - return (int)Math.round(rf*general.FROM_RF*general.TO_FORGE); - } - - public static int forgeToRF(int forge) - { - return (int)Math.round(forge*general.FROM_FORGE*general.TO_RF); - } } diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java index 9e3fe61d6..931eaf112 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java @@ -24,16 +24,6 @@ public class TeslaCableIntegration implements ITeslaConsumer @Method(modid = "tesla") public long givePower(long power, boolean simulated) { - return rfToTesla(tileEntity.receiveEnergy(side, teslaToRF(power), simulated)); - } - - public long rfToTesla(int rf) - { - return (long)Math.round(rf*general.FROM_RF*general.TO_TESLA); - } - - public int teslaToRF(long tesla) - { - return (int)Math.round(Math.min(Integer.MAX_VALUE, tesla*general.FROM_TESLA*general.TO_RF)); + return (long)Math.round(tileEntity.acceptEnergy(side, power*general.FROM_TESLA, simulated)*general.TO_TESLA); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 9910c8bc4..261df2284 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -295,47 +295,14 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public double getEnergy() - { - if(getInv() == null) - { - return 0; - } - - return getInv().getEnergy(); - } - - @Override - public void setEnergy(double energy) - { - if(getInv() == null) - { - return; - } - - getInv().setEnergy(energy); - } - - @Override - public double getMaxEnergy() - { - if(getInv() == null) - { - return 0; - } - - return getInv().getMaxEnergy(); - } - - @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { if(getInv() == null || !canReceiveEnergy(side)) { return 0; } - return getInv().transferEnergyToAcceptor(side, amount); + return getInv().acceptEnergy(side, amount, simulate); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index af160fcb5..85ebe018b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -223,37 +223,13 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - if(getConsumingSides().contains(from)) - { - double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive*general.FROM_RF); - - if(!simulate) - { - setEnergy(getEnergy() + toAdd); - } - - return (int)Math.round(toAdd*general.TO_RF); - } - - return 0; + return (int)Math.round(acceptEnergy(from, maxReceive*general.FROM_RF, simulate)*general.TO_RF); } @Override public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - if(getOutputtingSides().contains(from)) - { - double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_RF)); - - if(!simulate) - { - setEnergy(getEnergy() - toSend); - } - - return (int)Math.round(toSend*general.TO_RF); - } - - return 0; + return (int)Math.round(pullEnergy(from, maxExtract*general.FROM_RF, simulate)*general.TO_RF); } @Override @@ -311,7 +287,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public boolean canOutputTo(EnumFacing side) + public boolean canOutputEnergy(EnumFacing side) { return getOutputtingSides().contains(side); } @@ -389,7 +365,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return amount; } - return amount-transferEnergyToAcceptor(direction, amount*general.FROM_IC2)*general.TO_IC2; + return amount-acceptEnergy(direction, amount*general.FROM_IC2, false)*general.TO_IC2; } @Override @@ -400,7 +376,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { if(!(getConsumingSides().contains(side) || side == null)) { @@ -408,13 +384,17 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } double toUse = Math.min(getMaxEnergy()-getEnergy(), amount); - setEnergy(getEnergy() + toUse); + + if(!simulate) + { + setEnergy(getEnergy() + toUse); + } return toUse; } @Override - public double removeEnergyFromProvider(EnumFacing side, double amount) + public double pullEnergy(EnumFacing side, double amount, boolean simulate) { if(!(getOutputtingSides().contains(side) || side == null)) { @@ -422,7 +402,11 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } double toGive = Math.min(getEnergy(), amount); - setEnergy(getEnergy() - toGive); + + if(!simulate) + { + setEnergy(getEnergy() - toGive); + } return toGive; } @@ -432,7 +416,7 @@ 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.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.TESLA_HOLDER_CAPABILITY || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing)) @@ -447,7 +431,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i public T getCapability(Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || - capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) + capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index dbb90b482..23479fe97 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -329,11 +329,11 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "IC2") public boolean isTeleporterCompatible(EnumFacing side) { - return canOutputTo(side); + return canOutputEnergy(side); } @Override - public boolean canOutputTo(EnumFacing side) + public boolean canOutputEnergy(EnumFacing side) { return getOutputtingSides().contains(side); } @@ -410,7 +410,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return amount; } - return amount-transferEnergyToAcceptor(direction, amount*general.FROM_IC2)*general.TO_IC2; + return amount-acceptEnergy(direction, amount*general.FROM_IC2, false)*general.TO_IC2; } @Override @@ -426,7 +426,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public double transferEnergyToAcceptor(EnumFacing side, double amount) + public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { if(!getConsumingSides().contains(side)) { @@ -434,14 +434,18 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } double toUse = Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), amount); - setEnergy(getEnergy() + toUse); - structure.remainingInput -= toUse; + + if(!simulate) + { + setEnergy(getEnergy() + toUse); + structure.remainingInput -= toUse; + } return toUse; } @Override - public double removeEnergyFromProvider(EnumFacing side, double amount) + public double pullEnergy(EnumFacing side, double amount, boolean simulate) { if(!getOutputtingSides().contains(side)) { @@ -505,7 +509,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY - || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.TESLA_HOLDER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) @@ -521,7 +525,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement public T getCapability(Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || - capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY) + capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 093a9048a..772d7264e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.energy.ICableOutputter; +import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.lasers.ILaserReceptor; import mekanism.common.LaserManager; @@ -31,7 +31,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; -public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration, ISecurityTile +public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, IStrictEnergyOutputter, IStrictEnergyStorage, IComputerIntegration, ISecurityTile { public static final double MAX_ENERGY = 5E9; public double collectedEnergy = 0; @@ -190,6 +190,19 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } } } + + @Override + public double pullEnergy(EnumFacing side, double amount, boolean simulate) + { + double toGive = Math.min(getEnergy(), amount); + + if(!simulate) + { + setEnergy(getEnergy() - toGive); + } + + return toGive; + } @Override public void setEnergy(double energy) @@ -333,7 +346,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public boolean canOutputTo(EnumFacing side) + public boolean canOutputEnergy(EnumFacing side) { return true; } @@ -376,7 +389,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement public boolean hasCapability(Capability capability, EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY - || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.LASER_RECEPTOR_CAPABILITY || super.hasCapability(capability, facing); } @@ -386,7 +399,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY) return (T)this; - if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) + if(capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY) return (T)this; if(capability == Capabilities.LASER_RECEPTOR_CAPABILITY) return (T)this; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 143323714..4f9064675 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -33,10 +33,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.IEnergyStorage; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; -public class TileEntityUniversalCable extends TileEntityTransmitter implements IStrictEnergyAcceptor, IEnergyReceiver +public class TileEntityUniversalCable extends TileEntityTransmitter implements IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver { public Tier.CableTier tier = CableTier.BASIC; @@ -77,7 +78,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter 0) + if(toDraw > 0) { - toDraw -= takeEnergy(received, true); + toDraw -= takeEnergy(toDraw, true); } - producer.takePower((long)(toDraw*general.TO_TESLA), false); + producer.takePower((long)Math.round(toDraw*general.TO_TESLA), false); + } + + else if(MekanismUtils.useForge() && CapabilityUtils.hasCapability(outputter, CapabilityEnergy.ENERGY, side.getOpposite())) + { + IEnergyStorage storage = CapabilityUtils.getCapability(outputter, CapabilityEnergy.ENERGY, side.getOpposite()); + double toDraw = storage.extractEnergy((int)Math.round(canDraw*general.TO_FORGE), true)*general.FROM_FORGE; + + if(toDraw > 0) + { + toDraw -= takeEnergy(toDraw, true); + } + + storage.extractEnergy((int)Math.round(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 toDraw = received; + double toDraw = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)Math.round(Math.min(Integer.MAX_VALUE, canDraw*general.TO_RF)), true)*general.FROM_RF; - if(received > 0) + if(toDraw > 0) { - toDraw -= takeEnergy(received, true); + toDraw -= takeEnergy(toDraw, true); } - ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(toDraw*general.TO_RF), false); + ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)Math.round(toDraw*general.TO_RF), false); } else if(MekanismUtils.useIC2()) { @@ -273,7 +285,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter