diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index 678b152eb..8caeb1f09 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -65,25 +65,13 @@ public class ContainerGrid extends ContainerBase { return grid; } - @Override - public void detectAndSendChanges() { + public void sendCraftingSlots() { for (int i = 0; i < inventorySlots.size(); ++i) { - if (inventorySlots.get(i) instanceof SlotGridCrafting || inventorySlots.get(i) == craftingResultSlot) { + Slot slot = inventorySlots.get(i); + + if (slot instanceof SlotGridCrafting || slot == craftingResultSlot) { for (int j = 0; j < listeners.size(); ++j) { - listeners.get(j).sendSlotContents(this, i, inventorySlots.get(i).getStack()); - } - } else { - ItemStack current = inventorySlots.get(i).getStack(); - ItemStack cached = inventoryItemStacks.get(i); - - if (!ItemStack.areItemStacksEqual(cached, current)) { - cached = current == null ? null : current.copy(); - - inventoryItemStacks.set(i, cached); - - for (int j = 0; j < listeners.size(); ++j) { - listeners.get(j).sendSlotContents(this, i, cached); - } + listeners.get(j).sendSlotContents(this, i, slot.getStack()); } } } @@ -100,11 +88,7 @@ public class ContainerGrid extends ContainerBase { @Override public boolean canMergeSlot(ItemStack stack, Slot slot) { - if (slot == craftingResultSlot || slot == patternResultSlot) { - return false; - } - - return super.canMergeSlot(stack, slot); + return (slot == craftingResultSlot || slot == patternResultSlot) ? false : super.canMergeSlot(stack, slot); } @Override diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java index ab8be7a74..240d64819 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -31,7 +31,7 @@ public class SlotGridCraftingResult extends SlotCrafting { if (!player.worldObj.isRemote) { grid.onCrafted(); - container.detectAndSendChanges(); + container.sendCraftingSlots(); } } } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index c0854d4d4..6d5c9023e 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -222,9 +222,9 @@ public class GuiGrid extends GuiBase { drawString(7, 7, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid")); if (grid.getType() == EnumGridType.CRAFTING) { - drawString(7, 94, t("container.crafting")); + drawString(7, 95, t("container.crafting")); } else if (grid.getType() == EnumGridType.PATTERN) { - drawString(7, 94, t("gui.refinedstorage:grid.pattern")); + drawString(7, 95, t("gui.refinedstorage:grid.pattern")); } drawString(7, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 163 : 114, t("container.inventory")); diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 87ae144ac..0e3a8f0ce 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -187,6 +187,7 @@ public class TileGrid extends TileMachine implements IGrid { } } + container.sendCraftingSlots(); container.detectAndSendChanges(); }