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

@@ -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);
}
}