diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 70c23a75b..fb9059861 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -33,11 +33,11 @@ public abstract class GuiBase extends GuiContainer { private int lastButtonId = 0; private int lastSideButtonY = 6; - private Scrollbar scrollbar; - protected int width; protected int height; + protected Scrollbar scrollbar; + public GuiBase(Container container, int width, int height) { super(container); @@ -47,14 +47,6 @@ public abstract class GuiBase extends GuiContainer { this.ySize = height; } - public void setScrollbar(Scrollbar scrollbar) { - this.scrollbar = scrollbar; - } - - public Scrollbar getScrollbar() { - return scrollbar; - } - @Override public void initGui() { if (sideButtons.size() > 0) { diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 12079a8f3..2b60bc616 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -22,9 +22,9 @@ public class GuiController extends GuiBase { public GuiController(ContainerController container, TileController controller) { super(container, 176, 181); - setScrollbar(new Scrollbar(157, 20, 12, 59)); - this.controller = controller; + + this.scrollbar = new Scrollbar(157, 20, 12, 59); } @Override @@ -34,8 +34,8 @@ public class GuiController extends GuiBase { @Override public void update(int x, int y) { - getScrollbar().setEnabled(getRows() > VISIBLE_ROWS); - getScrollbar().setMaxOffset(getRows() - VISIBLE_ROWS); + scrollbar.setEnabled(getRows() > VISIBLE_ROWS); + scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS); } @Override @@ -57,7 +57,7 @@ public class GuiController extends GuiBase { int x = 33; int y = 26; - int slot = getScrollbar().getOffset() * 2; + int slot = scrollbar.getOffset() * 2; RenderHelper.enableGUIStandardItemLighting(); diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index a3a5a669b..f2cf295de 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -34,9 +34,9 @@ public class GuiCraftingMonitor extends GuiBase { public GuiCraftingMonitor(ContainerCraftingMonitor container, TileCraftingMonitor craftingMonitor) { super(container, 176, 230); - setScrollbar(new Scrollbar(157, 20, 12, 89)); - this.craftingMonitor = craftingMonitor; + + this.scrollbar = new Scrollbar(157, 20, 12, 89); } @Override @@ -55,8 +55,8 @@ public class GuiCraftingMonitor extends GuiBase { @Override public void update(int x, int y) { - getScrollbar().setEnabled(getRows() > VISIBLE_ROWS); - getScrollbar().setMaxOffset(getRows() - VISIBLE_ROWS); + scrollbar.setEnabled(getRows() > VISIBLE_ROWS); + scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS); if (itemSelected >= getTasks().size()) { itemSelected = -1; @@ -82,7 +82,7 @@ public class GuiCraftingMonitor extends GuiBase { drawString(7, 7, t("gui.refinedstorage:crafting_monitor")); drawString(7, 137, t("container.inventory")); - int item = getScrollbar().getOffset(); + int item = scrollbar.getOffset(); RenderHelper.enableGUIStandardItemLighting(); @@ -173,7 +173,7 @@ public class GuiCraftingMonitor extends GuiBase { itemSelected = -1; if (mouseButton == 0 && inBounds(8, 20, 144, 90, mouseX - guiLeft, mouseY - guiTop)) { - int item = getScrollbar().getOffset(); + int item = scrollbar.getOffset(); for (int i = 0; i < VISIBLE_ROWS; ++i) { int ix = 8; diff --git a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java b/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java index 111343e9b..a5fa375ee 100755 --- a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java @@ -41,8 +41,10 @@ public class GuiNetworkTransmitter extends GuiBase { distance = t("gui.refinedstorage:network_transmitter.missing_upgrade"); } else if (TileNetworkTransmitter.RECEIVER_DIMENSION.getValue() != networkTransmitter.getWorld().provider.getDimension()) { distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue()); - } else { + } else if (TileNetworkTransmitter.DISTANCE.getValue() != -1) { distance = t("gui.refinedstorage:network_transmitter.distance", TileNetworkTransmitter.DISTANCE.getValue()); + } else { + distance = t("gui.refinedstorage:network_transmitter.missing_card"); } drawString(51, 24, distance); diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java index 1a29a8f61..0a591a9ec 100755 --- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java @@ -66,11 +66,11 @@ public class GuiGrid extends GuiBase { public GuiGrid(ContainerGrid container, IGrid grid) { super(container, grid.getType() == EnumGridType.FLUID ? 193 : 227, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) ? 247 : 208); - setScrollbar(new Scrollbar(174, 20, 12, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN || grid.getType() == EnumGridType.FLUID) ? 70 : 88)); - this.container = container; this.grid = grid; this.wasConnected = grid.isConnected(); + + this.scrollbar = new Scrollbar(174, 20, 12, (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN || grid.getType() == EnumGridType.FLUID) ? 70 : 88); } @Override @@ -192,8 +192,8 @@ public class GuiGrid extends GuiBase { STACKS = stacks; - getScrollbar().setEnabled(getRows() > getVisibleRows()); - getScrollbar().setMaxOffset(getRows() - getVisibleRows()); + scrollbar.setEnabled(getRows() > getVisibleRows()); + scrollbar.setMaxOffset(getRows() - getVisibleRows()); } @Override @@ -285,7 +285,7 @@ public class GuiGrid extends GuiBase { this.slotNumber = -1; - int slot = getScrollbar().getOffset() * 9; + int slot = scrollbar.getOffset() * 9; RenderHelper.enableGUIStandardItemLighting();