diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index 62f60bee1..fe4b08c76 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -35,7 +35,7 @@ public abstract class BlockBase extends Block { setHardness(1.9F); setRegistryName(RefinedStorage.ID, name); - setCreativeTab(RefinedStorage.TAB); + setCreativeTab(RefinedStorage.INSTANCE.tab); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index 209f56bc3..0733e6bf2 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -161,9 +161,9 @@ public class GuiCraftingMonitor extends GuiBase { super.actionPerformed(button); if (button == cancelButton && itemSelected != -1) { - RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, craftingMonitor.getTasks().get(itemSelected).id)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, craftingMonitor.getTasks().get(itemSelected).id)); } else if (button == cancelAllButton && craftingMonitor.getTasks().size() > 0) { - RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1)); } } diff --git a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java index d9b0af10f..c7fc7d96e 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingSettings.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingSettings.java @@ -124,7 +124,7 @@ public class GuiCraftingSettings extends GuiBase { Integer quantity = Ints.tryParse(amountField.getText()); if (quantity != null && quantity > 0 && quantity <= GridHandler.MAX_CRAFTING_PER_REQUEST) { - RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingStart(stack, quantity)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingStart(stack, quantity)); close(); } diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java index f63c999c4..a52f83ef6 100755 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -64,7 +64,7 @@ public class GuiDetector extends GuiBase { Integer result = Ints.tryParse(amountField.getText()); if (result != null) { - RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageDetectorAmountUpdate(detector, result)); } } else { super.keyTyped(character, keyCode); diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 58ab96869..b47eb8b0e 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -351,16 +351,16 @@ public class GuiGrid extends GuiBase { if (clickedCreatePattern) { BlockPos gridPos = ((TileGrid) grid).getPos(); - RefinedStorage.NETWORK.sendToServer(new MessageGridPatternCreate(gridPos.getX(), gridPos.getY(), gridPos.getZ())); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridPatternCreate(gridPos.getX(), gridPos.getY(), gridPos.getZ())); } else if (grid.isConnected()) { if (clickedClear) { - RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear((TileGrid) grid)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingClear((TileGrid) grid)); } ItemStack held = container.getPlayer().inventory.getItemStack(); if (isOverSlotArea(mouseX - guiLeft, mouseY - guiTop) && held != null && (clickedButton == 0 || clickedButton == 1)) { - RefinedStorage.NETWORK.sendToServer(new MessageGridHeldPush(clickedButton == 1)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridHeldPush(clickedButton == 1)); } if (isOverSlotWithItem() && (held == null || (held != null && clickedButton == 2))) { @@ -381,7 +381,7 @@ public class GuiGrid extends GuiBase { flags |= GridPullFlags.PULL_SINGLE; } - RefinedStorage.NETWORK.sendToServer(new MessageGridPull(items.get(slotNumber), flags)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridPull(items.get(slotNumber), flags)); } } } diff --git a/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java b/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java index 026b0da8f..71594f7ce 100755 --- a/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java +++ b/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java @@ -64,7 +64,7 @@ public class GuiProcessingPatternEncoder extends GuiBase { super.mouseClicked(mouseX, mouseY, mouseButton); if (isHoveringOverCreatePattern(mouseX - guiLeft, mouseY - guiTop)) { - RefinedStorage.NETWORK.sendToServer(new MessageGridPatternCreate(processingPatternEncoder.getPos().getX(), processingPatternEncoder.getPos().getY(), processingPatternEncoder.getPos().getZ())); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridPatternCreate(processingPatternEncoder.getPos().getX(), processingPatternEncoder.getPos().getY(), processingPatternEncoder.getPos().getZ())); mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java index 98738f594..7b9de9eae 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -48,6 +48,6 @@ public class SideButtonCompare extends SideButton { @Override public void actionPerformed() { - RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(config, config.getCompare() ^ mask)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageCompareUpdate(config, config.getCompare() ^ mask)); } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java index 5b787d952..2382b3fbf 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -27,6 +27,6 @@ public class SideButtonDetectorMode extends SideButton { @Override public void actionPerformed() { - RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageDetectorModeUpdate(detector)); } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java index d54fbd567..97c854571 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -36,6 +36,6 @@ public class SideButtonMode extends SideButton { @Override public void actionPerformed() { - RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(config)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageModeToggle(config)); } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java index 2d5e38497..8b1b5b5c4 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -26,6 +26,6 @@ public class SideButtonRedstoneMode extends SideButton { @Override public void actionPerformed() { - RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(config)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageRedstoneModeUpdate(config)); } } diff --git a/src/main/java/refinedstorage/item/ItemBase.java b/src/main/java/refinedstorage/item/ItemBase.java index c5afe2ab1..6d1aea756 100755 --- a/src/main/java/refinedstorage/item/ItemBase.java +++ b/src/main/java/refinedstorage/item/ItemBase.java @@ -11,7 +11,7 @@ public abstract class ItemBase extends Item { this.name = name; setRegistryName(RefinedStorage.ID, name); - setCreativeTab(RefinedStorage.TAB); + setCreativeTab(RefinedStorage.INSTANCE.tab); } @Override diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index fe967fd8e..41d5e6f16 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -53,7 +53,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer { setMaxDamage(3200); setMaxStackSize(1); setHasSubtypes(true); - setCreativeTab(RefinedStorage.TAB); + setCreativeTab(RefinedStorage.INSTANCE.tab); } @Override diff --git a/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java index 473aafaac..73f116c7f 100755 --- a/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java +++ b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java @@ -63,7 +63,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler { } } - RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingTransfer(recipe)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingTransfer(recipe)); } return null; diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index c031a5d90..a3b9fb071 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -39,24 +39,24 @@ public class CommonProxy { int id = 0; - RefinedStorage.NETWORK.registerMessage(MessageTileContainerUpdate.class, MessageTileContainerUpdate.class, id++, Side.CLIENT); - RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridHeldPush.class, MessageGridHeldPush.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridPull.class, MessageGridPull.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridSettingsUpdate.class, MessageGridSettingsUpdate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridUpdate.class, MessageGridUpdate.class, id++, Side.CLIENT); - RefinedStorage.NETWORK.registerMessage(MessageGridDelta.class, MessageGridDelta.class, id++, Side.CLIENT); + RefinedStorage.INSTANCE.network.registerMessage(MessageTileContainerUpdate.class, MessageTileContainerUpdate.class, id++, Side.CLIENT); + RefinedStorage.INSTANCE.network.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridHeldPush.class, MessageGridHeldPush.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridPull.class, MessageGridPull.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageModeToggle.class, MessageModeToggle.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridSettingsUpdate.class, MessageGridSettingsUpdate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridUpdate.class, MessageGridUpdate.class, id++, Side.CLIENT); + RefinedStorage.INSTANCE.network.registerMessage(MessageGridDelta.class, MessageGridDelta.class, id++, Side.CLIENT); NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java index bcabd86da..98cee85a4 100755 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -33,7 +33,7 @@ public abstract class TileBase extends TileEntity implements ITickable { if (this instanceof ISynchronizedContainer) { for (EntityPlayer player : worldObj.playerEntities) { if (((ISynchronizedContainer) this).getContainer() == player.openContainer.getClass()) { - RefinedStorage.NETWORK.sendTo(new MessageTileContainerUpdate(this), (EntityPlayerMP) player); + RefinedStorage.INSTANCE.network.sendTo(new MessageTileContainerUpdate(this), (EntityPlayerMP) player); } } } diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 2d2a6cca9..7c96e6c64 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -237,7 +237,7 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora @Override public void onPriorityChanged(int priority) { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + RefinedStorage.INSTANCE.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 aed20c022..4de7fd2c3 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -223,7 +223,7 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage @Override public void onPriorityChanged(int priority) { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + RefinedStorage.INSTANCE.network.sendToServer(new MessagePriorityUpdate(pos, priority)); } public NBTTagCompound getStorageTag() { diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index 1b39dc9c2..3ad7d3e0d 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -242,7 +242,7 @@ public class TileExternalStorage extends TileSlave implements IStorageProvider, @Override public void onPriorityChanged(int priority) { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + RefinedStorage.INSTANCE.network.sendToServer(new MessagePriorityUpdate(pos, priority)); } @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 7a0977d9d..b6ec98d72 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -279,17 +279,17 @@ public class TileGrid extends TileSlave implements IGrid { @Override public void onSortingTypeChanged(int type) { - RefinedStorage.NETWORK.sendToServer(new MessageGridSettingsUpdate(this, sortingDirection, type, searchBoxMode)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, sortingDirection, type, searchBoxMode)); } @Override public void onSortingDirectionChanged(int direction) { - RefinedStorage.NETWORK.sendToServer(new MessageGridSettingsUpdate(this, direction, sortingType, searchBoxMode)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, direction, sortingType, searchBoxMode)); } @Override public void onSearchBoxModeChanged(int searchBoxMode) { - RefinedStorage.NETWORK.sendToServer(new MessageGridSettingsUpdate(this, sortingDirection, sortingType, searchBoxMode)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(this, sortingDirection, sortingType, searchBoxMode)); } @Override diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 23ae3dfda..7379b1879 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -80,21 +80,21 @@ public class WirelessGrid implements IGrid { @Override public void onSortingTypeChanged(int type) { - RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), type, getSearchBoxMode())); + RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), type, getSearchBoxMode())); this.sortingType = type; } @Override public void onSortingDirectionChanged(int direction) { - RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), direction, getSortingType(), getSearchBoxMode())); + RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), direction, getSortingType(), getSearchBoxMode())); this.sortingDirection = direction; } @Override public void onSearchBoxModeChanged(int searchBoxMode) { - RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), getSortingType(), searchBoxMode)); + RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), getSortingType(), searchBoxMode)); this.searchBoxMode = searchBoxMode; }