diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 01134b77..8964b1cc 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -593,7 +593,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq if (tags.hasKey(key + "Color")) return tags.getInteger(key + "Color"); // custom texture? - Integer matId = tags.getInteger("Render" + key); + int matId = tags.getInteger("Render" + key); if (map.containsKey(matId)) return super.getColorFromItemStack(stack, renderPass); // color default texture with material color diff --git a/src/main/java/tconstruct/tools/inventory/SlotTool.java b/src/main/java/tconstruct/tools/inventory/SlotTool.java index ec06b884..7ce50ae8 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotTool.java +++ b/src/main/java/tconstruct/tools/inventory/SlotTool.java @@ -51,7 +51,7 @@ public class SlotTool extends Slot { if (stack.getItem() instanceof IModifyable) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - Boolean full = (inventory.getStackInSlot(2) != null || inventory.getStackInSlot(3) != null); + boolean full = (inventory.getStackInSlot(2) != null || inventory.getStackInSlot(3) != null); for (int i = 2; i <= 3; i++) inventory.decrStackSize(i, 1); ItemStack compare = inventory.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1; diff --git a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java index 9894dc48..69e9e817 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotToolForge.java +++ b/src/main/java/tconstruct/tools/inventory/SlotToolForge.java @@ -22,7 +22,7 @@ public class SlotToolForge extends SlotTool { if (stack.getItem() instanceof IModifyable) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - Boolean full = (inventory.getStackInSlot(2) != null + boolean full = (inventory.getStackInSlot(2) != null || inventory.getStackInSlot(3) != null || inventory.getStackInSlot(4) != null); for (int i = 2; i <= 4; i++) inventory.decrStackSize(i, 1); diff --git a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java index cf2ee392..37df96b6 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java @@ -75,7 +75,7 @@ public class ToolForgeContainer extends ToolStationContainer { if (stack.getItem() instanceof IModifyable) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - Boolean full = (logic.getStackInSlot(2) != null + boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null || logic.getStackInSlot(4) != null); for (int i = 2; i <= 4; i++) logic.decrStackSize(i, 1); diff --git a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java index 77333dfb..196e82cf 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java @@ -117,7 +117,7 @@ public class ToolStationContainer extends ActiveContainer { if (stack.getItem() instanceof IModifyable) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag(((IModifyable) stack.getItem()).getBaseTagName()); - Boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null); + boolean full = (logic.getStackInSlot(2) != null || logic.getStackInSlot(3) != null); for (int i = 2; i <= 3; i++) logic.decrStackSize(i, 1); ItemStack compare = logic.getStackInSlot(1); int amount = compare.getItem() instanceof IModifyable ? compare.stackSize : 1;