From 9b9b127a86c5be487e5a1e042283b3e928c7b7a7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 22 Mar 2016 17:58:23 +0100 Subject: [PATCH] Dump unneeded IPriorityHandler. --- src/main/java/refinedstorage/gui/GuiStorage.java | 6 +++--- .../java/refinedstorage/storage/CellStorage.java | 2 +- .../java/refinedstorage/storage/IStorageGui.java | 11 +++-------- src/main/java/refinedstorage/tile/TileDrive.java | 13 +++---------- .../refinedstorage/tile/TileExternalStorage.java | 13 +++---------- src/main/java/refinedstorage/tile/TileStorage.java | 13 +++---------- 6 files changed, 16 insertions(+), 42 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java index b4b7016a3..4ff9e2a27 100644 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -43,9 +43,9 @@ public class GuiStorage extends GuiBase addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeSetting())); } - if (gui.getWhitelistBlacklistSetting() != null) + if (gui.getModeSetting() != null) { - addSideButton(new SideButtonMode(gui.getWhitelistBlacklistSetting())); + addSideButton(new SideButtonMode(gui.getModeSetting())); } if (gui.getCompareSetting() != null) @@ -119,7 +119,7 @@ public class GuiStorage extends GuiBase if (result != null) { - gui.getPriorityHandler().onPriorityChanged(result); + gui.onPriorityChanged(result); } } else diff --git a/src/main/java/refinedstorage/storage/CellStorage.java b/src/main/java/refinedstorage/storage/CellStorage.java index 97ccb939e..6d8e2d67e 100644 --- a/src/main/java/refinedstorage/storage/CellStorage.java +++ b/src/main/java/refinedstorage/storage/CellStorage.java @@ -19,7 +19,7 @@ public class CellStorage extends NBTStorage @Override public boolean canPush(ItemStack stack) { - if (ModeSettingUtils.doesNotViolateMode(drive.getInventory(), drive.getWhitelistBlacklistSetting(), drive.getCompare(), stack)) + if (ModeSettingUtils.doesNotViolateMode(drive.getInventory(), drive.getModeSetting(), drive.getCompare(), stack)) { return super.canPush(stack); } diff --git a/src/main/java/refinedstorage/storage/IStorageGui.java b/src/main/java/refinedstorage/storage/IStorageGui.java index efe8590a1..dcc4ab86e 100644 --- a/src/main/java/refinedstorage/storage/IStorageGui.java +++ b/src/main/java/refinedstorage/storage/IStorageGui.java @@ -7,26 +7,21 @@ import refinedstorage.tile.settings.IRedstoneModeSetting; public interface IStorageGui { - public interface IPriorityHandler - { - public void onPriorityChanged(int priority); - } - public String getName(); public int getPriority(); + public void onPriorityChanged(int priority); + public IInventory getInventory(); public IRedstoneModeSetting getRedstoneModeSetting(); public ICompareSetting getCompareSetting(); - public IModeSetting getWhitelistBlacklistSetting(); + public IModeSetting getModeSetting(); public int getStored(); public int getCapacity(); - - public IPriorityHandler getPriorityHandler(); } diff --git a/src/main/java/refinedstorage/tile/TileDrive.java b/src/main/java/refinedstorage/tile/TileDrive.java index 967eecd9b..61d8921b8 100644 --- a/src/main/java/refinedstorage/tile/TileDrive.java +++ b/src/main/java/refinedstorage/tile/TileDrive.java @@ -190,22 +190,15 @@ public class TileDrive extends TileMachine implements IStorageProvider, IStorage } @Override - public IModeSetting getWhitelistBlacklistSetting() + public IModeSetting getModeSetting() { return this; } @Override - public IPriorityHandler getPriorityHandler() + public void onPriorityChanged(int priority) { - return new IPriorityHandler() - { - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } - }; + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); } @Override diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 7f167fe87..6f3e703bc 100644 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -280,7 +280,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider } @Override - public IModeSetting getWhitelistBlacklistSetting() + public IModeSetting getModeSetting() { return this; } @@ -303,16 +303,9 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider } @Override - public IPriorityHandler getPriorityHandler() + public void onPriorityChanged(int priority) { - return new IPriorityHandler() - { - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } - }; + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); } @Override diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index bac5bb605..356095c36 100644 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -231,22 +231,15 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora } @Override - public IModeSetting getWhitelistBlacklistSetting() + public IModeSetting getModeSetting() { return this; } @Override - public IPriorityHandler getPriorityHandler() + public void onPriorityChanged(int priority) { - return new IPriorityHandler() - { - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } - }; + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); } public NBTStorage getStorage()