lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile/model errors

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-01-02 02:07:52 -08:00
parent 78093631c5
commit e845332846
11 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java
View file

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.tile.container;
import javax.annotation.Nullable;
import WayofTime.bloodmagic.util.GhostItemHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ClickType;
@ -85,10 +86,10 @@ public class ContainerItemRoutingNode extends Container
if (dragType == 0) //Left mouse click-eth
{
{
if (heldStack == null && slotStack != null)
if (heldStack.isEmpty() && !slotStack.isEmpty())
{
//I clicked on the slot with an empty hand. Selecting!
} else if (heldStack != null && slotStack == null)
} else if (!heldStack.isEmpty() && slotStack.isEmpty())
{
if (!((SlotGhostItem) slot).canBeAccessed())
{
@ -103,15 +104,15 @@ public class ContainerItemRoutingNode extends Container
ItemStack filterStack = this.inventorySlots.get(0).getStack();
if (filterStack.getItem() instanceof IRoutingFilterProvider)
{
ItemStack copyStack = ((IRoutingFilterProvider) filterStack.getItem()).getContainedStackForItem(filterStack, heldStack);
slot.putStack(copyStack);
ItemStack filterCopy = ((IRoutingFilterProvider) filterStack.getItem()).getContainedStackForItem(filterStack, heldStack);
slot.putStack(filterCopy);
}
}
}
} else
//Right mouse click-eth away
{
slot.putStack(null);
slot.putStack(ItemStack.EMPTY);
}
}
}

2
src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java
View file

@ -66,7 +66,7 @@ public class TileInputRoutingNode extends TileFilteredRoutingNode implements IIn
@Override
public IFluidFilter getInputFluidFilterForSide(EnumFacing side)
{
TileEntity tile = worldObj.getTileEntity(pos.offset(side));
TileEntity tile = getWorld().getTileEntity(pos.offset(side));
if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side))
{
IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side);

2
src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java
View file

@ -66,7 +66,7 @@ public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IO
@Override
public IFluidFilter getOutputFluidFilterForSide(EnumFacing side)
{
TileEntity tile = worldObj.getTileEntity(pos.offset(side));
TileEntity tile = getWorld().getTileEntity(pos.offset(side));
if (tile != null && tile.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side))
{
IFluidHandler handler = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side);