Fixed IC2 support (still may crash without), begin adding Tesla support

This commit is contained in:
aidancbrady committed 2016-07-01 11:05:02 -04:00
1 parent e2a93b5de1
commit 53353cd050
27 files changed
+256 -300

No files matched your search

@@ -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;
@@ -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
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
}
@@ -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);
}
@@ -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)
{
@@ -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
@@ -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);
}
}
@@ -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
@@ -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
@@ -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<String> 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);
}
}
@@ -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<EnergyAcceptorWrapper, E
}
else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider)
{
double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(canDraw*general.TO_TE), true) * general.FROM_TE;
double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(canDraw*general.TO_RF), true) * general.FROM_RF;
double toDraw = received;
if(received > 0)
@@ -94,19 +96,24 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
toDraw -= takeEnergy(received, true);
}
((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(toDraw*general.TO_TE), false);
((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(toDraw*general.TO_RF), false);
}
else if(MekanismUtils.useIC2() && outputter instanceof IEnergySource)
else if(MekanismUtils.useIC2())
{
double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * general.FROM_IC2, canDraw);
double toDraw = received;
if(received > 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<EnergyAcceptorWrapper, E
{
if(canReceiveEnergy(from))
{
return maxReceive - (int)Math.round(takeEnergy(maxReceive * general.FROM_TE, !simulate) * general.TO_TE);
return maxReceive - (int)Math.round(takeEnergy(maxReceive * general.FROM_RF, !simulate) * general.TO_RF);
}
return 0;
@@ -249,13 +256,13 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
@Override
public int getEnergyStored(EnumFacing from)
{
return (int)Math.round(getEnergy() * general.TO_TE);
return (int)Math.round(getEnergy() * general.TO_RF);
}
@Override
public int getMaxEnergyStored(EnumFacing from)
{
return (int)Math.round(getMaxEnergy() * general.TO_TE);
return (int)Math.round(getMaxEnergy() * general.TO_RF);
}
@Override
@@ -41,8 +41,10 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeInt(general.UPDATE_DELAY);
dataStream.writeDouble(general.FROM_IC2);
dataStream.writeDouble(general.TO_IC2);
dataStream.writeDouble(general.FROM_TE);
dataStream.writeDouble(general.TO_TE);
dataStream.writeDouble(general.FROM_RF);
dataStream.writeDouble(general.TO_RF);
dataStream.writeDouble(general.FROM_TESLA);
dataStream.writeDouble(general.TO_TESLA);
dataStream.writeDouble(general.FROM_H2);
dataStream.writeInt(general.ETHENE_BURN_TIME);
dataStream.writeDouble(general.ENERGY_PER_REDSTONE);
@@ -53,6 +55,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeDouble(general.minerSilkMultiplier);
dataStream.writeBoolean(general.blacklistIC2);
dataStream.writeBoolean(general.blacklistRF);
dataStream.writeBoolean(general.blacklistTesla);
dataStream.writeDouble(general.armoredJetpackDamageRatio);
dataStream.writeInt(general.armoredJetpackDamageMax);
dataStream.writeBoolean(general.aestheticWorldDamage);
@@ -129,8 +132,10 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
general.UPDATE_DELAY = dataStream.readInt();
general.FROM_IC2 = dataStream.readDouble();
general.TO_IC2 = dataStream.readDouble();
general.FROM_TE = dataStream.readDouble();
general.TO_TE = dataStream.readDouble();
general.FROM_RF = dataStream.readDouble();
general.TO_RF = dataStream.readDouble();
general.FROM_TESLA = dataStream.readDouble();
general.TO_TESLA = dataStream.readDouble();
general.FROM_H2 = dataStream.readDouble();
general.ETHENE_BURN_TIME = dataStream.readInt();
general.ENERGY_PER_REDSTONE = dataStream.readDouble();
@@ -141,6 +146,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
general.minerSilkMultiplier = dataStream.readDouble();
general.blacklistIC2 = dataStream.readBoolean();
general.blacklistRF = dataStream.readBoolean();
general.blacklistTesla = dataStream.readBoolean();
general.armoredJetpackDamageRatio = dataStream.readDouble();
general.armoredJetpackDamageMax = dataStream.readInt();
general.aestheticWorldDamage = dataStream.readBoolean();
@@ -141,9 +141,9 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock
IEnergyContainerItem item = (IEnergyContainerItem)itemstack.getItem();
int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemstack)), item.getMaxEnergyStored(itemstack) - item.getEnergyStored(itemstack)));
int toTransfer = (int)Math.round(Math.min(itemEnergy, (getEnergy()*general.TO_TE)));
int toTransfer = (int)Math.round(Math.min(itemEnergy, (getEnergy()*general.TO_RF)));
setEnergy(getEnergy() - (item.receiveEnergy(itemstack, toTransfer, false)*general.FROM_TE));
setEnergy(getEnergy() - (item.receiveEnergy(itemstack, toTransfer, false)*general.FROM_RF));
}
}
}
@@ -221,14 +221,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
{
if(getConsumingSides().contains(from))
{
double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive*general.FROM_TE);
double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive*general.FROM_RF);
if(!simulate)
{
setEnergy(getEnergy() + toAdd);
}
return (int)Math.round(toAdd*general.TO_TE);
return (int)Math.round(toAdd*general.TO_RF);
}
return 0;
@@ -239,14 +239,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
{
if(getOutputtingSides().contains(from))
{
double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_TE));
double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_RF));
if(!simulate)
{
setEnergy(getEnergy() - toSend);
}
return (int)Math.round(toSend*general.TO_TE);
return (int)Math.round(toSend*general.TO_RF);
}
return 0;
@@ -261,13 +261,13 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
@Override
public int getEnergyStored(EnumFacing from)
{
return (int)Math.round(getEnergy()*general.TO_TE);
return (int)Math.round(getEnergy()*general.TO_RF);
}
@Override
public int getMaxEnergyStored(EnumFacing from)
{
return (int)Math.round(getMaxEnergy()*general.TO_TE);
return (int)Math.round(getMaxEnergy()*general.TO_RF);
}
@Override
@@ -379,6 +379,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
if(tile == null || CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite()))
{
return amount;
@@ -55,7 +55,6 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.network.ByteBufUtils;
@@ -145,31 +144,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
{
if(RecipeHandler.Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(inventory[0]))
{
if(inventory[0].getItem() instanceof IFluidContainerItem)
if(FluidContainerUtils.isFluidContainer(inventory[0]))
{
fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[0]), true);
}
else {
FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]);
if(fluid != null && (fluidTank.getFluid() == null || fluid.isFluidEqual(fluidTank.getFluid()) && fluidTank.getFluid().amount+fluid.amount <= fluidTank.getCapacity()))
{
fluidTank.fill(fluid, true);
if(inventory[0].getItem().hasContainerItem(inventory[0]))
{
inventory[0] = inventory[0].getItem().getContainerItem(inventory[0]);
}
else {
inventory[0].stackSize--;
}
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
}
}
}
}
@@ -39,12 +39,10 @@ import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.MathHelper;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -246,23 +244,10 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc
{
if(slotID == 0)
{
if(itemstack.getItem() instanceof IFluidContainerItem)
if(FluidContainerUtils.isFluidContainer(itemstack))
{
return true;
}
else if(FluidContainerRegistry.isFilledContainer(itemstack))
{
FluidStack stack = FluidContainerRegistry.getFluidForFilledItem(itemstack);
if(fluidTank.getFluid() == null || fluidTank.getFluid().isFluidEqual(stack))
{
return editMode == ContainerEditMode.EMPTY || editMode == ContainerEditMode.BOTH;
}
}
else if(FluidContainerRegistry.isEmptyContainer(itemstack))
{
return editMode == ContainerEditMode.FILL || editMode == ContainerEditMode.BOTH;
}
}
return false;
@@ -239,7 +239,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
{
if(getConsumingSides().contains(from))
{
double toAdd = (int)Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), maxReceive* general.FROM_TE);
double toAdd = (int)Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), maxReceive* general.FROM_RF);
if(!simulate)
{
@@ -247,7 +247,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
structure.remainingInput -= toAdd;
}
return (int)Math.round(toAdd*general.TO_TE);
return (int)Math.round(toAdd*general.TO_RF);
}
return 0;
@@ -258,7 +258,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
{
if(getOutputtingSides().contains(from))
{
double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_TE));
double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_RF));
if(!simulate)
{
@@ -266,7 +266,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
structure.remainingOutput -= toSend;
}
return (int)Math.round(toSend*general.TO_TE);
return (int)Math.round(toSend*general.TO_RF);
}
return 0;
@@ -281,13 +281,13 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
@Override
public int getEnergyStored(EnumFacing from)
{
return (int)Math.round(getEnergy()*general.TO_TE);
return (int)Math.round(getEnergy()*general.TO_RF);
}
@Override
public int getMaxEnergyStored(EnumFacing from)
{
return (int)Math.round(getMaxEnergy()*general.TO_TE);
return (int)Math.round(getMaxEnergy()*general.TO_RF);
}
@Override
@@ -1,10 +1,10 @@
package mekanism.common.util;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergyAcceptor;
import ic2.api.energy.tile.IEnergyEmitter;
import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergySource;
import ic2.api.energy.tile.IEnergyTile;
import java.util.ArrayList;
import java.util.List;
@@ -12,6 +12,7 @@ import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.CapabilityUtils;
@@ -27,13 +28,6 @@ import cofh.api.energy.IEnergyReceiver;
public final class CableUtils
{
public static boolean isEnergyAcceptor(TileEntity tileEntity)
{
return tileEntity != null && (CapabilityUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null) ||
(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) ||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver));
}
public static boolean isCable(TileEntity tileEntity)
{
if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
@@ -79,7 +73,7 @@ public final class CableUtils
return false;
}
if(isEnergyAcceptor(tile) && isConnectable(cableEntity, tile, side))
if(isConnectable(cableEntity, tile, side))
{
return true;
}
@@ -116,11 +110,37 @@ public final class CableUtils
public static boolean isOutputter(TileEntity tileEntity, EnumFacing side)
{
return tileEntity != null && (
(CapabilityUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()) && CapabilityUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) ||
(MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) ||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()))
);
if(tileEntity == null)
{
return false;
}
if(CapabilityUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()))
{
ICableOutputter outputter = CapabilityUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite());
if(outputter.canOutputTo(side.getOpposite()))
{
return true;
}
}
if(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()))
{
return true;
}
if(MekanismUtils.useIC2())
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
if(tile instanceof IEnergySource && ((IEnergySource)tile).emitsEnergyTo(null, side.getOpposite()))
{
return true;
}
}
return false;
}
public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side)
@@ -137,13 +157,6 @@ public final class CableUtils
return true;
}
}
else if(MekanismUtils.useIC2() && orig instanceof IEnergyEmitter && tileEntity instanceof IEnergyAcceptor)
{
if(((IEnergyAcceptor)tileEntity).acceptsEnergyFrom((IEnergyEmitter)orig, side.getOpposite()))
{
return true;
}
}
else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()))
{
if(CapabilityUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite()))
@@ -151,6 +164,18 @@ public final class CableUtils
return true;
}
}
else if(MekanismUtils.useIC2())
{
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
if(tile instanceof IEnergySink)
{
if(((IEnergySink)tile).acceptsEnergyFrom(orig instanceof IEnergyEmitter ? (IEnergyEmitter)orig : null, side.getOpposite()))
{
return true;
}
}
}
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection)
{
if(((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()))
@@ -252,9 +277,9 @@ public final class CableUtils
if(handler.canConnectEnergy(side.getOpposite()))
{
int toSend = Math.min((int)Math.round(currentSending*general.TO_TE), Integer.MAX_VALUE);
int toSend = Math.min((int)Math.round(currentSending*general.TO_RF), Integer.MAX_VALUE);
int used = handler.receiveEnergy(side.getOpposite(), toSend, false);
sent += used*general.FROM_TE;
sent += used*general.FROM_RF;
}
}
else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink)
@@ -47,9 +47,9 @@ public final class ChargeUtils
IEnergyContainerItem item = (IEnergyContainerItem)inv.getStackInSlot(slotID).getItem();
int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack)));
int toTransfer = (int)Math.round(Math.min(itemEnergy, ((storer.getMaxEnergy() - storer.getEnergy())* general.TO_TE)));
int toTransfer = (int)Math.round(Math.min(itemEnergy, ((storer.getMaxEnergy() - storer.getEnergy())* general.TO_RF)));
storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE));
storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_RF));
}
else if(inv.getStackInSlot(slotID).getItem() == Items.REDSTONE && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy())
{
@@ -90,9 +90,9 @@ public final class ChargeUtils
IEnergyContainerItem item = (IEnergyContainerItem)inv.getStackInSlot(slotID).getItem();
int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getMaxEnergyStored(itemStack) - item.getEnergyStored(itemStack)));
int toTransfer = (int)Math.round(Math.min(itemEnergy, (storer.getEnergy()* general.TO_TE)));
int toTransfer = (int)Math.round(Math.min(itemEnergy, (storer.getEnergy()* general.TO_RF)));
storer.setEnergy(storer.getEnergy() - (item.receiveEnergy(itemStack, toTransfer, false)* general.FROM_TE));
storer.setEnergy(storer.getEnergy() - (item.receiveEnergy(itemStack, toTransfer, false)* general.FROM_RF));
}
}
}
@@ -1113,11 +1113,11 @@ public final class MekanismUtils
case J:
return UnitDisplayUtils.getDisplayShort(energy, ElectricUnit.JOULES);
case RF:
return UnitDisplayUtils.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX);
return UnitDisplayUtils.getDisplayShort(energy * general.TO_RF, ElectricUnit.REDSTONE_FLUX);
case EU:
return UnitDisplayUtils.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS);
case MJ:
return UnitDisplayUtils.getDisplayShort(energy * general.TO_TE / 10, ElectricUnit.MINECRAFT_JOULES);
case T:
return UnitDisplayUtils.getDisplayShort(energy * general.TO_TESLA, ElectricUnit.TESLA);
}
return "error";
@@ -1133,11 +1133,11 @@ public final class MekanismUtils
switch(general.energyUnit)
{
case RF:
return energy * general.FROM_TE;
return energy * general.FROM_RF;
case EU:
return energy * general.FROM_IC2;
case MJ:
return energy * general.FROM_TE * 10;
case T:
return energy * general.FROM_TESLA;
default:
return energy;
}
@@ -1153,11 +1153,11 @@ public final class MekanismUtils
switch(general.energyUnit)
{
case RF:
return energy * general.TO_TE;
return energy * general.TO_RF;
case EU:
return energy * general.TO_IC2;
case MJ:
return energy * general.TO_TE / 10;
case T:
return energy * general.TO_RF / 10;
default:
return energy;
}
@@ -1200,14 +1200,22 @@ public final class MekanismUtils
}
/**
* Whether or not RF power should be used, taking into account whether or not it is installed or another mod is
* providing its API.
* Whether or not RF power should be used.
* @return if RF power should be used
*/
public static boolean useRF()
{
return !general.blacklistRF;
}
/**
* Whether or not Tesla power should be used.
* @return if Tesla power should be used
*/
public static boolean useTesla()
{
return !general.blacklistTesla;
}
/**
* Gets a clean view of a coordinate value without the dimension ID.
@@ -29,7 +29,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.oredict.OreDictionary;
public class RecipeUtils
@@ -159,7 +159,7 @@ public class RecipeUtils
}
}
if(toReturn.getItem() instanceof IFluidContainerItem)
if(FluidContainerUtils.isFluidContainer(toReturn))
{
FluidStack fluidFound = null;
@@ -167,13 +167,13 @@ public class RecipeUtils
{
ItemStack itemstack = inv.getStackInSlot(i);
if(itemstack != null && itemstack.getItem() instanceof IFluidContainerItem)
if(FluidContainerUtils.isFluidContainer(itemstack))
{
FluidStack stored = ((IFluidContainerItem)itemstack.getItem()).getFluid(itemstack);
FluidStack stored = FluidUtil.getFluidContained(itemstack);
if(stored != null)
{
if(((IFluidContainerItem)toReturn.getItem()).fill(toReturn, stored, false) == 0)
if(FluidUtil.getFluidHandler(itemstack).fill(stored, false) == 0)
{
return null;
}
@@ -196,8 +196,7 @@ public class RecipeUtils
if(fluidFound != null)
{
fluidFound.amount = Math.min(((IFluidContainerItem)toReturn.getItem()).getCapacity(toReturn), fluidFound.amount);
((IFluidContainerItem)toReturn.getItem()).fill(toReturn, fluidFound, true);
FluidUtil.getFluidHandler(toReturn).fill(fluidFound, true);
}
}
@@ -103,7 +103,7 @@ public class MekanismGenerators implements IModule
}
}
BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * general.TO_TE), 40 * Fluid.BUCKET_VOLUME);
BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * general.TO_RF), 40 * Fluid.BUCKET_VOLUME);
}
for(ItemStack ore : OreDictionary.getOres("dustGold"))
@@ -359,14 +359,14 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
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;
@@ -378,14 +378,14 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
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;
@@ -394,13 +394,13 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
@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
@@ -34,7 +34,6 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -73,35 +72,10 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
if(inventory[0] != null)
{
FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]);
if(inventory[0].getItem() instanceof IFluidContainerItem)
if(FluidContainerUtils.isFluidContainer(inventory[0]))
{
lavaTank.fill(FluidContainerUtils.extractFluid(lavaTank, inventory[0], FluidChecker.check(FluidRegistry.LAVA)), true);
}
else if(fluid != null)
{
if(fluid != null && fluid.getFluid() == FluidRegistry.LAVA)
{
if(lavaTank.getFluid() == null || lavaTank.getFluid().amount+fluid.amount <= lavaTank.getCapacity())
{
lavaTank.fill(fluid, true);
if(inventory[0].getItem().getContainerItem(inventory[0]) != null)
{
inventory[0] = inventory[0].getItem().getContainerItem(inventory[0]);
}
else {
inventory[0].stackSize--;
}
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
}
}
}
else {
int fuel = getFuel(inventory[0]);
@@ -183,14 +183,14 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
{
if(getOutputtingSides().contains(from))
{
double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_TE));
double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_RF));
if(!simulate)
{
setEnergy(getEnergy() - toSend);
}
return (int)Math.round(toSend*general.TO_TE);
return (int)Math.round(toSend*general.TO_RF);
}
return 0;
@@ -205,13 +205,13 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I
@Override
public int getEnergyStored(EnumFacing from)
{
return (int)Math.round(getEnergy()*general.TO_TE);
return (int)Math.round(getEnergy()*general.TO_RF);
}
@Override
public int getMaxEnergyStored(EnumFacing from)
{
return (int)Math.round(getMaxEnergy()*general.TO_TE);
return (int)Math.round(getMaxEnergy()*general.TO_RF);
}
@Override