dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile errors

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-02 22:46:01 +02:00
parent 92647151ac
commit 2394587851
20 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/block/BlockBase.java
View File

@@ -35,7 +35,7 @@ public abstract class BlockBase extends Block {
setHardness(1.9F); setHardness(1.9F);
setRegistryName(RefinedStorage.ID, name); setRegistryName(RefinedStorage.ID, name);
setCreativeTab(RefinedStorage.TAB); setCreativeTab(RefinedStorage.INSTANCE.tab);
} }
@Override @Override

4
src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
View File

@@ -161,9 +161,9 @@ public class GuiCraftingMonitor extends GuiBase {
super.actionPerformed(button); super.actionPerformed(button);
if (button == cancelButton && itemSelected != -1) { 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) { } else if (button == cancelAllButton && craftingMonitor.getTasks().size() > 0) {
RefinedStorage.NETWORK.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1)); RefinedStorage.INSTANCE.network.sendToServer(new MessageCraftingMonitorCancel(craftingMonitor, -1));
} }
} }

2
src/main/java/refinedstorage/gui/GuiCraftingSettings.java
View File

@@ -124,7 +124,7 @@ public class GuiCraftingSettings extends GuiBase {
Integer quantity = Ints.tryParse(amountField.getText()); Integer quantity = Ints.tryParse(amountField.getText());
if (quantity != null && quantity > 0 && quantity <= GridHandler.MAX_CRAFTING_PER_REQUEST) { 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(); close();
} }

2
src/main/java/refinedstorage/gui/GuiDetector.java
View File

@@ -64,7 +64,7 @@ public class GuiDetector extends GuiBase {
Integer result = Ints.tryParse(amountField.getText()); Integer result = Ints.tryParse(amountField.getText());
if (result != null) { if (result != null) {
RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); RefinedStorage.INSTANCE.network.sendToServer(new MessageDetectorAmountUpdate(detector, result));
} }
} else { } else {
super.keyTyped(character, keyCode); super.keyTyped(character, keyCode);

8
src/main/java/refinedstorage/gui/GuiGrid.java
View File

@@ -351,16 +351,16 @@ public class GuiGrid extends GuiBase {
if (clickedCreatePattern) { if (clickedCreatePattern) {
BlockPos gridPos = ((TileGrid) grid).getPos(); 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()) { } else if (grid.isConnected()) {
if (clickedClear) { if (clickedClear) {
RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear((TileGrid) grid)); RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingClear((TileGrid) grid));
} }
ItemStack held = container.getPlayer().inventory.getItemStack(); ItemStack held = container.getPlayer().inventory.getItemStack();
if (isOverSlotArea(mouseX - guiLeft, mouseY - guiTop) && held != null && (clickedButton == 0 || clickedButton == 1)) { 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))) { if (isOverSlotWithItem() && (held == null || (held != null && clickedButton == 2))) {
@@ -381,7 +381,7 @@ public class GuiGrid extends GuiBase {
flags |= GridPullFlags.PULL_SINGLE; flags |= GridPullFlags.PULL_SINGLE;
} }
RefinedStorage.NETWORK.sendToServer(new MessageGridPull(items.get(slotNumber), flags)); RefinedStorage.INSTANCE.network.sendToServer(new MessageGridPull(items.get(slotNumber), flags));
} }
} }
} }

2
src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java
View File

@@ -64,7 +64,7 @@ public class GuiProcessingPatternEncoder extends GuiBase {
super.mouseClicked(mouseX, mouseY, mouseButton); super.mouseClicked(mouseX, mouseY, mouseButton);
if (isHoveringOverCreatePattern(mouseX - guiLeft, mouseY - guiTop)) { 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)); mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
} }

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
View File

@@ -48,6 +48,6 @@ public class SideButtonCompare extends SideButton {
@Override @Override
public void actionPerformed() { public void actionPerformed() {
RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(config, config.getCompare() ^ mask)); RefinedStorage.INSTANCE.network.sendToServer(new MessageCompareUpdate(config, config.getCompare() ^ mask));
} }
} }

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
View File

@@ -27,6 +27,6 @@ public class SideButtonDetectorMode extends SideButton {
@Override @Override
public void actionPerformed() { public void actionPerformed() {
RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); RefinedStorage.INSTANCE.network.sendToServer(new MessageDetectorModeUpdate(detector));
} }
} }

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java
View File

@@ -36,6 +36,6 @@ public class SideButtonMode extends SideButton {
@Override @Override
public void actionPerformed() { public void actionPerformed() {
RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(config)); RefinedStorage.INSTANCE.network.sendToServer(new MessageModeToggle(config));
} }
} }

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java
View File

@@ -26,6 +26,6 @@ public class SideButtonRedstoneMode extends SideButton {
@Override @Override
public void actionPerformed() { public void actionPerformed() {
RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(config)); RefinedStorage.INSTANCE.network.sendToServer(new MessageRedstoneModeUpdate(config));
} }
} }

2
src/main/java/refinedstorage/item/ItemBase.java
View File

@@ -11,7 +11,7 @@ public abstract class ItemBase extends Item {
this.name = name; this.name = name;
setRegistryName(RefinedStorage.ID, name); setRegistryName(RefinedStorage.ID, name);
setCreativeTab(RefinedStorage.TAB); setCreativeTab(RefinedStorage.INSTANCE.tab);
} }
@Override @Override

2
src/main/java/refinedstorage/item/ItemWirelessGrid.java
View File

@@ -53,7 +53,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer {
setMaxDamage(3200); setMaxDamage(3200);
setMaxStackSize(1); setMaxStackSize(1);
setHasSubtypes(true); setHasSubtypes(true);
setCreativeTab(RefinedStorage.TAB); setCreativeTab(RefinedStorage.INSTANCE.tab);
} }
@Override @Override

2
src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java
View File

@@ -63,7 +63,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler {
} }
} }
RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingTransfer(recipe)); RefinedStorage.INSTANCE.network.sendToServer(new MessageGridCraftingTransfer(recipe));
} }
return null; return null;

36
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -39,24 +39,24 @@ public class CommonProxy {
int id = 0; int id = 0;
RefinedStorage.NETWORK.registerMessage(MessageTileContainerUpdate.class, MessageTileContainerUpdate.class, id++, Side.CLIENT); RefinedStorage.INSTANCE.network.registerMessage(MessageTileContainerUpdate.class, MessageTileContainerUpdate.class, id++, Side.CLIENT);
RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridHeldPush.class, MessageGridHeldPush.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageGridHeldPush.class, MessageGridHeldPush.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridPull.class, MessageGridPull.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageGridPull.class, MessageGridPull.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageModeToggle.class, MessageModeToggle.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridSettingsUpdate.class, MessageGridSettingsUpdate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageGridSettingsUpdate.class, MessageGridSettingsUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageGridCraftingStart.class, MessageGridCraftingStart.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER); RefinedStorage.INSTANCE.network.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridUpdate.class, MessageGridUpdate.class, id++, Side.CLIENT); RefinedStorage.INSTANCE.network.registerMessage(MessageGridUpdate.class, MessageGridUpdate.class, id++, Side.CLIENT);
RefinedStorage.NETWORK.registerMessage(MessageGridDelta.class, MessageGridDelta.class, id++, Side.CLIENT); RefinedStorage.INSTANCE.network.registerMessage(MessageGridDelta.class, MessageGridDelta.class, id++, Side.CLIENT);
NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler());

2
src/main/java/refinedstorage/tile/TileBase.java
View File

@@ -33,7 +33,7 @@ public abstract class TileBase extends TileEntity implements ITickable {
if (this instanceof ISynchronizedContainer) { if (this instanceof ISynchronizedContainer) {
for (EntityPlayer player : worldObj.playerEntities) { for (EntityPlayer player : worldObj.playerEntities) {
if (((ISynchronizedContainer) this).getContainer() == player.openContainer.getClass()) { if (((ISynchronizedContainer) this).getContainer() == player.openContainer.getClass()) {
RefinedStorage.NETWORK.sendTo(new MessageTileContainerUpdate(this), (EntityPlayerMP) player); RefinedStorage.INSTANCE.network.sendTo(new MessageTileContainerUpdate(this), (EntityPlayerMP) player);
} }
} }
} }

2
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -237,7 +237,7 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora
@Override @Override
public void onPriorityChanged(int priority) { public void onPriorityChanged(int priority) {
RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); RefinedStorage.INSTANCE.network.sendToServer(new MessagePriorityUpdate(pos, priority));
} }
@Override @Override

2
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -223,7 +223,7 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage
@Override @Override
public void onPriorityChanged(int priority) { public void onPriorityChanged(int priority) {
RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); RefinedStorage.INSTANCE.network.sendToServer(new MessagePriorityUpdate(pos, priority));
} }
public NBTTagCompound getStorageTag() { public NBTTagCompound getStorageTag() {

2
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -242,7 +242,7 @@ public class TileExternalStorage extends TileSlave implements IStorageProvider,
@Override @Override
public void onPriorityChanged(int priority) { public void onPriorityChanged(int priority) {
RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); RefinedStorage.INSTANCE.network.sendToServer(new MessagePriorityUpdate(pos, priority));
} }
@Override @Override

6
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -279,17 +279,17 @@ public class TileGrid extends TileSlave implements IGrid {
@Override @Override
public void onSortingTypeChanged(int type) { 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 @Override
public void onSortingDirectionChanged(int direction) { 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 @Override
public void onSearchBoxModeChanged(int searchBoxMode) { 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 @Override

6
src/main/java/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -80,21 +80,21 @@ public class WirelessGrid implements IGrid {
@Override @Override
public void onSortingTypeChanged(int type) { 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; this.sortingType = type;
} }
@Override @Override
public void onSortingDirectionChanged(int direction) { 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; this.sortingDirection = direction;
} }
@Override @Override
public void onSearchBoxModeChanged(int searchBoxMode) { 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; this.searchBoxMode = searchBoxMode;
} }