diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java index 42352fbf..8442bfc5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java @@ -65,7 +65,7 @@ public class ItemSigilToggleable extends ItemSigil implements IActivatable @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - return (NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed()) && onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ)) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + return (NetworkHelper.getSoulNetwork(getOwnerUUID(player.getHeldItem(hand))).syphonAndDamage(player, getLpUsed()) && onSigilUse(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ)) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } public boolean onSigilUse(ItemStack itemStack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 1dbc3922..dede4a52 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -99,7 +99,7 @@ public class ItemPotionFlask extends Item implements IMeshProvider return EnumActionResult.SUCCESS; } - return super.onItemUse(stack, player, world, pos, hand, facing, hitX, hitY, hitZ); + return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index 0ecdbb24..2c688aa6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -45,7 +46,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, List list) + public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) { for (int i = 0; i < names.length; i++) list.add(new ItemStack(id, 1, i)); @@ -63,7 +64,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override public IFluidFilter getInputFluidFilter(ItemStack filterStack, TileEntity tile, IFluidHandler handler) { - IFluidFilter testFilter = new RoutingFluidFilter(); + IFluidFilter testFilter; switch (filterStack.getMetadata()) { @@ -120,9 +121,9 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, } ItemStack ghostStack = GhostItemHelper.getStackFromGhost(stack); - if (ghostStack.stackSize == 0) + if (ghostStack.isEmpty()) { - ghostStack.stackSize = Integer.MAX_VALUE; + ghostStack.setCount(Integer.MAX_VALUE); } filteredList.add(ghostStack); @@ -145,7 +146,7 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, { ItemStack copyStack = keyStack.copy(); GhostItemHelper.setItemGhostAmount(copyStack, 0); - copyStack.stackSize = 1; + copyStack.setCount(1); return copyStack; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index 06e5c543..5cbd10dc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -171,7 +171,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari { ItemStack copyStack = keyStack.copy(); GhostItemHelper.setItemGhostAmount(copyStack, 0); - copyStack.stackSize = 1; + copyStack.setCount(1); return copyStack; } } diff --git a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java index 0486e29d..2b5f7812 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java @@ -88,7 +88,7 @@ public class RoutingFluidFilter implements IFluidFilter public static FluidStack getFluidStackFromItemStack(ItemStack inputStack) { FluidStack fluidStack = FluidUtil.getFluidContained(inputStack); - fluidStack.amount = inputStack.stackSize; + fluidStack.amount = inputStack.getCount(); return fluidStack; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java index 2bb8c7a8..e2ec3eee 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java @@ -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); } } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java index 66c7b8c2..1717445f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java index f1345b9b..3a98ed33 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java @@ -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); diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemFluidRouterFilter.json b/src/main/resources/assets/bloodmagic/blockstates/item/itemfluidrouterfilter.json similarity index 100% rename from src/main/resources/assets/bloodmagic/blockstates/item/ItemFluidRouterFilter.json rename to src/main/resources/assets/bloodmagic/blockstates/item/itemfluidrouterfilter.json diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/itempotionflask.json b/src/main/resources/assets/bloodmagic/blockstates/item/itempotionflask.json index 4af6432c..3102ac66 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/itempotionflask.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/itempotionflask.json @@ -5,13 +5,18 @@ "transform": "forge:default-item" }, "variants": { - "type": { - "normal": { + "full": { + "true": { "textures": { "layer0": "bloodmagic:items/PotionFlask_underlay", "layer1": "bloodmagic:items/PotionFlask_outline", "layer2": "bloodmagic:items/PotionFlask_overlay" } + }, + "false": { + "textures": { + "layer0": "bloodmagic:items/PotionFlask_outline" + } } } } diff --git a/src/main/resources/assets/bloodmagic/textures/items/FluidRouterFilterExact.png b/src/main/resources/assets/bloodmagic/textures/items/fluidrouterfilterexact.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/items/FluidRouterFilterExact.png rename to src/main/resources/assets/bloodmagic/textures/items/fluidrouterfilterexact.png