From 4dc2e2e9709e169853783b6e56e88a3142782691 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 18 Jul 2017 19:44:12 +0200 Subject: [PATCH] Move grid config constants to IGrid --- .../api/network/grid/IGrid.java | 53 +++++++++++++++++++ .../apiimpl/network/node/NetworkNodeGrid.java | 53 ------------------- .../refinedstorage/gui/grid/GuiGrid.java | 22 ++++---- .../gui/grid/filtering/GridFilterParser.java | 5 +- .../gui/grid/sorting/GridSortingID.java | 6 +-- .../gui/grid/sorting/GridSortingName.java | 6 +-- .../gui/grid/sorting/GridSortingQuantity.java | 6 +-- .../SideButtonGridSearchBoxMode.java | 22 ++++---- .../gui/sidebutton/SideButtonGridSize.java | 25 +++++---- .../SideButtonGridSortingDirection.java | 9 ++-- .../sidebutton/SideButtonGridSortingType.java | 15 +++--- .../sidebutton/SideButtonGridViewType.java | 13 +++-- .../item/ItemWirelessFluidGrid.java | 9 ++-- .../refinedstorage/item/ItemWirelessGrid.java | 11 ++-- .../network/MessageGridSettingsUpdate.java | 10 ++-- ...essageWirelessFluidGridSettingsUpdate.java | 8 +-- .../refinedstorage/tile/grid/TileGrid.java | 11 ++-- .../tile/grid/portable/TilePortableGrid.java | 8 +-- 18 files changed, 145 insertions(+), 147 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java index 8c919204c..f3f1e1eb9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/IGrid.java @@ -17,6 +17,27 @@ import java.util.List; * Represents a grid. */ public interface IGrid { + int SORTING_DIRECTION_ASCENDING = 0; + int SORTING_DIRECTION_DESCENDING = 1; + + int SORTING_TYPE_QUANTITY = 0; + int SORTING_TYPE_NAME = 1; + int SORTING_TYPE_ID = 2; + + int SEARCH_BOX_MODE_NORMAL = 0; + int SEARCH_BOX_MODE_NORMAL_AUTOSELECTED = 1; + int SEARCH_BOX_MODE_JEI_SYNCHRONIZED = 2; + int SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED = 3; + + int VIEW_TYPE_NORMAL = 0; + int VIEW_TYPE_NON_CRAFTABLES = 1; + int VIEW_TYPE_CRAFTABLES = 2; + + int SIZE_STRETCH = 0; + int SIZE_SMALL = 1; + int SIZE_MEDIUM = 2; + int SIZE_LARGE = 3; + /** * @return the grid type */ @@ -174,4 +195,36 @@ public interface IGrid { * @return true if the grid is active, false otherwise */ boolean isActive(); + + static boolean isValidViewType(int type) { + return type == VIEW_TYPE_NORMAL || + type == VIEW_TYPE_CRAFTABLES || + type == VIEW_TYPE_NON_CRAFTABLES; + } + + static boolean isValidSearchBoxMode(int mode) { + return mode == SEARCH_BOX_MODE_NORMAL || + mode == SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || + mode == SEARCH_BOX_MODE_JEI_SYNCHRONIZED || + mode == SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; + } + + static boolean isSearchBoxModeWithAutoselection(int mode) { + return mode == SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; + } + + static boolean isValidSortingType(int type) { + return type == SORTING_TYPE_QUANTITY || type == SORTING_TYPE_NAME || type == SORTING_TYPE_ID; + } + + static boolean isValidSortingDirection(int direction) { + return direction == SORTING_DIRECTION_ASCENDING || direction == SORTING_DIRECTION_DESCENDING; + } + + static boolean isValidSize(int size) { + return size == SIZE_STRETCH || + size == SIZE_SMALL || + size == SIZE_MEDIUM || + size == SIZE_LARGE; + } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java index 84f1d1bfc..349d225d5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java @@ -55,27 +55,6 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { public static final String NBT_PROCESSING_PATTERN = "ProcessingPattern"; public static final String NBT_BLOCKING_PATTERN = "BlockingPattern"; - public static final int SORTING_DIRECTION_ASCENDING = 0; - public static final int SORTING_DIRECTION_DESCENDING = 1; - - public static final int SORTING_TYPE_QUANTITY = 0; - public static final int SORTING_TYPE_NAME = 1; - public static final int SORTING_TYPE_ID = 2; - - public static final int SEARCH_BOX_MODE_NORMAL = 0; - public static final int SEARCH_BOX_MODE_NORMAL_AUTOSELECTED = 1; - public static final int SEARCH_BOX_MODE_JEI_SYNCHRONIZED = 2; - public static final int SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED = 3; - - public static final int VIEW_TYPE_NORMAL = 0; - public static final int VIEW_TYPE_NON_CRAFTABLES = 1; - public static final int VIEW_TYPE_CRAFTABLES = 2; - - public static final int SIZE_STRETCH = 0; - public static final int SIZE_SMALL = 1; - public static final int SIZE_MEDIUM = 2; - public static final int SIZE_LARGE = 3; - private Container craftingContainer = new Container() { @Override public boolean canInteractWith(EntityPlayer player) { @@ -676,36 +655,4 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { return new CombinedInvWrapper(filter); } } - - public static boolean isValidViewType(int type) { - return type == VIEW_TYPE_NORMAL || - type == VIEW_TYPE_CRAFTABLES || - type == VIEW_TYPE_NON_CRAFTABLES; - } - - public static boolean isValidSearchBoxMode(int mode) { - return mode == SEARCH_BOX_MODE_NORMAL || - mode == SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || - mode == SEARCH_BOX_MODE_JEI_SYNCHRONIZED || - mode == SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; - } - - public static boolean isSearchBoxModeWithAutoselection(int mode) { - return mode == SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; - } - - public static boolean isValidSortingType(int type) { - return type == SORTING_TYPE_QUANTITY || type == SORTING_TYPE_NAME || type == SORTING_TYPE_ID; - } - - public static boolean isValidSortingDirection(int direction) { - return direction == SORTING_DIRECTION_ASCENDING || direction == SORTING_DIRECTION_DESCENDING; - } - - public static boolean isValidSize(int size) { - return size == SIZE_STRETCH || - size == SIZE_SMALL || - size == SIZE_MEDIUM || - size == SIZE_LARGE; - } } 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 2ca081a30..7d0d9b2ef 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -209,9 +209,9 @@ public class GuiGrid extends GuiBase implements IGridDisplay { stacks.sort(SORTING_NAME); - if (grid.getSortingType() == NetworkNodeGrid.SORTING_TYPE_QUANTITY) { + if (grid.getSortingType() == IGrid.SORTING_TYPE_QUANTITY) { stacks.sort(SORTING_QUANTITY); - } else if (grid.getSortingType() == NetworkNodeGrid.SORTING_TYPE_ID) { + } else if (grid.getSortingType() == IGrid.SORTING_TYPE_ID) { stacks.sort(SORTING_ID); } } @@ -291,15 +291,15 @@ public class GuiGrid extends GuiBase implements IGridDisplay { @Override public int getVisibleRows() { switch (grid.getSize()) { - case NetworkNodeGrid.SIZE_STRETCH: + case IGrid.SIZE_STRETCH: int screenSpaceAvailable = height - getHeader() - getFooter() - (hadTabs ? ContainerGrid.TAB_HEIGHT : 0); return Math.max(3, Math.min((screenSpaceAvailable / 18) - 3, RS.INSTANCE.config.maxRowsStretch)); - case NetworkNodeGrid.SIZE_SMALL: + case IGrid.SIZE_SMALL: return 3; - case NetworkNodeGrid.SIZE_MEDIUM: + case IGrid.SIZE_MEDIUM: return 5; - case NetworkNodeGrid.SIZE_LARGE: + case IGrid.SIZE_LARGE: return 8; default: return 3; @@ -628,12 +628,12 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } else { saveHistory(); - if (grid.getSearchBoxMode() == NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL || grid.getSearchBoxMode() == NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) { + if (grid.getSearchBoxMode() == IGrid.SEARCH_BOX_MODE_NORMAL || grid.getSearchBoxMode() == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) { searchField.setFocused(false); } } keyHandled = true; - } else if (keyCode == RSKeyBindings.FOCUS_SEARCH_BAR.getKeyCode() && (grid.getSearchBoxMode() == NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL || grid.getSearchBoxMode() == NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED)) { + } else if (keyCode == RSKeyBindings.FOCUS_SEARCH_BAR.getKeyCode() && (grid.getSearchBoxMode() == IGrid.SEARCH_BOX_MODE_NORMAL || grid.getSearchBoxMode() == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED)) { searchField.setFocused(!searchField.isFocused()); saveHistory(); @@ -684,15 +684,15 @@ public class GuiGrid extends GuiBase implements IGridDisplay { } private void updateJEI() { - if (IntegrationJEI.isLoaded() && (grid.getSearchBoxMode() == NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) { + if (IntegrationJEI.isLoaded() && (grid.getSearchBoxMode() == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) { RSJEIPlugin.INSTANCE.getRuntime().getIngredientFilter().setFilterText(searchField.getText()); } } public void updateSearchFieldFocus(int mode) { if (searchField != null) { - searchField.setCanLoseFocus(!NetworkNodeGrid.isSearchBoxModeWithAutoselection(mode)); - searchField.setFocused(NetworkNodeGrid.isSearchBoxModeWithAutoselection(mode)); + searchField.setCanLoseFocus(!IGrid.isSearchBoxModeWithAutoselection(mode)); + searchField.setFocused(IGrid.isSearchBoxModeWithAutoselection(mode)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterParser.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterParser.java index 9d0d81997..a8b9699e1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterParser.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterParser.java @@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.gui.grid.filtering; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; import java.util.LinkedList; @@ -25,9 +24,9 @@ public final class GridFilterParser { } } - if (grid.getViewType() == NetworkNodeGrid.VIEW_TYPE_NON_CRAFTABLES) { + if (grid.getViewType() == IGrid.VIEW_TYPE_NON_CRAFTABLES) { gridFilters.add(new GridFilterCraftable(false)); - } else if (grid.getViewType() == NetworkNodeGrid.VIEW_TYPE_CRAFTABLES) { + } else if (grid.getViewType() == IGrid.VIEW_TYPE_CRAFTABLES) { gridFilters.add(new GridFilterCraftable(true)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingID.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingID.java index b22cdb45f..52a902623 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingID.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingID.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.gui.grid.sorting; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; +import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,9 +16,9 @@ public class GridSortingID extends GridSorting { } if (x != y) { - if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_DESCENDING) { + if (sortingDirection == IGrid.SORTING_DIRECTION_DESCENDING) { return Integer.compare(x, y); - } else if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_ASCENDING) { + } else if (sortingDirection == IGrid.SORTING_DIRECTION_ASCENDING) { return Integer.compare(y, x); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingName.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingName.java index 8f2694cd1..e8bdf5014 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingName.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingName.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.gui.grid.sorting; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; +import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; public class GridSortingName extends GridSorting { @@ -9,9 +9,9 @@ public class GridSortingName extends GridSorting { String leftName = left.getName(); String rightName = right.getName(); - if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_ASCENDING) { + if (sortingDirection == IGrid.SORTING_DIRECTION_ASCENDING) { return leftName.compareTo(rightName); - } else if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_DESCENDING) { + } else if (sortingDirection == IGrid.SORTING_DIRECTION_DESCENDING) { return rightName.compareTo(leftName); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingQuantity.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingQuantity.java index da5e800d7..e40e5cbf8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingQuantity.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingQuantity.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.gui.grid.sorting; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; +import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack; public class GridSortingQuantity extends GridSorting { @@ -10,9 +10,9 @@ public class GridSortingQuantity extends GridSorting { int rightSize = right.getQuantity(); if (leftSize != rightSize) { - if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_ASCENDING) { + if (sortingDirection == IGrid.SORTING_DIRECTION_ASCENDING) { return (leftSize > rightSize) ? 1 : -1; - } else if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_DESCENDING) { + } else if (sortingDirection == IGrid.SORTING_DIRECTION_DESCENDING) { return (rightSize > leftSize) ? 1 : -1; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java index a917887d6..5b42837ad 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.gui.sidebutton; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; +import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid; import com.raoulvdberge.refinedstorage.integration.jei.IntegrationJEI; @@ -20,25 +20,25 @@ public class SideButtonGridSearchBoxMode extends SideButton { protected void drawButtonIcon(int x, int y) { int mode = ((GuiGrid) gui).getGrid().getSearchBoxMode(); - gui.drawTexture(x, y, mode == NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED ? 16 : 0, 96, 16, 16); + gui.drawTexture(x, y, mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED ? 16 : 0, 96, 16, 16); } @Override public void actionPerformed() { int mode = ((GuiGrid) gui).getGrid().getSearchBoxMode(); - if (mode == NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL) { - mode = NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED; - } else if (mode == NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED) { + if (mode == IGrid.SEARCH_BOX_MODE_NORMAL) { + mode = IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED; + } else if (mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED) { if (IntegrationJEI.isLoaded()) { - mode = NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED; + mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED; } else { - mode = NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL; + mode = IGrid.SEARCH_BOX_MODE_NORMAL; } - } else if (mode == NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) { - mode = NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; - } else if (mode == NetworkNodeGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED) { - mode = NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL; + } else if (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) { + mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; + } else if (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED) { + mode = IGrid.SEARCH_BOX_MODE_NORMAL; } ((GuiGrid) gui).getGrid().onSearchBoxModeChanged(mode); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java index 170147849..7b06a5cc3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSize.java @@ -1,7 +1,6 @@ package com.raoulvdberge.refinedstorage.gui.sidebutton; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; import net.minecraft.util.text.TextFormatting; @@ -25,13 +24,13 @@ public class SideButtonGridSize extends SideButton { int tx = 0; - if (size == NetworkNodeGrid.SIZE_STRETCH) { + if (size == IGrid.SIZE_STRETCH) { tx = 48; - } else if (size == NetworkNodeGrid.SIZE_SMALL) { + } else if (size == IGrid.SIZE_SMALL) { tx = 0; - } else if (size == NetworkNodeGrid.SIZE_MEDIUM) { + } else if (size == IGrid.SIZE_MEDIUM) { tx = 16; - } else if (size == NetworkNodeGrid.SIZE_LARGE) { + } else if (size == IGrid.SIZE_LARGE) { tx = 32; } @@ -42,14 +41,14 @@ public class SideButtonGridSize extends SideButton { public void actionPerformed() { int size = grid.getSize(); - if (size == NetworkNodeGrid.SIZE_STRETCH) { - size = NetworkNodeGrid.SIZE_SMALL; - } else if (size == NetworkNodeGrid.SIZE_SMALL) { - size = NetworkNodeGrid.SIZE_MEDIUM; - } else if (size == NetworkNodeGrid.SIZE_MEDIUM) { - size = NetworkNodeGrid.SIZE_LARGE; - } else if (size == NetworkNodeGrid.SIZE_LARGE) { - size = NetworkNodeGrid.SIZE_STRETCH; + if (size == IGrid.SIZE_STRETCH) { + size = IGrid.SIZE_SMALL; + } else if (size == IGrid.SIZE_SMALL) { + size = IGrid.SIZE_MEDIUM; + } else if (size == IGrid.SIZE_MEDIUM) { + size = IGrid.SIZE_LARGE; + } else if (size == IGrid.SIZE_LARGE) { + size = IGrid.SIZE_STRETCH; } grid.onSizeChanged(size); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java index 08ede7feb..cf114f774 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java @@ -1,7 +1,6 @@ package com.raoulvdberge.refinedstorage.gui.sidebutton; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; import net.minecraft.util.text.TextFormatting; @@ -28,10 +27,10 @@ public class SideButtonGridSortingDirection extends SideButton { public void actionPerformed() { int dir = grid.getSortingDirection(); - if (dir == NetworkNodeGrid.SORTING_DIRECTION_ASCENDING) { - dir = NetworkNodeGrid.SORTING_DIRECTION_DESCENDING; - } else if (dir == NetworkNodeGrid.SORTING_DIRECTION_DESCENDING) { - dir = NetworkNodeGrid.SORTING_DIRECTION_ASCENDING; + if (dir == IGrid.SORTING_DIRECTION_ASCENDING) { + dir = IGrid.SORTING_DIRECTION_DESCENDING; + } else if (dir == IGrid.SORTING_DIRECTION_DESCENDING) { + dir = IGrid.SORTING_DIRECTION_ASCENDING; } grid.onSortingDirectionChanged(dir); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java index e73ef5d4e..d12321a4d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.gui.sidebutton; import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; import net.minecraft.util.text.TextFormatting; @@ -29,16 +28,16 @@ public class SideButtonGridSortingType extends SideButton { public void actionPerformed() { int type = grid.getSortingType(); - if (type == NetworkNodeGrid.SORTING_TYPE_QUANTITY) { - type = NetworkNodeGrid.SORTING_TYPE_NAME; - } else if (type == NetworkNodeGrid.SORTING_TYPE_NAME) { + if (type == IGrid.SORTING_TYPE_QUANTITY) { + type = IGrid.SORTING_TYPE_NAME; + } else if (type == IGrid.SORTING_TYPE_NAME) { if (grid.getType() == GridType.FLUID) { - type = NetworkNodeGrid.SORTING_TYPE_QUANTITY; + type = IGrid.SORTING_TYPE_QUANTITY; } else { - type = NetworkNodeGrid.SORTING_TYPE_ID; + type = IGrid.SORTING_TYPE_ID; } - } else if (type == NetworkNodeGrid.SORTING_TYPE_ID) { - type = NetworkNodeGrid.SORTING_TYPE_QUANTITY; + } else if (type == IGrid.SORTING_TYPE_ID) { + type = IGrid.SORTING_TYPE_QUANTITY; } grid.onSortingTypeChanged(type); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java index c68b85a87..f237d4fa8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridViewType.java @@ -1,7 +1,6 @@ package com.raoulvdberge.refinedstorage.gui.sidebutton; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; import net.minecraft.util.text.TextFormatting; @@ -28,12 +27,12 @@ public class SideButtonGridViewType extends SideButton { public void actionPerformed() { int type = grid.getViewType(); - if (type == NetworkNodeGrid.VIEW_TYPE_NORMAL) { - type = NetworkNodeGrid.VIEW_TYPE_NON_CRAFTABLES; - } else if (type == NetworkNodeGrid.VIEW_TYPE_NON_CRAFTABLES) { - type = NetworkNodeGrid.VIEW_TYPE_CRAFTABLES; - } else if (type == NetworkNodeGrid.VIEW_TYPE_CRAFTABLES) { - type = NetworkNodeGrid.VIEW_TYPE_NORMAL; + if (type == IGrid.VIEW_TYPE_NORMAL) { + type = IGrid.VIEW_TYPE_NON_CRAFTABLES; + } else if (type == IGrid.VIEW_TYPE_NON_CRAFTABLES) { + type = IGrid.VIEW_TYPE_CRAFTABLES; + } else if (type == IGrid.VIEW_TYPE_CRAFTABLES) { + type = IGrid.VIEW_TYPE_NORMAL; } grid.onViewTypeChanged(type); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java index 929317ad5..cc24a20c4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler; import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessFluidGrid; @@ -21,18 +22,18 @@ public class ItemWirelessFluidGrid extends ItemNetworkItem { } public static int getSortingType(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_TYPE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_TYPE) : NetworkNodeGrid.SORTING_TYPE_QUANTITY; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_TYPE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_TYPE) : IGrid.SORTING_TYPE_QUANTITY; } public static int getSortingDirection(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_DIRECTION)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_DIRECTION) : NetworkNodeGrid.SORTING_DIRECTION_DESCENDING; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_DIRECTION)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_DIRECTION) : IGrid.SORTING_DIRECTION_DESCENDING; } public static int getSearchBoxMode(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SEARCH_BOX_MODE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SEARCH_BOX_MODE) : NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SEARCH_BOX_MODE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SEARCH_BOX_MODE) : IGrid.SEARCH_BOX_MODE_NORMAL; } public static int getSize(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SIZE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SIZE) : NetworkNodeGrid.SIZE_STRETCH; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SIZE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SIZE) : IGrid.SIZE_STRETCH; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java index 1baa040ab..628f02c94 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem; import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler; import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessGrid; @@ -25,19 +26,19 @@ public class ItemWirelessGrid extends ItemNetworkItem { } public static int getViewType(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_VIEW_TYPE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_VIEW_TYPE) : NetworkNodeGrid.VIEW_TYPE_NORMAL; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_VIEW_TYPE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_VIEW_TYPE) : IGrid.VIEW_TYPE_NORMAL; } public static int getSortingType(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_TYPE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_TYPE) : NetworkNodeGrid.SORTING_TYPE_QUANTITY; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_TYPE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_TYPE) : IGrid.SORTING_TYPE_QUANTITY; } public static int getSortingDirection(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_DIRECTION)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_DIRECTION) : NetworkNodeGrid.SORTING_DIRECTION_DESCENDING; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SORTING_DIRECTION)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SORTING_DIRECTION) : IGrid.SORTING_DIRECTION_DESCENDING; } public static int getSearchBoxMode(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SEARCH_BOX_MODE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SEARCH_BOX_MODE) : NetworkNodeGrid.SEARCH_BOX_MODE_NORMAL; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SEARCH_BOX_MODE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SEARCH_BOX_MODE) : IGrid.SEARCH_BOX_MODE_NORMAL; } public static int getTabSelected(ItemStack stack) { @@ -45,6 +46,6 @@ public class ItemWirelessGrid extends ItemNetworkItem { } public static int getSize(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SIZE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SIZE) : NetworkNodeGrid.SIZE_STRETCH; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SIZE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SIZE) : IGrid.SIZE_STRETCH; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java index 1776af485..75ade24ac 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java @@ -63,23 +63,23 @@ public class MessageGridSettingsUpdate extends MessageHandlerPlayerToServer { public static final TileDataParameter VIEW_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getViewType(), (t, v) -> { - if (NetworkNodeGrid.isValidViewType(v)) { + if (IGrid.isValidViewType(v)) { t.getNode().setViewType(v); t.getNode().markDirty(); } }, p -> GuiGrid.markForSorting()); public static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSortingDirection(), (t, v) -> { - if (NetworkNodeGrid.isValidSortingDirection(v)) { + if (IGrid.isValidSortingDirection(v)) { t.getNode().setSortingDirection(v); t.getNode().markDirty(); } }, p -> GuiGrid.markForSorting()); public static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSortingType(), (t, v) -> { - if (NetworkNodeGrid.isValidSortingType(v)) { + if (IGrid.isValidSortingType(v)) { t.getNode().setSortingType(v); t.getNode().markDirty(); } }, p -> GuiGrid.markForSorting()); public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { - if (NetworkNodeGrid.isValidSearchBoxMode(v)) { + if (IGrid.isValidSearchBoxMode(v)) { t.getNode().setSearchBoxMode(v); t.getNode().markDirty(); } @@ -47,7 +48,7 @@ public class TileGrid extends TileNode { } }); public static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSize(), (t, v) -> { - if (NetworkNodeGrid.isValidSize(v)) { + if (IGrid.isValidSize(v)) { t.getNode().setSize(v); t.getNode().markDirty(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java index 69ae23545..5ad95f5d0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java @@ -57,19 +57,19 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); public static final TileDataParameter ENERGY_STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.energyStorage.getEnergyStored()); public static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSortingDirection, (t, v) -> { - if (NetworkNodeGrid.isValidSortingDirection(v)) { + if (IGrid.isValidSortingDirection(v)) { t.setSortingDirection(v); t.markDirty(); } }, p -> GuiGrid.markForSorting()); public static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSortingType, (t, v) -> { - if (NetworkNodeGrid.isValidSortingType(v)) { + if (IGrid.isValidSortingType(v)) { t.setSortingType(v); t.markDirty(); } }, p -> GuiGrid.markForSorting()); public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSearchBoxMode, (t, v) -> { - if (NetworkNodeGrid.isValidSearchBoxMode(v)) { + if (IGrid.isValidSearchBoxMode(v)) { t.setSearchBoxMode(v); t.markDirty(); } @@ -79,7 +79,7 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, } }); public static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSize, (t, v) -> { - if (NetworkNodeGrid.isValidSize(v)) { + if (IGrid.isValidSize(v)) { t.setSize(v); t.markDirty(); }