Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
This commit is contained in:
Aidan Brady committed 2014-10-26 15:28:28 -04:00
commit 0cccaaa415
6 files changed
+135 -73

No files matched your search

@@ -193,6 +193,18 @@ public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler
{
arecipes.add(new CachedIORecipe(irecipe, getInfuseStacks(irecipe.getInput().infuse.type), irecipe.getInput().infuse.type));
}
List<ItemStack> infuses;
for(ItemStack stack : getInfuseStacks(irecipe.getInput().infuse.type))
{
if(NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient))
{
infuses = new ArrayList<ItemStack>();
infuses.add(stack);
arecipes.add(new CachedIORecipe(irecipe, infuses, irecipe.getInput().infuse.type));
}
}
}
}
@@ -4,7 +4,6 @@ import java.util.List;
import mekanism.api.EnumColor;
import mekanism.common.Mekanism;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,15 +11,14 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import codechicken.lib.vec.BlockCoord;
import codechicken.lib.vec.Vector3;
import codechicken.microblock.HollowMicroblock;
import codechicken.multipart.JItemMultiPart;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemGlowPanel extends JItemMultiPart
{
@@ -41,16 +39,19 @@ public class ItemGlowPanel extends JItemMultiPart
EnumColor col = EnumColor.DYES[item.getItemDamage()];
ForgeDirection orientation = getSideFromVector3(vHit.subtract(Vector3.center));
BlockCoord pos1 = pos.copy().inset(orientation.getOpposite().ordinal());
if(world.isSideSolid(pos1.x, pos1.y, pos1.z, orientation.getOpposite()))
if(pos != null && orientation != null)
{
return new PartGlowPanel(col, orientation);
}
if(world.getTileEntity(pos.x, pos.y, pos.z) instanceof TileMultipart && ((TileMultipart) world.getTileEntity(pos.x, pos.y, pos.z)).partMap(orientation.ordinal()) instanceof HollowMicroblock)
{
return new PartGlowPanel(col, orientation);
BlockCoord pos1 = pos.copy().inset(orientation.getOpposite().ordinal());
if(world.isSideSolid(pos1.x, pos1.y, pos1.z, orientation.getOpposite()))
{
return new PartGlowPanel(col, orientation);
}
if(world.getTileEntity(pos.x, pos.y, pos.z) instanceof TileMultipart && ((TileMultipart) world.getTileEntity(pos.x, pos.y, pos.z)).partMap(orientation.ordinal()) instanceof HollowMicroblock)
{
return new PartGlowPanel(col, orientation);
}
}
return null;
@@ -31,6 +31,7 @@ public abstract class MachineInput<INPUT extends MachineInput<INPUT>>
{
return testEquality((INPUT)other);
}
return false;
}
@@ -559,7 +559,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements
{
if(fluidTank != null)
{
if(fluid == null || fluidTank.getFluid().getFluid() == fluid)
if(fluid == null || fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == fluid)
{
if(isActive)
{