diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java index 50a8f56c6..50bca551c 100755 --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -7,20 +7,16 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileConstructor; public class GuiConstructor extends GuiBase { - private TileConstructor constructor; - - public GuiConstructor(ContainerConstructor container, TileConstructor constructor) { + public GuiConstructor(ContainerConstructor container) { super(container, 211, 137); - - this.constructor = constructor; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(constructor)); + addSideButton(new SideButtonRedstoneMode(TileConstructor.REDSTONE_MODE)); - addSideButton(new SideButtonCompare(constructor, CompareUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(constructor, CompareUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(TileConstructor.COMPARE, CompareUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(TileConstructor.COMPARE, CompareUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index d28338ece..da24e5feb 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -3,7 +3,6 @@ package refinedstorage.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import refinedstorage.container.ContainerController; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileController; import java.util.List; @@ -28,7 +27,7 @@ public class GuiController extends GuiBase { @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(controller)); + //addSideButton(new SideButtonRedstoneMode(controller)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java index e26b43c06..7f578ebb3 100755 --- a/src/main/java/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/refinedstorage/gui/GuiCrafter.java @@ -5,17 +5,13 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileCrafter; public class GuiCrafter extends GuiBase { - private TileCrafter crafter; - - public GuiCrafter(ContainerCrafter container, TileCrafter crafter) { + public GuiCrafter(ContainerCrafter container) { super(container, 211, 137); - - this.crafter = crafter; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(crafter)); + addSideButton(new SideButtonRedstoneMode(TileCrafter.REDSTONE_MODE)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index 3123c60f1..e17c49717 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -41,7 +41,7 @@ public class GuiCraftingMonitor extends GuiBase { @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(craftingMonitor)); + addSideButton(new SideButtonRedstoneMode(TileCraftingMonitor.REDSTONE_MODE)); String cancel = t("gui.cancel"); String cancelAll = t("misc.refinedstorage:cancel_all"); diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java index d755c27d2..24b62adaa 100755 --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -8,22 +8,18 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileDestructor; public class GuiDestructor extends GuiBase { - private TileDestructor destructor; - - public GuiDestructor(ContainerDestructor container, TileDestructor destructor) { + public GuiDestructor(ContainerDestructor container) { super(container, 211, 137); - - this.destructor = destructor; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(destructor)); + addSideButton(new SideButtonRedstoneMode(TileDestructor.REDSTONE_MODE)); - addSideButton(new SideButtonMode(destructor)); + addSideButton(new SideButtonMode(TileDestructor.MODE)); - addSideButton(new SideButtonCompare(destructor, CompareUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(destructor, CompareUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(TileDestructor.COMPARE, CompareUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(TileDestructor.COMPARE, CompareUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java index 4d6cc757e..71213c481 100755 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -6,28 +6,25 @@ import refinedstorage.api.storage.CompareUtils; import refinedstorage.container.ContainerDetector; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonDetectorMode; +import refinedstorage.tile.TileDestructor; import refinedstorage.tile.TileDetector; import refinedstorage.tile.data.TileDataManager; import java.io.IOException; public class GuiDetector extends GuiBase { - private TileDetector detector; - private GuiTextField amountField; - public GuiDetector(ContainerDetector container, TileDetector detector) { + public GuiDetector(ContainerDetector container) { super(container, 176, 137); - - this.detector = detector; } @Override public void init(int x, int y) { - addSideButton(new SideButtonCompare(detector, CompareUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(detector, CompareUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(TileDestructor.COMPARE, CompareUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(TileDestructor.COMPARE, CompareUtils.COMPARE_NBT)); - addSideButton(new SideButtonDetectorMode(detector)); + addSideButton(new SideButtonDetectorMode()); amountField = new GuiTextField(0, fontRendererObj, x + 62 + 1, y + 23 + 1, 25, fontRendererObj.FONT_HEIGHT); // @TODO: Change when the packet is received instead diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java index 30854d39d..387f8b612 100755 --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -7,20 +7,16 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileExporter; public class GuiExporter extends GuiBase { - private TileExporter exporter; - - public GuiExporter(ContainerExporter container, TileExporter exporter) { + public GuiExporter(ContainerExporter container) { super(container, 211, 137); - - this.exporter = exporter; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(exporter)); + addSideButton(new SideButtonRedstoneMode(TileExporter.REDSTONE_MODE)); - addSideButton(new SideButtonCompare(exporter, CompareUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(exporter, CompareUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(TileExporter.COMPARE, CompareUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(TileExporter.COMPARE, CompareUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java index ac8f37c65..2745df7a4 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -93,35 +93,35 @@ public class GuiHandler implements IGuiHandler { case RefinedStorageGui.DISK_DRIVE: return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile, "gui/disk_drive.png"); case RefinedStorageGui.IMPORTER: - return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); + return new GuiImporter((ContainerImporter) getContainer(ID, player, tile)); case RefinedStorageGui.EXPORTER: - return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile); + return new GuiExporter((ContainerExporter) getContainer(ID, player, tile)); case RefinedStorageGui.DETECTOR: - return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); + return new GuiDetector((ContainerDetector) getContainer(ID, player, tile)); case RefinedStorageGui.SOLDERER: return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); case RefinedStorageGui.DESTRUCTOR: - return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); + return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile)); case RefinedStorageGui.CONSTRUCTOR: - return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile); + return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile)); case RefinedStorageGui.STORAGE: return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile); case RefinedStorageGui.RELAY: - return new GuiRelay((ContainerRelay) getContainer(ID, player, tile), (TileRelay) tile); + return new GuiRelay((ContainerRelay) getContainer(ID, player, tile)); case RefinedStorageGui.INTERFACE: - return new GuiInterface((ContainerInterface) getContainer(ID, player, tile), (TileInterface) tile); + return new GuiInterface((ContainerInterface) getContainer(ID, player, tile)); case RefinedStorageGui.CRAFTING_MONITOR: return new GuiCraftingMonitor((ContainerCraftingMonitor) getContainer(ID, player, tile), (TileCraftingMonitor) tile); case RefinedStorageGui.WIRELESS_TRANSMITTER: - return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile); + return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile)); case RefinedStorageGui.CRAFTER: - return new GuiCrafter((ContainerCrafter) getContainer(ID, player, tile), (TileCrafter) tile); + return new GuiCrafter((ContainerCrafter) getContainer(ID, player, tile)); case RefinedStorageGui.PROCESSING_PATTERN_ENCODER: return new GuiProcessingPatternEncoder((ContainerProcessingPatternEncoder) getContainer(ID, player, tile), (TileProcessingPatternEncoder) tile); case RefinedStorageGui.GRID_FILTER: return new GuiGridFilter(getGridFilterContainer(player, x)); case RefinedStorageGui.NETWORK_TRANSMITTER: - return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile); + return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile)); default: return null; } diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java index 688a25d35..384cbec40 100755 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -8,22 +8,18 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileImporter; public class GuiImporter extends GuiBase { - private TileImporter importer; - - public GuiImporter(ContainerImporter container, TileImporter importer) { + public GuiImporter(ContainerImporter container) { super(container, 211, 137); - - this.importer = importer; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(importer)); + addSideButton(new SideButtonRedstoneMode(TileImporter.REDSTONE_MODE)); - addSideButton(new SideButtonMode(importer)); + addSideButton(new SideButtonMode(TileImporter.MODE)); - addSideButton(new SideButtonCompare(importer, CompareUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(importer, CompareUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(TileImporter.COMPARE, CompareUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(TileImporter.COMPARE, CompareUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java index 7df115559..627456013 100755 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -7,20 +7,16 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileInterface; public class GuiInterface extends GuiBase { - private TileInterface tile; - - public GuiInterface(ContainerInterface container, TileInterface tile) { + public GuiInterface(ContainerInterface container) { super(container, 211, 217); - - this.tile = tile; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(tile)); + addSideButton(new SideButtonRedstoneMode(TileInterface.REDSTONE_MODE)); - addSideButton(new SideButtonCompare(tile, CompareUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(tile, CompareUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(TileInterface.COMPARE, CompareUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(TileInterface.COMPARE, CompareUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java b/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java index 0c4018ba2..ab204ebee 100755 --- a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java @@ -5,17 +5,13 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileNetworkTransmitter; public class GuiNetworkTransmitter extends GuiBase { - private TileNetworkTransmitter networkTransmitter; - - public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter) { + public GuiNetworkTransmitter(ContainerNetworkTransmitter container) { super(container, 210, 137); - - this.networkTransmitter = networkTransmitter; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(networkTransmitter)); + addSideButton(new SideButtonRedstoneMode(TileNetworkTransmitter.REDSTONE_MODE)); } @Override @@ -33,17 +29,19 @@ public class GuiNetworkTransmitter extends GuiBase { public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:network_transmitter")); - String distance; + String distance = t("gui.refinedstorage:network_transmitter.missing_card"); + // @TODO: ... + /* if (networkTransmitter.getNetworkCard().getStackInSlot(0) == null) { distance = t("gui.refinedstorage:network_transmitter.missing_card"); } else if (!TileNetworkTransmitter.RECEIVER_DIMENSION_SUPPORTED.getValue()) { distance = t("gui.refinedstorage:network_transmitter.missing_upgrade"); - } else if (!networkTransmitter.isSameDimension()) { // @TODO: Wtf? + } else if (!networkTransmitter.isSameDimension()) { distance = t("gui.refinedstorage:network_transmitter.dimension", networkTransmitter.getReceiverDimension()); } else { distance = t("gui.refinedstorage:network_transmitter.distance", networkTransmitter.getDistance()); - } + }*/ drawString(51, 24, distance); drawString(7, 42, t("container.inventory")); diff --git a/src/main/java/refinedstorage/gui/GuiRelay.java b/src/main/java/refinedstorage/gui/GuiRelay.java index b50810d9b..604d4f506 100755 --- a/src/main/java/refinedstorage/gui/GuiRelay.java +++ b/src/main/java/refinedstorage/gui/GuiRelay.java @@ -5,17 +5,13 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileRelay; public class GuiRelay extends GuiBase { - private TileRelay relay; - - public GuiRelay(ContainerRelay container, TileRelay relay) { + public GuiRelay(ContainerRelay container) { super(container, 176, 131); - - this.relay = relay; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(relay)); + addSideButton(new SideButtonRedstoneMode(TileRelay.REDSTONE_MODE)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index 76c991ab8..1dfe957f2 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -15,7 +15,7 @@ public class GuiSolderer extends GuiBase { @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(solderer)); + addSideButton(new SideButtonRedstoneMode(TileSolderer.REDSTONE_MODE)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java index b388b9d96..2b2dab4f7 100755 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -5,17 +5,13 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileWirelessTransmitter; public class GuiWirelessTransmitter extends GuiBase { - private TileWirelessTransmitter wirelessTransmitter; - - public GuiWirelessTransmitter(ContainerWirelessTransmitter container, TileWirelessTransmitter wirelessTransmitter) { + public GuiWirelessTransmitter(ContainerWirelessTransmitter container) { super(container, 211, 137); - - this.wirelessTransmitter = wirelessTransmitter; } @Override public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(wirelessTransmitter)); + addSideButton(new SideButtonRedstoneMode(TileWirelessTransmitter.REDSTONE_MODE)); } @Override diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java index 752672626..aad6ddfda 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -3,14 +3,15 @@ package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; import refinedstorage.api.storage.CompareUtils; import refinedstorage.gui.GuiBase; -import refinedstorage.tile.config.ICompareConfig; +import refinedstorage.tile.data.TileDataManager; +import refinedstorage.tile.data.TileDataParameter; public class SideButtonCompare extends SideButton { - private ICompareConfig config; + private TileDataParameter parameter; private int mask; - public SideButtonCompare(ICompareConfig config, int mask) { - this.config = config; + public SideButtonCompare(TileDataParameter parameter, int mask) { + this.parameter = parameter; this.mask = mask; } @@ -18,7 +19,7 @@ public class SideButtonCompare extends SideButton { public String getTooltip(GuiBase gui) { String tooltip = TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:compare." + mask) + TextFormatting.RESET + "\n"; - if ((config.getCompare() & mask) == mask) { + if ((parameter.getValue() & mask) == mask) { tooltip += gui.t("gui.yes"); } else { tooltip += gui.t("gui.no"); @@ -39,13 +40,13 @@ public class SideButtonCompare extends SideButton { ty = 48; } - int tx = (config.getCompare() & mask) == mask ? 0 : 16; + int tx = (parameter.getValue() & mask) == mask ? 0 : 16; gui.drawTexture(x, y + 1, tx, ty, 16, 16); } @Override public void actionPerformed() { - config.setCompare(config.getCompare() ^ mask); + TileDataManager.setParameter(parameter, parameter.getValue() ^ mask); } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java index e82538d04..da46be00c 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -7,12 +7,6 @@ import refinedstorage.gui.GuiBase; import refinedstorage.tile.TileDetector; public class SideButtonDetectorMode extends SideButton { - private TileDetector detector; - - public SideButtonDetectorMode(TileDetector detector) { - this.detector = detector; - } - @Override public String getTooltip(GuiBase gui) { return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:detector.mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:detector.mode." + TileDetector.MODE.getValue()); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java index 6c11cf840..368a55646 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -3,36 +3,30 @@ package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; import refinedstorage.gui.GuiBase; import refinedstorage.tile.config.IModeConfig; +import refinedstorage.tile.data.TileDataManager; +import refinedstorage.tile.data.TileDataParameter; public class SideButtonMode extends SideButton { - private IModeConfig config; + private TileDataParameter parameter; - public SideButtonMode(IModeConfig config) { - this.config = config; + public SideButtonMode(TileDataParameter parameter) { + this.parameter = parameter; } @Override public String getTooltip(GuiBase gui) { - return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:mode." + (config.getMode() == IModeConfig.WHITELIST ? "whitelist" : "blacklist")); + return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:mode." + (parameter.getValue() == IModeConfig.WHITELIST ? "whitelist" : "blacklist")); } @Override public void draw(GuiBase gui, int x, int y) { gui.bindTexture("icons.png"); - int tx = 0; - - if (config.getMode() == IModeConfig.WHITELIST) { - tx = 0; - } else if (config.getMode() == IModeConfig.BLACKLIST) { - tx = 16; - } - - gui.drawTexture(x, y + 1, tx, 64, 16, 16); + gui.drawTexture(x, y + 1, parameter.getValue() == IModeConfig.WHITELIST ? 0 : 16, 64, 16, 16); } @Override public void actionPerformed() { - config.setMode(config.getMode() == IModeConfig.WHITELIST ? IModeConfig.BLACKLIST : IModeConfig.WHITELIST); + TileDataManager.setParameter(parameter, parameter.getValue() == IModeConfig.WHITELIST ? IModeConfig.BLACKLIST : IModeConfig.WHITELIST); } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java index 5f04fb8d9..a891bf62a 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -2,28 +2,30 @@ package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; import refinedstorage.gui.GuiBase; -import refinedstorage.tile.config.IRedstoneModeConfig; +import refinedstorage.tile.config.RedstoneMode; +import refinedstorage.tile.data.TileDataManager; +import refinedstorage.tile.data.TileDataParameter; public class SideButtonRedstoneMode extends SideButton { - private IRedstoneModeConfig config; + private TileDataParameter parameter; - public SideButtonRedstoneMode(IRedstoneModeConfig config) { - this.config = config; + public SideButtonRedstoneMode(TileDataParameter parameter) { + this.parameter = parameter; } @Override public String getTooltip(GuiBase gui) { - return TextFormatting.RED + gui.t("sidebutton.refinedstorage:redstone_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:redstone_mode." + config.getRedstoneMode().id); + return TextFormatting.RED + gui.t("sidebutton.refinedstorage:redstone_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:redstone_mode." + parameter.getValue()); } @Override public void draw(GuiBase gui, int x, int y) { gui.bindTexture("icons.png"); - gui.drawTexture(x, y + 1, config.getRedstoneMode().id * 16, 0, 16, 16); + gui.drawTexture(x, y + 1, parameter.getValue() * 16, 0, 16, 16); } @Override public void actionPerformed() { - config.setRedstoneMode(config.getRedstoneMode().next()); + TileDataManager.setParameter(parameter, RedstoneMode.getById(parameter.getValue()).next().id); } } diff --git a/src/main/java/refinedstorage/tile/IStorageGui.java b/src/main/java/refinedstorage/tile/IStorageGui.java index 257b802f0..7b512f985 100755 --- a/src/main/java/refinedstorage/tile/IStorageGui.java +++ b/src/main/java/refinedstorage/tile/IStorageGui.java @@ -1,9 +1,7 @@ package refinedstorage.tile; import net.minecraftforge.items.IItemHandler; -import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.tile.config.IModeConfig; -import refinedstorage.tile.config.IRedstoneModeConfig; +import refinedstorage.tile.data.TileDataParameter; public interface IStorageGui { String getGuiTitle(); @@ -14,11 +12,11 @@ public interface IStorageGui { IItemHandler getFilters(); - IRedstoneModeConfig getRedstoneModeConfig(); + TileDataParameter getRedstoneModeConfig(); - ICompareConfig getCompareConfig(); + TileDataParameter getCompareConfig(); - IModeConfig getModeConfig(); + TileDataParameter getModeConfig(); int getStored(); diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index e2f6c126a..044d38f1d 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -17,7 +17,6 @@ import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemHandlerUpgrade; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileConstructor extends TileNode implements ICompareConfig { @@ -84,13 +83,9 @@ public class TileConstructor extends TileNode implements ICompareConfig { @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index e3ca31f5e..af7492654 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -17,7 +17,6 @@ import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.ModeFilter; -import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; import java.util.List; @@ -56,7 +55,7 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon ItemStack frontStack = frontBlockState.getBlock().getItem(worldObj, front, frontBlockState); if (frontStack != null) { - if (ModeFilter.respectsMode(filters, this, compare, frontStack)) { + if (ModeFilter.respectsMode(filters, mode, compare, frontStack)) { List drops = frontBlockState.getBlock().getDrops(worldObj, front, frontBlockState, 0); worldObj.playEvent(null, 2001, front, Block.getStateId(frontBlockState)); @@ -87,13 +86,9 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override @@ -103,13 +98,9 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon @Override public void setMode(int mode) { - if (worldObj.isRemote) { - TileDataManager.setParameter(MODE, mode); - } else { - this.mode = mode; + this.mode = mode; - markDirty(); - } + markDirty(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index 063072889..7c71e11f5 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -147,13 +147,9 @@ public class TileDetector extends TileNode implements ICompareConfig { @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index ba03be060..96a1e4a70 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -18,7 +18,10 @@ import refinedstorage.apiimpl.storage.NBTStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemValidatorBasic; -import refinedstorage.tile.config.*; +import refinedstorage.tile.config.ICompareConfig; +import refinedstorage.tile.config.IModeConfig; +import refinedstorage.tile.config.IPrioritizable; +import refinedstorage.tile.config.ModeFilter; import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; @@ -41,7 +44,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag @Override public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { - if (!ModeFilter.respectsMode(getFilters(), getModeConfig(), getCompare(), stack)) { + if (!ModeFilter.respectsMode(getFilters(), mode, getCompare(), stack)) { return ItemHandlerHelper.copyStackWithSize(stack, size); } @@ -224,13 +227,9 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override @@ -240,13 +239,9 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag @Override public void setMode(int mode) { - if (worldObj.isRemote) { - TileDataManager.setParameter(MODE, mode); - } else { - this.mode = mode; + this.mode = mode; - markDirty(); - } + markDirty(); } public int getStoredForDisplayServer() { @@ -290,18 +285,18 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag } @Override - public IRedstoneModeConfig getRedstoneModeConfig() { - return this; + public TileDataParameter getRedstoneModeConfig() { + return REDSTONE_MODE; } @Override - public ICompareConfig getCompareConfig() { - return this; + public TileDataParameter getCompareConfig() { + return COMPARE; } @Override - public IModeConfig getModeConfig() { - return this; + public TileDataParameter getModeConfig() { + return MODE; } @Override diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index e259aca3d..5421d2e5a 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -13,7 +13,6 @@ import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemHandlerUpgrade; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileExporter extends TileNode implements ICompareConfig { @@ -75,13 +74,9 @@ public class TileExporter extends TileNode implements ICompareConfig { @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index e98b2a80d..055e48d84 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -13,7 +13,6 @@ import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.ModeFilter; -import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileImporter extends TileNode implements ICompareConfig, IModeConfig { @@ -56,7 +55,7 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi if (handler.getSlots() > 0) { ItemStack stack = handler.getStackInSlot(currentSlot); - if (stack == null || !ModeFilter.respectsMode(filters, this, compare, stack)) { + if (stack == null || !ModeFilter.respectsMode(filters, mode, compare, stack)) { currentSlot++; } else if (ticks % upgrades.getSpeed() == 0) { int quantity = upgrades.hasUpgrade(ItemUpgrade.TYPE_STACK) ? 64 : 1; @@ -81,13 +80,9 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override @@ -97,13 +92,9 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi @Override public void setMode(int mode) { - if (worldObj.isRemote) { - TileDataManager.setParameter(MODE, mode); - } else { - this.mode = mode; + this.mode = mode; - markDirty(); - } + markDirty(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index bad2b55fb..5783604fc 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -12,7 +12,6 @@ import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemHandlerUpgrade; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileInterface extends TileNode implements ICompareConfig { @@ -101,13 +100,9 @@ public class TileInterface extends TileNode implements ICompareConfig { @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 1db96775d..603afab0a 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -14,7 +14,10 @@ import refinedstorage.apiimpl.storage.NBTStorage; import refinedstorage.block.BlockStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.tile.config.*; +import refinedstorage.tile.config.ICompareConfig; +import refinedstorage.tile.config.IModeConfig; +import refinedstorage.tile.config.IPrioritizable; +import refinedstorage.tile.config.ModeFilter; import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; @@ -44,7 +47,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG @Override public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { - if (!ModeFilter.respectsMode(filters, TileStorage.this, compare, stack)) { + if (!ModeFilter.respectsMode(filters, mode, compare, stack)) { return ItemHandlerHelper.copyStackWithSize(stack, size); } @@ -176,13 +179,9 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG @Override public void setCompare(int compare) { - if (worldObj.isRemote) { - TileDataManager.setParameter(COMPARE, compare); - } else { - this.compare = compare; + this.compare = compare; - markDirty(); - } + markDirty(); } @Override @@ -192,13 +191,9 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG @Override public void setMode(int mode) { - if (worldObj.isRemote) { - TileDataManager.setParameter(MODE, mode); - } else { - this.mode = mode; + this.mode = mode; - markDirty(); - } + markDirty(); } @Override @@ -212,18 +207,18 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG } @Override - public IRedstoneModeConfig getRedstoneModeConfig() { - return this; + public TileDataParameter getRedstoneModeConfig() { + return REDSTONE_MODE; } @Override - public ICompareConfig getCompareConfig() { - return this; + public TileDataParameter getCompareConfig() { + return COMPARE; } @Override - public IModeConfig getModeConfig() { - return this; + public TileDataParameter getModeConfig() { + return MODE; } public NBTTagCompound getStorageTag() { diff --git a/src/main/java/refinedstorage/tile/config/ModeFilter.java b/src/main/java/refinedstorage/tile/config/ModeFilter.java index 0b67892c4..7fa90f9a5 100755 --- a/src/main/java/refinedstorage/tile/config/ModeFilter.java +++ b/src/main/java/refinedstorage/tile/config/ModeFilter.java @@ -4,9 +4,10 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import refinedstorage.api.storage.CompareUtils; +// @TODO: Move into IModeConfig public final class ModeFilter { - public static boolean respectsMode(IItemHandler filters, IModeConfig mode, int compare, ItemStack stack) { - if (mode.getMode() == IModeConfig.WHITELIST) { + public static boolean respectsMode(IItemHandler filters, int mode, int compare, ItemStack stack) { + if (mode == IModeConfig.WHITELIST) { int slots = 0; for (int i = 0; i < filters.getSlots(); ++i) { @@ -22,7 +23,7 @@ public final class ModeFilter { } return slots == 0; - } else if (mode.getMode() == IModeConfig.BLACKLIST) { + } else if (mode == IModeConfig.BLACKLIST) { for (int i = 0; i < filters.getSlots(); ++i) { ItemStack slot = filters.getStackInSlot(i); diff --git a/src/main/java/refinedstorage/tile/config/RedstoneMode.java b/src/main/java/refinedstorage/tile/config/RedstoneMode.java index a0f1bbcc2..7586df4f0 100755 --- a/src/main/java/refinedstorage/tile/config/RedstoneMode.java +++ b/src/main/java/refinedstorage/tile/config/RedstoneMode.java @@ -39,6 +39,7 @@ public enum RedstoneMode { return false; } + // @TOOD: Remove id field public static RedstoneMode getById(int id) { for (RedstoneMode control : values()) { if (control.id == id) { diff --git a/src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java b/src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java index 24f1159b7..d95498851 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java @@ -35,7 +35,7 @@ public class DeepStorageUnitStorage extends ExternalStorage { @Override public ItemStack insertItem(@Nonnull ItemStack stack, int size, boolean simulate) { - if (ModeFilter.respectsMode(externalStorage.getFilters(), externalStorage, externalStorage.getCompare(), stack)) { + if (ModeFilter.respectsMode(externalStorage.getFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack)) { if (unit.getStoredItemType() != null) { if (CompareUtils.compareStackNoQuantity(unit.getStoredItemType(), stack)) { if (getStored() + size > unit.getMaxStoredCount()) { diff --git a/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java b/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java index 4b398d4d7..4649b2442 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java @@ -39,7 +39,7 @@ public class DrawerStorage extends ExternalStorage { @Override public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { - if (ModeFilter.respectsMode(externalStorage.getFilters(), externalStorage, externalStorage.getCompare(), stack) && drawer.canItemBeStored(stack)) { + if (ModeFilter.respectsMode(externalStorage.getFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack) && drawer.canItemBeStored(stack)) { if (!drawer.isEmpty()) { if (getStored() + size > drawer.getMaxCapacity(stack)) { int remainingSpace = getCapacity() - getStored(); diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java b/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java index 716ae16f7..5ad983092 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java @@ -38,7 +38,7 @@ public class ItemHandlerStorage extends ExternalStorage { @Override public ItemStack insertItem(ItemStack stack, int size, boolean simulate) { - if (ModeFilter.respectsMode(externalStorage.getFilters(), externalStorage, externalStorage.getCompare(), stack)) { + if (ModeFilter.respectsMode(externalStorage.getFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack)) { return ItemHandlerHelper.insertItem(handler, ItemHandlerHelper.copyStackWithSize(stack, size), simulate); } diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index a76ed21b4..bebd2d650 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -17,7 +17,6 @@ import refinedstorage.tile.TileNode; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.IPrioritizable; -import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; @@ -222,18 +221,18 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I } @Override - public IRedstoneModeConfig getRedstoneModeConfig() { - return this; + public TileDataParameter getRedstoneModeConfig() { + return REDSTONE_MODE; } @Override - public ICompareConfig getCompareConfig() { - return this; + public TileDataParameter getCompareConfig() { + return COMPARE; } @Override - public IModeConfig getModeConfig() { - return this; + public TileDataParameter getModeConfig() { + return MODE; } @Override diff --git a/src/main/java/refinedstorage/tile/grid/IGrid.java b/src/main/java/refinedstorage/tile/grid/IGrid.java index 8f16c09e7..a730b8f34 100755 --- a/src/main/java/refinedstorage/tile/grid/IGrid.java +++ b/src/main/java/refinedstorage/tile/grid/IGrid.java @@ -5,7 +5,7 @@ import refinedstorage.api.network.IGridHandler; import refinedstorage.block.EnumGridType; import refinedstorage.gui.grid.GridFilteredItem; import refinedstorage.inventory.ItemHandlerBasic; -import refinedstorage.tile.config.IRedstoneModeConfig; +import refinedstorage.tile.data.TileDataParameter; import java.util.List; @@ -36,7 +36,7 @@ public interface IGrid { ItemHandlerBasic getFilter(); - IRedstoneModeConfig getRedstoneModeConfig(); + TileDataParameter getRedstoneModeConfig(); boolean isConnected(); } diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 66be251ba..93cc1e1bc 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -26,7 +26,6 @@ import refinedstorage.inventory.ItemHandlerGridFilterInGrid; import refinedstorage.inventory.ItemValidatorBasic; import refinedstorage.item.ItemPattern; import refinedstorage.tile.TileNode; -import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.data.ITileDataConsumer; import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.TileDataManager; @@ -392,8 +391,8 @@ public class TileGrid extends TileNode implements IGrid { } @Override - public IRedstoneModeConfig getRedstoneModeConfig() { - return this; + public TileDataParameter getRedstoneModeConfig() { + return REDSTONE_MODE; } @Override diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 988c02c94..82d33441e 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -16,7 +16,7 @@ import refinedstorage.item.ItemWirelessGrid; import refinedstorage.network.MessageWirelessGridSettingsUpdate; import refinedstorage.tile.TileBase; import refinedstorage.tile.TileController; -import refinedstorage.tile.config.IRedstoneModeConfig; +import refinedstorage.tile.data.TileDataParameter; import java.util.ArrayList; import java.util.List; @@ -148,7 +148,7 @@ public class WirelessGrid implements IGrid { } @Override - public IRedstoneModeConfig getRedstoneModeConfig() { + public TileDataParameter getRedstoneModeConfig() { return null; }