diff --git a/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java b/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java index 55b16174..207313e2 100644 --- a/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java @@ -71,7 +71,7 @@ public abstract class BaseWirelessInventory extends MEMonitorHandler implements private void readFromNBT() { NBTTagCompound data = Platform.openNbtData(this.target); - this.setMagnetCardMode(WirelessMagnet.Mode.values()[data.getInteger(modeKey)]); + this.setMagnetCardMode(WirelessMagnet.Mode.getModes()[data.getInteger(modeKey)]); this.setRestock(data.getBoolean(ItemBaseWirelessTerminal.restockItems)); } @@ -137,9 +137,8 @@ public abstract class BaseWirelessInventory extends MEMonitorHandler implements } public void setMagnetCardNextMode() { - setMagnetCardMode( - WirelessMagnet.Mode.values()[(getMagnetCardMode().ordinal() + 1) - % WirelessMagnet.Mode.values().length]); + final WirelessMagnet.Mode[] MODES = WirelessMagnet.Mode.getModes(); + setMagnetCardMode(MODES[(getMagnetCardMode().ordinal() + 1) % MODES.length]); } public void setRestock(boolean val) { diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 692feca1..aa0375f4 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -25,9 +25,16 @@ public class WirelessMagnet { public static String filterConfigKey = "MagnetConfig"; public enum Mode { + Off, Inv, - ME + ME; + + private static final Mode[] MODES = Mode.values(); + + public static Mode[] getModes() { + return MODES; + } } public enum ListMode { @@ -131,7 +138,7 @@ public class WirelessMagnet { if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) { NBTTagCompound data = Platform.openNbtData(is); if (data.hasKey(modeKey)) { - return Mode.values()[data.getInteger(modeKey)]; + return Mode.getModes()[data.getInteger(modeKey)]; } setMode(is, Mode.Off); }