From f90b4fcafe49055e9f9caf33d8e1a3dbb05c0f5b Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 17 Mar 2018 20:09:40 +0100 Subject: [PATCH] Move some things to a new package --- .../container/ContainerCrafterManager.java | 25 +++---------- .../container/ContainerGrid.java | 8 ++--- .../container/slot/SlotCrafterManager.java | 22 ++++++++++++ .../refinedstorage/gui/GuiBase.java | 3 +- .../refinedstorage/gui/GuiConstructor.java | 8 ++--- .../refinedstorage/gui/GuiController.java | 3 +- .../refinedstorage/gui/GuiCrafter.java | 2 +- .../refinedstorage/gui/GuiCrafterManager.java | 31 ++++++++-------- .../gui/GuiCraftingMonitor.java | 5 +-- .../gui/GuiCraftingPreview.java | 1 + .../refinedstorage/gui/GuiDestructor.java | 2 +- .../refinedstorage/gui/GuiDetector.java | 6 ++-- .../gui/GuiDiskManipulator.java | 2 +- .../refinedstorage/gui/GuiExporter.java | 8 ++--- .../refinedstorage/gui/GuiFluidInterface.java | 4 +-- .../refinedstorage/gui/GuiHandler.java | 9 +++-- .../refinedstorage/gui/GuiImporter.java | 8 ++--- .../refinedstorage/gui/GuiInterface.java | 4 +-- .../gui/GuiNetworkTransmitter.java | 2 +- .../refinedstorage/gui/GuiReaderWriter.java | 3 +- .../refinedstorage/gui/GuiRelay.java | 2 +- .../gui/GuiSecurityManager.java | 2 +- .../refinedstorage/gui/GuiSolderer.java | 2 +- .../refinedstorage/gui/GuiStorage.java | 2 +- .../refinedstorage/gui/GuiStorageMonitor.java | 4 +-- .../gui/GuiWirelessTransmitter.java | 2 +- ...ridDisplay.java => IResizableDisplay.java} | 8 ++--- ...yDummy.java => ResizableDisplayDummy.java} | 8 ++--- .../gui/{ => control}/Scrollbar.java | 7 ++-- .../gui/control/ScrollbarListener.java | 5 +++ .../{sidebutton => control}/SideButton.java | 2 +- .../SideButtonAccessType.java | 2 +- .../SideButtonCompare.java | 2 +- .../SideButtonConstuctorDrop.java | 2 +- ...ideButtonCraftingMonitorViewAutomated.java | 2 +- .../SideButtonDestructorPickup.java | 2 +- .../SideButtonDetectorMode.java | 2 +- .../SideButtonExporterRegulator.java | 2 +- .../SideButtonGridSearchBoxMode.java | 2 +- .../SideButtonGridSize.java | 2 +- .../SideButtonGridSortingDirection.java | 2 +- .../SideButtonGridSortingType.java | 2 +- .../SideButtonGridViewType.java | 2 +- .../SideButtonIOMode.java | 2 +- .../SideButtonMode.java | 2 +- .../SideButtonRedstoneMode.java | 2 +- .../SideButtonType.java | 2 +- .../SideButtonVoidExcess.java | 2 +- .../refinedstorage/gui/grid/GuiGrid.java | 36 +++++++++---------- .../render/BakedModelPattern.java | 3 +- 50 files changed, 144 insertions(+), 129 deletions(-) create mode 100644 src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java rename src/main/java/com/raoulvdberge/refinedstorage/gui/{grid/IGridDisplay.java => IResizableDisplay.java} (52%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{grid/GridDisplayDummy.java => ResizableDisplayDummy.java} (71%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{ => control}/Scrollbar.java (94%) mode change 100755 => 100644 create mode 100644 src/main/java/com/raoulvdberge/refinedstorage/gui/control/ScrollbarListener.java rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButton.java (96%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonAccessType.java (95%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonCompare.java (96%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonConstuctorDrop.java (94%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonCraftingMonitorViewAutomated.java (94%) rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonDestructorPickup.java (94%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonDetectorMode.java (96%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonExporterRegulator.java (94%) rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonGridSearchBoxMode.java (97%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonGridSize.java (96%) rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonGridSortingDirection.java (95%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonGridSortingType.java (97%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonGridViewType.java (96%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonIOMode.java (95%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonMode.java (95%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonRedstoneMode.java (94%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonType.java (94%) mode change 100755 => 100644 rename src/main/java/com/raoulvdberge/refinedstorage/gui/{sidebutton => control}/SideButtonVoidExcess.java (94%) mode change 100755 => 100644 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java index 12d215c60..1ac0e994c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.gui.grid.IGridDisplay; +import com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager; +import com.raoulvdberge.refinedstorage.gui.IResizableDisplay; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase; import com.raoulvdberge.refinedstorage.tile.TileCrafterManager; import net.minecraft.client.resources.I18n; @@ -12,7 +13,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.SlotItemHandler; @@ -63,22 +63,7 @@ public class ContainerCrafterManager extends ContainerBase { } } - public class SlotCrafterManager extends SlotItemHandler { - private boolean visible; - - private SlotCrafterManager(IItemHandler itemHandler, int index, int xPosition, int yPosition, boolean visible) { - super(itemHandler, index, xPosition, yPosition); - - this.visible = visible; - } - - @Override - public boolean isEnabled() { - return yPos >= display.getHeader() && yPos < display.getHeader() + 18 * display.getVisibleRows() && visible; - } - } - - private IGridDisplay display; + private IResizableDisplay display; private Map containerData; private Map dummyInventories = new HashMap<>(); @@ -91,7 +76,7 @@ public class ContainerCrafterManager extends ContainerBase { return listeners; } - public ContainerCrafterManager(TileCrafterManager crafterManager, EntityPlayer player, IGridDisplay display) { + public ContainerCrafterManager(TileCrafterManager crafterManager, EntityPlayer player, IResizableDisplay display) { super(crafterManager, player); this.display = display; @@ -143,7 +128,7 @@ public class ContainerCrafterManager extends ContainerBase { } for (int slot = 0; slot < entry.getValue(); ++slot) { - addSlotToContainer(new SlotCrafterManager(dummy, slot, x, y, visible)); + addSlotToContainer(new SlotCrafterManager(dummy, slot, x, y, visible, display)); if (visible) { x += 18; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java index c8794546f..17128c91b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java @@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.container.slot.*; -import com.raoulvdberge.refinedstorage.gui.grid.IGridDisplay; +import com.raoulvdberge.refinedstorage.gui.IResizableDisplay; import com.raoulvdberge.refinedstorage.tile.TileBase; import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid; @@ -31,12 +31,12 @@ public class ContainerGrid extends ContainerBase { private IGrid grid; private IStorageCache cache; private IStorageCacheListener listener; - private IGridDisplay display; + private IResizableDisplay display; private SlotGridCraftingResult craftingResultSlot; private SlotDisabled patternResultSlot; - public ContainerGrid(IGrid grid, IGridDisplay display, @Nullable TileBase gridTile, EntityPlayer player) { + public ContainerGrid(IGrid grid, IResizableDisplay display, @Nullable TileBase gridTile, EntityPlayer player) { super(gridTile, player); this.grid = grid; @@ -49,7 +49,7 @@ public class ContainerGrid extends ContainerBase { this.inventorySlots.clear(); this.inventoryItemStacks.clear(); - int headerAndSlots = getTabDelta() + display.getHeader() + (display.getVisibleRows() * 18); + int headerAndSlots = getTabDelta() + display.getTopHeight() + (display.getVisibleRows() * 18); if (grid.getType() != GridType.FLUID) { int yStart = 6; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java new file mode 100644 index 000000000..bb0bb90d5 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java @@ -0,0 +1,22 @@ +package com.raoulvdberge.refinedstorage.container.slot; + +import com.raoulvdberge.refinedstorage.gui.IResizableDisplay; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.SlotItemHandler; + +public class SlotCrafterManager extends SlotItemHandler { + private boolean visible; + private IResizableDisplay display; + + public SlotCrafterManager(IItemHandler itemHandler, int index, int xPosition, int yPosition, boolean visible, IResizableDisplay display) { + super(itemHandler, index, xPosition, yPosition); + + this.visible = visible; + this.display = display; + } + + @Override + public boolean isEnabled() { + return yPos >= display.getTopHeight() && yPos < display.getTopHeight() + 18 * display.getVisibleRows() && visible; + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java index 9fe80befe..fd82a503b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java @@ -3,7 +3,8 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButton; +import com.raoulvdberge.refinedstorage.gui.control.Scrollbar; +import com.raoulvdberge.refinedstorage.gui.control.SideButton; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java index f47241f8f..c8f1e7455 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java @@ -2,10 +2,10 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerConstructor; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonConstuctorDrop; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonConstuctorDrop; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonType; import com.raoulvdberge.refinedstorage.tile.TileConstructor; public class GuiConstructor extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java index 8bd69ba70..fbddb485f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java @@ -1,7 +1,8 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.container.ContainerController; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.Scrollbar; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.ClientNode; import com.raoulvdberge.refinedstorage.tile.TileController; import com.raoulvdberge.refinedstorage.util.RenderUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java index 295a59030..57b65bca2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.container.ContainerCrafter; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileCrafter; import com.raoulvdberge.refinedstorage.util.RenderUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java index 586116e5f..e1f9867ff 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java @@ -4,9 +4,10 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterManager; import com.raoulvdberge.refinedstorage.container.ContainerCrafterManager; -import com.raoulvdberge.refinedstorage.gui.grid.IGridDisplay; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonGridSize; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager; +import com.raoulvdberge.refinedstorage.gui.control.Scrollbar; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonGridSize; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileCrafterManager; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -18,7 +19,7 @@ import net.minecraft.inventory.Slot; import java.io.IOException; import java.util.Map; -public class GuiCrafterManager extends GuiBase implements IGridDisplay { +public class GuiCrafterManager extends GuiBase implements IResizableDisplay { private ContainerCrafterManager container; private NetworkNodeCrafterManager crafterManager; private GuiTextField searchField; @@ -38,24 +39,24 @@ public class GuiCrafterManager extends GuiBase implements IGridDisplay { protected void calcHeight() { super.calcHeight(); - this.ySize = getHeader() + getFooter() + (getVisibleRows() * 18); + this.ySize = getTopHeight() + getBottomHeight() + (getVisibleRows() * 18); this.screenHeight = ySize; } @Override - public int getHeader() { + public int getTopHeight() { return 19; } @Override - public int getFooter() { + public int getBottomHeight() { return 99; } public int getVisibleRows() { switch (crafterManager.getSize()) { case IGrid.SIZE_STRETCH: - int screenSpaceAvailable = height - getHeader() - getFooter(); + int screenSpaceAvailable = height - getTopHeight() - getBottomHeight(); return Math.max(3, Math.min((screenSpaceAvailable / 18) - 3, RS.INSTANCE.config.maxRowsStretch)); case IGrid.SIZE_SMALL: @@ -98,7 +99,7 @@ public class GuiCrafterManager extends GuiBase implements IGridDisplay { } public int getYPlayerInventory() { - return getHeader() + (getVisibleRows() * 18) + 16; + return getTopHeight() + (getVisibleRows() * 18) + 16; } @Override @@ -106,7 +107,7 @@ public class GuiCrafterManager extends GuiBase implements IGridDisplay { addSideButton(new SideButtonRedstoneMode(this, TileCrafterManager.REDSTONE_MODE)); addSideButton(new SideButtonGridSize(this, () -> crafterManager.getSize(), size -> TileDataManager.setParameter(TileCrafterManager.SIZE, size))); - this.scrollbar = new Scrollbar(174, getHeader(), 12, (getVisibleRows() * 18) - 2); + this.scrollbar = new Scrollbar(174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); this.scrollbar.addListener((oldOffset, newOffset) -> { if (container != null) { container.initSlots(null); @@ -139,7 +140,7 @@ public class GuiCrafterManager extends GuiBase implements IGridDisplay { public void drawBackground(int x, int y, int mouseX, int mouseY) { bindTexture("gui/crafter_manager.png"); - drawTexture(x, y, 0, 0, screenWidth, getHeader()); + drawTexture(x, y, 0, 0, screenWidth, getTopHeight()); int rows = getVisibleRows(); @@ -148,16 +149,16 @@ public class GuiCrafterManager extends GuiBase implements IGridDisplay { for (int i = 0; i < rows; ++i) { yy += 18; - drawTexture(x, yy, 0, getHeader() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), screenWidth, 18); + drawTexture(x, yy, 0, getTopHeight() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), screenWidth, 18); } yy += 18; - drawTexture(x, yy, 0, getHeader() + (18 * 3), screenWidth, getFooter()); + drawTexture(x, yy, 0, getTopHeight() + (18 * 3), screenWidth, getBottomHeight()); if (container != null) { for (Slot slot : container.inventorySlots) { - if (slot instanceof ContainerCrafterManager.SlotCrafterManager && slot.isEnabled()) { + if (slot instanceof SlotCrafterManager && slot.isEnabled()) { drawTexture(x + slot.xPos - 1, y + slot.yPos - 1, 0, 193, 18, 18); } } @@ -203,7 +204,7 @@ public class GuiCrafterManager extends GuiBase implements IGridDisplay { for (Map.Entry entry : container.getContainerData().entrySet()) { if (t(entry.getKey()).toLowerCase().contains(getSearchFieldText().toLowerCase())) { - if (y >= getHeader() - 1 && y < getHeader() + getVisibleRows() * 18 - 1) { + if (y >= getTopHeight() - 1 && y < getTopHeight() + getVisibleRows() * 18 - 1) { GlStateManager.disableLighting(); GlStateManager.color(1, 1, 1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java index 9aa7465f9..2bd1b49ec 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java @@ -5,8 +5,9 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftin import com.raoulvdberge.refinedstorage.api.render.IElementDrawer; import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCraftingMonitorViewAutomated; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.Scrollbar; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCraftingMonitorViewAutomated; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.network.MessageCraftingMonitorCancel; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java index 2a455ceeb..91d756e4d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementError; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack; +import com.raoulvdberge.refinedstorage.gui.control.Scrollbar; import com.raoulvdberge.refinedstorage.item.ItemPattern; import com.raoulvdberge.refinedstorage.network.MessageGridCraftingStart; import com.raoulvdberge.refinedstorage.util.RenderUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java index 80098a0c4..76166af43 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerDestructor; -import com.raoulvdberge.refinedstorage.gui.sidebutton.*; +import com.raoulvdberge.refinedstorage.gui.control.*; import com.raoulvdberge.refinedstorage.tile.TileDestructor; public class GuiDestructor extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java index a42dab4d7..161ecd5d2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java @@ -3,9 +3,9 @@ package com.raoulvdberge.refinedstorage.gui; import com.google.common.primitives.Ints; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerDetector; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonDetectorMode; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonDetectorMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonType; import com.raoulvdberge.refinedstorage.tile.TileDetector; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java index b5c473667..d165b1cb4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerDiskManipulator; -import com.raoulvdberge.refinedstorage.gui.sidebutton.*; +import com.raoulvdberge.refinedstorage.gui.control.*; import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; public class GuiDiskManipulator extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java index 89a53a75c..8417e905e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java @@ -2,10 +2,10 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerExporter; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonExporterRegulator; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonExporterRegulator; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonType; import com.raoulvdberge.refinedstorage.tile.TileExporter; public class GuiExporter extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java index e17826d5d..e84a6162b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java @@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidInterface; import com.raoulvdberge.refinedstorage.container.ContainerFluidInterface; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import com.raoulvdberge.refinedstorage.util.RenderUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java index 16ba1940b..1718cd820 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java @@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiReaderWriter; import com.raoulvdberge.refinedstorage.container.*; -import com.raoulvdberge.refinedstorage.gui.grid.GridDisplayDummy; import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; import com.raoulvdberge.refinedstorage.integration.mcmp.IntegrationMCMP; import com.raoulvdberge.refinedstorage.integration.mcmp.RSMCMPAddon; @@ -28,9 +27,9 @@ public class GuiHandler implements IGuiHandler { case RSGui.CONTROLLER: return new ContainerController((TileController) tile, player); case RSGui.GRID: - return new ContainerGrid(((TileGrid) tile).getNode(), new GridDisplayDummy(), (TileGrid) tile, player); + return new ContainerGrid(((TileGrid) tile).getNode(), new ResizableDisplayDummy(), (TileGrid) tile, player); case RSGui.PORTABLE_GRID: - return new ContainerGrid((TilePortableGrid) tile, new GridDisplayDummy(), (TilePortableGrid) tile, player); + return new ContainerGrid((TilePortableGrid) tile, new ResizableDisplayDummy(), (TilePortableGrid) tile, player); case RSGui.DISK_DRIVE: return new ContainerDiskDrive((TileDiskDrive) tile, player); case RSGui.IMPORTER: @@ -74,7 +73,7 @@ public class GuiHandler implements IGuiHandler { case RSGui.STORAGE_MONITOR: return new ContainerStorageMonitor((TileStorageMonitor) tile, player); case RSGui.CRAFTER_MANAGER: - return new ContainerCrafterManager((TileCrafterManager) tile, player, new GridDisplayDummy()); + return new ContainerCrafterManager((TileCrafterManager) tile, player, new ResizableDisplayDummy()); default: return null; } @@ -176,7 +175,7 @@ public class GuiHandler implements IGuiHandler { } private ContainerGrid getGridContainer(EntityPlayer player, int hand, int networkDimension, int id) { - return new ContainerGrid(getGrid(player, hand, networkDimension, id), new GridDisplayDummy(), null, player); + return new ContainerGrid(getGrid(player, hand, networkDimension, id), new ResizableDisplayDummy(), null, player); } private WirelessCraftingMonitor getCraftingMonitor(EntityPlayer player, int hand, int networkDimension) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java index 162071e4d..68d57c1ea 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java @@ -2,10 +2,10 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerImporter; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonMode; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonType; import com.raoulvdberge.refinedstorage.tile.TileImporter; public class GuiImporter extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java index 79df85586..733f530ad 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java @@ -2,8 +2,8 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerInterface; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileInterface; public class GuiInterface extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java index f86614f93..30fe26997 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.container.ContainerNetworkTransmitter; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; public class GuiNetworkTransmitter extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java index 68fd750c9..57a69c586 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java @@ -3,7 +3,8 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiReaderWriter; import com.raoulvdberge.refinedstorage.container.ContainerReaderWriter; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.Scrollbar; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.network.MessageReaderWriterChannelAdd; import com.raoulvdberge.refinedstorage.network.MessageReaderWriterChannelRemove; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java index dca588d2a..d399e3474 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.container.ContainerRelay; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileRelay; public class GuiRelay extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSecurityManager.java index 6704be3c4..6e2ae6083 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSecurityManager.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.container.ContainerSecurityManager; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.item.ItemSecurityCard; import com.raoulvdberge.refinedstorage.network.MessageSecurityManagerUpdate; import com.raoulvdberge.refinedstorage.tile.TileSecurityManager; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSolderer.java index fe44677a0..cd1ef7bf0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSolderer.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.container.ContainerSolderer; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileSolderer; public class GuiSolderer extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java index 9c9486706..1ebe89bca 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiStorage; import com.raoulvdberge.refinedstorage.container.ContainerBase; -import com.raoulvdberge.refinedstorage.gui.sidebutton.*; +import com.raoulvdberge.refinedstorage.gui.control.*; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorageMonitor.java index d7be5f180..38c32d5fe 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorageMonitor.java @@ -2,8 +2,8 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.container.ContainerStorageMonitor; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonCompare; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonType; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonCompare; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonType; import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor; public class GuiStorageMonitor extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java index 4daa60432..17275048b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.gui; import com.raoulvdberge.refinedstorage.container.ContainerWirelessTransmitter; -import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode; +import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; public class GuiWirelessTransmitter extends GuiBase { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/IGridDisplay.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/IResizableDisplay.java old mode 100755 new mode 100644 similarity index 52% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/grid/IGridDisplay.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/IResizableDisplay.java index fce3b328b..a9a603d85 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/IGridDisplay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/IResizableDisplay.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.gui.grid; +package com.raoulvdberge.refinedstorage.gui; -public interface IGridDisplay { +public interface IResizableDisplay { int getVisibleRows(); int getRows(); @@ -9,9 +9,9 @@ public interface IGridDisplay { String getSearchFieldText(); - int getHeader(); + int getTopHeight(); - int getFooter(); + int getBottomHeight(); int getYPlayerInventory(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GridDisplayDummy.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/ResizableDisplayDummy.java old mode 100755 new mode 100644 similarity index 71% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GridDisplayDummy.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/ResizableDisplayDummy.java index 30c9038a2..d94fc27df --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GridDisplayDummy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/ResizableDisplayDummy.java @@ -1,6 +1,6 @@ -package com.raoulvdberge.refinedstorage.gui.grid; +package com.raoulvdberge.refinedstorage.gui; -public class GridDisplayDummy implements IGridDisplay { +public class ResizableDisplayDummy implements IResizableDisplay { @Override public int getVisibleRows() { return 3; @@ -22,12 +22,12 @@ public class GridDisplayDummy implements IGridDisplay { } @Override - public int getHeader() { + public int getTopHeight() { return 0; } @Override - public int getFooter() { + public int getBottomHeight() { return 0; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/Scrollbar.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/Scrollbar.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/Scrollbar.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/Scrollbar.java index a77c1b39b..d75e90a37 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/Scrollbar.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/Scrollbar.java @@ -1,15 +1,12 @@ -package com.raoulvdberge.refinedstorage.gui; +package com.raoulvdberge.refinedstorage.gui.control; +import com.raoulvdberge.refinedstorage.gui.GuiBase; import org.lwjgl.input.Mouse; import java.util.LinkedList; import java.util.List; public class Scrollbar { - public interface ScrollbarListener { - void onOffsetChanged(int oldOffset, int newOffset); - } - private static final int SCROLLER_HEIGHT = 15; private int x; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/control/ScrollbarListener.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/ScrollbarListener.java new file mode 100644 index 000000000..9590e3626 --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/ScrollbarListener.java @@ -0,0 +1,5 @@ +package com.raoulvdberge.refinedstorage.gui.control; + +public interface ScrollbarListener { + void onOffsetChanged(int oldOffset, int newOffset); +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButton.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButton.java index 8779422d4..c71046c5c --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButton.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonAccessType.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonAccessType.java index 9111c532d..7d5a24499 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonAccessType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonCompare.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonCompare.java index 6314479fb..ae57d1e5f --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonCompare.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonConstuctorDrop.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonConstuctorDrop.java index 09cfeb285..b6337aa19 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonConstuctorDrop.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.TileConstructor; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCraftingMonitorViewAutomated.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonCraftingMonitorViewAutomated.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCraftingMonitorViewAutomated.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonCraftingMonitorViewAutomated.java index 34fdef0c3..d92542c7d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCraftingMonitorViewAutomated.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonCraftingMonitorViewAutomated.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDestructorPickup.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonDestructorPickup.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDestructorPickup.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonDestructorPickup.java index d0334ea79..86d5d13e0 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDestructorPickup.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonDestructorPickup.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.TileDestructor; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonDetectorMode.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonDetectorMode.java index 682873e33..f294d4e41 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonDetectorMode.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeDetector; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonExporterRegulator.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonExporterRegulator.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonExporterRegulator.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonExporterRegulator.java index a8ca5bc57..d1b75ff19 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonExporterRegulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonExporterRegulator.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.TileExporter; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSearchBoxMode.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSearchBoxMode.java index 5b42837ad..db596fec7 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSearchBoxMode.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSize.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSize.java index 186055231..956e924d9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSize.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSortingDirection.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSortingDirection.java index cf114f774..4f35cc0c8 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSortingDirection.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSortingType.java old mode 100755 new mode 100644 similarity index 97% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSortingType.java index 17a6db67f..d266309b0 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridSortingType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridViewType.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridViewType.java index 834e67aa1..64ff6b752 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonGridViewType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonIOMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonIOMode.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonIOMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonIOMode.java index b7a40ab69..a9bf627eb --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonIOMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonIOMode.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator.NetworkNodeDiskManipulator; import com.raoulvdberge.refinedstorage.gui.GuiBase; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonMode.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonMode.java index 80824536b..7e70ea97f --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonMode.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.config.IFilterable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonRedstoneMode.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonRedstoneMode.java index d648e10cc..13295f7b2 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonRedstoneMode.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonType.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonType.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonType.java index 0758e885d..8039f282c --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonType.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.config.IType; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonVoidExcess.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java rename to src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonVoidExcess.java index a01ee55fd..aef5a506b --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonVoidExcess.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.gui.sidebutton; +package com.raoulvdberge.refinedstorage.gui.control; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index 3bbe44d44..f82ce0551 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -10,14 +10,14 @@ import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; -import com.raoulvdberge.refinedstorage.gui.Scrollbar; +import com.raoulvdberge.refinedstorage.gui.IResizableDisplay; +import com.raoulvdberge.refinedstorage.gui.control.*; import com.raoulvdberge.refinedstorage.gui.grid.sorting.*; import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem; import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; import com.raoulvdberge.refinedstorage.gui.grid.view.GridViewFluid; import com.raoulvdberge.refinedstorage.gui.grid.view.GridViewItem; import com.raoulvdberge.refinedstorage.gui.grid.view.IGridView; -import com.raoulvdberge.refinedstorage.gui.sidebutton.*; import com.raoulvdberge.refinedstorage.integration.jei.IntegrationJEI; import com.raoulvdberge.refinedstorage.integration.jei.RSJEIPlugin; import com.raoulvdberge.refinedstorage.network.*; @@ -51,7 +51,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -public class GuiGrid extends GuiBase implements IGridDisplay { +public class GuiGrid extends GuiBase implements IResizableDisplay { private static final List SEARCH_HISTORY = new ArrayList<>(); private IGridView view; @@ -91,7 +91,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { @Override protected void calcHeight() { - this.ySize = getHeader() + getFooter() + (getVisibleRows() * 18); + this.ySize = getTopHeight() + getBottomHeight() + (getVisibleRows() * 18); if (hadTabs) { this.ySize += ContainerGrid.TAB_HEIGHT; @@ -104,7 +104,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { public void init(int x, int y) { ((ContainerGrid) this.inventorySlots).initSlots(); - this.scrollbar = new Scrollbar(174, getTabHeight() + getHeader(), 12, (getVisibleRows() * 18) - 2); + this.scrollbar = new Scrollbar(174, getTabHeight() + getTopHeight(), 12, (getVisibleRows() * 18) - 2); if (grid instanceof NetworkNodeGrid || grid instanceof TilePortableGrid) { addSideButton(new SideButtonRedstoneMode(this, grid instanceof NetworkNodeGrid ? TileGrid.REDSTONE_MODE : TilePortableGrid.REDSTONE_MODE)); @@ -129,11 +129,11 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } if (grid.getType() == GridType.PATTERN) { - processingPattern = addCheckBox(x + 7, y + getTabHeight() + getHeader() + (getVisibleRows() * 18) + 60, t("misc.refinedstorage:processing"), TileGrid.PROCESSING_PATTERN.getValue()); - oredictPattern = addCheckBox(processingPattern.x + processingPattern.width + 5, y + getTabHeight() + getHeader() + (getVisibleRows() * 18) + 60, t("misc.refinedstorage:oredict"), TileGrid.OREDICT_PATTERN.getValue()); + processingPattern = addCheckBox(x + 7, y + getTabHeight() + getTopHeight() + (getVisibleRows() * 18) + 60, t("misc.refinedstorage:processing"), TileGrid.PROCESSING_PATTERN.getValue()); + oredictPattern = addCheckBox(processingPattern.x + processingPattern.width + 5, y + getTabHeight() + getTopHeight() + (getVisibleRows() * 18) + 60, t("misc.refinedstorage:oredict"), TileGrid.OREDICT_PATTERN.getValue()); if (((NetworkNodeGrid) grid).isProcessingPattern()) { - blockingPattern = addCheckBox(oredictPattern.x + oredictPattern.width + 5, y + getTabHeight() + getHeader() + (getVisibleRows() * 18) + 60, t("misc.refinedstorage:blocking"), TileGrid.BLOCKING_PATTERN.getValue()); + blockingPattern = addCheckBox(oredictPattern.x + oredictPattern.width + 5, y + getTabHeight() + getTopHeight() + (getVisibleRows() * 18) + 60, t("misc.refinedstorage:blocking"), TileGrid.BLOCKING_PATTERN.getValue()); } } @@ -180,12 +180,12 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } @Override - public int getHeader() { + public int getTopHeight() { return 19; } @Override - public int getFooter() { + public int getBottomHeight() { if (grid.getType() == GridType.CRAFTING) { return 156; } else if (grid.getType() == GridType.PATTERN) { @@ -197,7 +197,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { @Override public int getYPlayerInventory() { - int yp = getTabHeight() + getHeader() + (getVisibleRows() * 18); + int yp = getTabHeight() + getTopHeight() + (getVisibleRows() * 18); if (grid.getType() == GridType.NORMAL || grid.getType() == GridType.FLUID) { yp += 16; @@ -229,7 +229,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { public int getVisibleRows() { switch (grid.getSize()) { case IGrid.SIZE_STRETCH: - int screenSpaceAvailable = height - getHeader() - getFooter() - (hadTabs ? ContainerGrid.TAB_HEIGHT : 0); + int screenSpaceAvailable = height - getTopHeight() - getBottomHeight() - (hadTabs ? ContainerGrid.TAB_HEIGHT : 0); return Math.max(3, Math.min((screenSpaceAvailable / 18) - 3, RS.INSTANCE.config.maxRowsStretch)); case IGrid.SIZE_SMALL: @@ -260,7 +260,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } private boolean isOverClear(int mouseX, int mouseY) { - int y = getTabHeight() + getHeader() + (getVisibleRows() * 18) + 4; + int y = getTabHeight() + getTopHeight() + (getVisibleRows() * 18) + 4; switch (grid.getType()) { case CRAFTING: @@ -277,7 +277,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } private boolean isOverCreatePattern(int mouseX, int mouseY) { - return grid.getType() == GridType.PATTERN && inBounds(172, getTabHeight() + getHeader() + (getVisibleRows() * 18) + 22, 16, 16, mouseX, mouseY) && ((NetworkNodeGrid) grid).canCreatePattern(); + return grid.getType() == GridType.PATTERN && inBounds(172, getTabHeight() + getTopHeight() + (getVisibleRows() * 18) + 22, 16, 16, mouseX, mouseY) && ((NetworkNodeGrid) grid).canCreatePattern(); } private int getTabHeight() { @@ -352,7 +352,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { int yy = y + getTabHeight(); - drawTexture(x, yy, 0, 0, screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), getHeader()); + drawTexture(x, yy, 0, 0, screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), getTopHeight()); if (grid.getType() != GridType.FLUID) { drawTexture(x + screenWidth - 34 + 4, y + getTabHeight(), 197, 0, 30, grid instanceof IPortableGrid ? 114 : 82); @@ -363,12 +363,12 @@ public class GuiGrid extends GuiBase implements IGridDisplay { for (int i = 0; i < rows; ++i) { yy += 18; - drawTexture(x, yy, 0, getHeader() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), 18); + drawTexture(x, yy, 0, getTopHeight() + (i > 0 ? (i == rows - 1 ? 18 * 2 : 18) : 0), screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), 18); } yy += 18; - drawTexture(x, yy, 0, getHeader() + (18 * 3), screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), getFooter()); + drawTexture(x, yy, 0, getTopHeight() + (18 * 3), screenWidth - (grid.getType() != GridType.FLUID ? 34 : 0), getBottomHeight()); if (grid.getType() == GridType.PATTERN) { int ty = 0; @@ -381,7 +381,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { ty = 2; } - drawTexture(x + 172, y + getTabHeight() + getHeader() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16); + drawTexture(x + 172, y + getTabHeight() + getTopHeight() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16); } j = 0; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java index 6745c5d29..2cf7587b7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.render; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import com.raoulvdberge.refinedstorage.container.ContainerCrafterManager; +import com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.item.ItemPattern; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -95,7 +96,7 @@ public class BakedModelPattern implements IBakedModel { if (container instanceof ContainerCrafterManager) { for (Slot slot : container.inventorySlots) { - if (slot instanceof ContainerCrafterManager.SlotCrafterManager && slot.getStack() == stack) { + if (slot instanceof SlotCrafterManager && slot.getStack() == stack) { return true; } }