diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 813f845e0..95691ac49 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -34,15 +34,18 @@ public class MekanismConfig public static EnergyType energyUnit = EnergyType.J; public static TempType tempUnit = TempType.K; public static double TO_IC2; - public static double TO_TE; + public static double TO_RF; + public static double TO_TESLA; public static double FROM_H2; public static double FROM_IC2; - public static double FROM_TE; + public static double FROM_RF; + public static double FROM_TESLA; public static int laserRange; public static double laserEnergyNeededPerHardness; public static double minerSilkMultiplier = 6; public static boolean blacklistIC2; public static boolean blacklistRF; + public static boolean blacklistTesla; public static boolean destroyDisabledBlocks; public static boolean prefilledFluidTanks; public static boolean prefilledGasTanks; diff --git a/src/main/java/mekanism/api/util/UnitDisplayUtils.java b/src/main/java/mekanism/api/util/UnitDisplayUtils.java index 63df303fd..c4ce5cbc5 100644 --- a/src/main/java/mekanism/api/util/UnitDisplayUtils.java +++ b/src/main/java/mekanism/api/util/UnitDisplayUtils.java @@ -9,7 +9,7 @@ public class UnitDisplayUtils { JOULES("Joule", "J"), REDSTONE_FLUX("Redstone Flux", "RF"), - MINECRAFT_JOULES("Minecraft Joule", "MJ"), + TESLA("Tesla", "T"), ELECTRICAL_UNITS("Electrical Unit", "EU"); public String name; @@ -286,7 +286,7 @@ public class UnitDisplayUtils J, RF, EU, - MJ + T } public static enum TempType diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 428994090..193dc712e 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -230,8 +230,10 @@ public class CommonProxy implements IGuiProvider general.userWorldGenVersion = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "WorldRegenVersion", 0).getInt(); general.FROM_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToEU", 10D).getDouble(); general.TO_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EUToJoules", .1D).getDouble(); - general.FROM_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToRF", 2.5D).getDouble(); - general.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", 0.4D).getDouble(); + general.FROM_RF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToRF", 2.5D).getDouble(); + general.TO_RF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", 0.4D).getDouble(); + general.FROM_TESLA = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToTesla", 2.5D).getDouble(); + general.TO_TESLA = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TeslaToJoules", 0.4D).getDouble(); general.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "Determines Electrolytic Separator usage").getDouble(); general.ETHENE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EthyleneBurnTime", 40).getInt(); general.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(); @@ -265,8 +267,9 @@ public class CommonProxy implements IGuiProvider general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); + general.blacklistTesla = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistTeslaPower", false).getBoolean(); - String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); + String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J", null, new String[]{"J", "RF", "EU", "T"}).getString(); if(s != null) { @@ -282,9 +285,9 @@ public class CommonProxy implements IGuiProvider { general.energyUnit = EnergyType.EU; } - else if(s.trim().equalsIgnoreCase("mj") || s.trim().equalsIgnoreCase("bc") || s.trim().equalsIgnoreCase("buildcraft")) + else if(s.trim().equalsIgnoreCase("t") || s.trim().equalsIgnoreCase("tesla")) { - general.energyUnit = EnergyType.MJ; + general.energyUnit = EnergyType.T; } } diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index b6297d05a..5be26dca7 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -56,7 +56,7 @@ public class FuelHandler public FuelGas(IFuel bcFuel) { burnTicks = bcFuel.getTotalBurningTime() / Fluid.BUCKET_VOLUME; - energyPerTick = bcFuel.getPowerPerCycle() * general.FROM_TE; + energyPerTick = bcFuel.getPowerPerCycle() * general.FROM_RF; } } diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index fb0975072..cd360ea1f 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -1,6 +1,8 @@ package mekanism.common.base; +import ic2.api.energy.EnergyNet; import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergyTile; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; @@ -32,9 +34,14 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { wrapper = new RFAcceptor((IEnergyReceiver)tileEntity); } - else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) + else if(MekanismUtils.useIC2()) { - wrapper = new IC2Acceptor((IEnergySink)tileEntity); + IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); + + if(tile instanceof IEnergySink) + { + wrapper = new IC2Acceptor((IEnergySink)tile); + } } if(wrapper != null) @@ -144,12 +151,12 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor public int toRF(double joules) { - return (int)Math.round(joules * general.TO_TE); + return (int)Math.round(joules * general.TO_RF); } public double fromRF(int rf) { - return rf * general.FROM_TE; + return rf * general.FROM_RF; } } @@ -184,10 +191,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor } @Override - public void setEnergy(double energy) - { - return; - } + public void setEnergy(double energy) {} @Override public double getMaxEnergy() @@ -211,4 +215,40 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor return eu * general.FROM_IC2; } } + + public static class TeslaAcceptor extends EnergyAcceptorWrapper + { + @Override + public double transferEnergyToAcceptor(EnumFacing side, double amount) + { + return 0; + } + + @Override + public boolean canReceiveEnergy(EnumFacing side) + { + return false; + } + + @Override + public double getEnergy() + { + return 0; + } + + @Override + public void setEnergy(double energy) {} + + @Override + public double getMaxEnergy() + { + return 0; + } + + @Override + public boolean needsEnergy(EnumFacing side) + { + return false; + } + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/base/ITankManager.java b/src/main/java/mekanism/common/base/ITankManager.java index f7e96f293..9cf0d095a 100644 --- a/src/main/java/mekanism/common/base/ITankManager.java +++ b/src/main/java/mekanism/common/base/ITankManager.java @@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidUtil; public interface ITankManager { @@ -40,7 +41,7 @@ public interface ITankManager if(button == 0) //Insert gas into dropper { - if(dropper.getFluid(stack) != null || gasTank.getGas() == null) + if(FluidUtil.getFluidContained(stack) != null || gasTank.getGas() == null) { return; } @@ -57,7 +58,7 @@ public interface ITankManager } else if(button == 1) //Extract gas from dropper { - if(dropper.getFluid(stack) != null || gasTank.getNeeded() == 0) + if(FluidUtil.getFluidContained(stack) != null || gasTank.getNeeded() == 0) { return; } @@ -76,9 +77,9 @@ public interface ITankManager else if(tank instanceof FluidTank) { FluidTank fluidTank = (FluidTank)tank; - int dropperStored = dropper.getFluid(stack) != null ? dropper.getFluid(stack).amount : 0; + int dropperStored = FluidUtil.getFluidContained(stack) != null ? FluidUtil.getFluidContained(stack).amount : 0; - if(dropper.getFluid(stack) != null && fluidTank.getFluid() != null && !dropper.getFluid(stack).isFluidEqual(fluidTank.getFluid())) + if(FluidUtil.getFluidContained(stack) != null && fluidTank.getFluid() != null && !FluidUtil.getFluidContained(stack).isFluidEqual(fluidTank.getFluid())) { return; } @@ -91,13 +92,8 @@ public interface ITankManager } int toInsert = Math.min(fluidTank.getFluidAmount(), ItemGaugeDropper.CAPACITY-dropperStored); - FluidStack drawn = fluidTank.drain(toInsert, true); - - if(drawn != null) - { - dropper.setFluid(stack, new FluidStack(drawn.getFluid(), dropperStored+(drawn != null ? drawn.amount : 0))); - } - + FluidUtil.getFluidHandler(stack).fill(fluidTank.drain(toInsert, true), true); + ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); } else if(button == 1) //Extract fluid from dropper @@ -108,8 +104,7 @@ public interface ITankManager } int toExtract = Math.min(fluidTank.getCapacity()-fluidTank.getFluidAmount(), dropperStored); - toExtract = fluidTank.fill(new FluidStack(dropper.getFluid(stack).getFluid(), toExtract), true); - dropper.setFluid(stack, new FluidStack(dropper.getFluid(stack).getFluid(), dropperStored-toExtract)); + fluidTank.fill(FluidUtil.getFluidHandler(stack).drain(toExtract, true), true); ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); } diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 1357b3d5d..0f3133ac2 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -189,7 +189,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine if(item.canProvideEnergy(inventory[27])) { - double gain = ElectricItem.manager.discharge(inventory[27], (MAX_ELECTRICITY - getEnergy())* general.TO_IC2, 4, true, true, false)* general.FROM_IC2; + double gain = ElectricItem.manager.discharge(inventory[27], (MAX_ELECTRICITY - getEnergy())* general.TO_IC2, 4, true, true, false)*general.FROM_IC2; setEnergy(getEnergy() + gain); } } @@ -199,9 +199,9 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine IEnergyContainerItem item = (IEnergyContainerItem)inventory[27].getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, ((MAX_ELECTRICITY - getEnergy())* general.TO_TE))); + int toTransfer = (int)Math.round(Math.min(itemEnergy, ((MAX_ELECTRICITY - getEnergy())*general.TO_RF))); - setEnergy(getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); + setEnergy(getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_RF)); } else if(inventory[27].getItem() == Items.REDSTONE && getEnergy()+ general.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY) { diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 9ac87929a..ab3687a90 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -235,14 +235,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy*general.FROM_TE, energyNeeded); + double toReceive = Math.min(energy*general.FROM_RF, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive*general.TO_TE); + return (int)Math.round(toReceive*general.TO_RF); } return 0; @@ -254,14 +254,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*general.FROM_TE), energyRemaining); + double toSend = Math.min((energy*general.FROM_RF), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*general.TO_TE); + return (int)Math.round(toSend*general.TO_RF); } return 0; @@ -270,13 +270,13 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem)*general.TO_TE); + return (int)(getEnergy(theItem)*general.TO_RF); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem)*general.TO_TE); + return (int)(getMaxEnergy(theItem)*general.TO_RF); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 688b2ae88..44006958a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -64,10 +64,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.ICapabilityProvider; 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; @@ -701,14 +703,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy*general.FROM_TE, energyNeeded); + double toReceive = Math.min(energy*general.FROM_RF, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive*general.TO_TE); + return (int)Math.round(toReceive*general.TO_RF); } return 0; @@ -720,14 +722,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*general.FROM_TE), energyRemaining); + double toSend = Math.min((energy*general.FROM_RF), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*general.TO_TE); + return (int)Math.round(toSend*general.TO_RF); } return 0; @@ -736,13 +738,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem)*general.TO_TE); + return (int)(getEnergy(theItem)*general.TO_RF); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem)*general.TO_TE); + return (int)(getMaxEnergy(theItem)*general.TO_RF); } @Override @@ -896,4 +898,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { return hasSecurity(stack); } + + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) + { + return new FluidContainerItemWrapper(this, stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 55dc4f1d2..075091c90 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -113,14 +113,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_TE, energyNeeded); + double toReceive = Math.min(energy* general.FROM_RF, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_TE); + return (int)Math.round(toReceive* general.TO_RF); } return 0; @@ -132,14 +132,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy* general.FROM_TE), energyRemaining); + double toSend = Math.min((energy* general.FROM_RF), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend* general.TO_TE); + return (int)Math.round(toSend* general.TO_RF); } return 0; @@ -148,13 +148,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public int getEnergyStored(ItemStack theItem) { - return (int)Math.round(getEnergy(theItem)* general.TO_TE); + return (int)Math.round(getEnergy(theItem)* general.TO_RF); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)Math.round(getMaxEnergy(theItem)* general.TO_TE); + return (int)Math.round(getMaxEnergy(theItem)* general.TO_RF); } @Override diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index c05524a0f..786d61b25 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -135,14 +135,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_TE, energyNeeded); + double toReceive = Math.min(energy* general.FROM_RF, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_TE); + return (int)Math.round(toReceive* general.TO_RF); } return 0; @@ -154,14 +154,14 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*general.FROM_TE), energyRemaining); + double toSend = Math.min((energy*general.FROM_RF), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*general.TO_TE); + return (int)Math.round(toSend*general.TO_RF); } return 0; @@ -170,13 +170,13 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci @Override public int getEnergyStored(ItemStack theItem) { - return (int)Math.round(getEnergy(theItem)*general.TO_TE); + return (int)Math.round(getEnergy(theItem)*general.TO_RF); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)Math.round(getMaxEnergy(theItem)*general.TO_TE); + return (int)Math.round(getMaxEnergy(theItem)*general.TO_RF); } @Override diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 30c6ecaed..74a996972 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -8,7 +8,6 @@ import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; -import mekanism.common.util.PipeUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -19,13 +18,15 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidContainerItem +public class ItemGaugeDropper extends ItemMekanism implements IGasItem { public static int CAPACITY = Fluid.BUCKET_VOLUME; @@ -42,7 +43,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { ItemStack empty = new ItemStack(this); setGas(empty, null); - setFluid(empty, null); return empty; } @@ -62,7 +62,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo public double getDurabilityForDisplay(ItemStack stack) { double gasRatio = ((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)CAPACITY); - double fluidRatio = ((getFluid(stack) != null ? (double)getFluid(stack).amount : 0D)/(double)CAPACITY); + double fluidRatio = ((FluidUtil.getFluidContained(stack) != null ? (double)FluidUtil.getFluidContained(stack).amount : 0D)/(double)CAPACITY); return 1D-Math.max(gasRatio, fluidRatio); } @@ -73,7 +73,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo if(player.isSneaking() && !world.isRemote) { setGas(stack, null); - setFluid(stack, null); + FluidUtil.getFluidHandler(stack).drain(CAPACITY, true); ((EntityPlayerMP)player).sendContainerToPlayer(player.openContainer); @@ -88,7 +88,7 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { GasStack gasStack = getGas(itemstack); - FluidStack fluidStack = getFluid(itemstack); + FluidStack fluidStack = FluidUtil.getFluidContained(itemstack); if(gasStack == null && fluidStack == null) { @@ -104,88 +104,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo } } - private FluidStack getFluid_do(ItemStack container) - { - if(ItemDataUtils.hasData(container, "fluidStack")) - { - return FluidStack.loadFluidStackFromNBT(ItemDataUtils.getCompound(container, "fluidStack")); - } - - return null; - } - - @Override - public FluidStack getFluid(ItemStack container) - { - return getFluid_do(container); - } - - public void setFluid(ItemStack container, FluidStack stack) - { - if(stack == null || stack.amount == 0 || stack.getFluid() == null) - { - ItemDataUtils.removeData(container, "fluidStack"); - } - else { - ItemDataUtils.setCompound(container, "fluidStack", stack.writeToNBT(new NBTTagCompound())); - } - } - - @Override - public int getCapacity(ItemStack container) - { - return CAPACITY; - } - - @Override - public int fill(ItemStack container, FluidStack resource, boolean doFill) - { - FluidStack stored = getFluid(container); - int toFill; - - if(stored != null && stored.getFluid() != resource.getFluid()) - { - return 0; - } - - if(stored == null) - { - toFill = Math.min(resource.amount, CAPACITY); - } - else { - toFill = Math.min(resource.amount, CAPACITY-stored.amount); - } - - if(doFill) - { - int fillAmount = toFill + (stored == null ? 0 : stored.amount); - setFluid(container, PipeUtils.copy(resource, (stored != null ? stored.amount : 0)+toFill)); - } - - return toFill; - } - - @Override - public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) - { - FluidStack stored = getFluid(container); - - if(stored != null) - { - FluidStack toDrain = PipeUtils.copy(stored, Math.min(stored.amount, maxDrain)); - - if(doDrain) - { - stored.amount -= toDrain.amount; - setFluid(container, stored.amount > 0 ? stored : null); - } - - return toDrain; - } - - return null; - } - @Override public int getRate(ItemStack itemstack) { @@ -270,4 +188,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { return CAPACITY; } + + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) + { + return new FluidHandlerItemStack(stack, CAPACITY); + } } diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index ab2cee949..93d23be15 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -1,6 +1,8 @@ package mekanism.common.multipart; +import ic2.api.energy.EnergyNet; import ic2.api.energy.tile.IEnergySource; +import ic2.api.energy.tile.IEnergyTile; import java.util.Collection; import java.util.List; @@ -86,7 +88,7 @@ public class PartUniversalCable extends PartTransmitter 0) @@ -94,19 +96,24 @@ public class PartUniversalCable extends PartTransmitter 0) + IEnergyTile tile = EnergyNet.instance.getSubTile(outputter.getWorld(), outputter.getPos()); + + if(tile instanceof IEnergySource) { - toDraw -= takeEnergy(received, true); + double received = Math.min(((IEnergySource)tile).getOfferedEnergy()*general.FROM_IC2, canDraw); + double toDraw = received; + + if(received > 0) + { + toDraw -= takeEnergy(received, true); + } + + ((IEnergySource)tile).drawEnergy(toDraw*general.TO_IC2); } - - ((IEnergySource)outputter).drawEnergy(toDraw * general.TO_IC2); } } } @@ -228,7 +235,7 @@ public class PartUniversalCable extends PartTransmitter