Initial set of fixes

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Refined Storage Changelog
 
+### 0.7.1
+**Bugfixes**
+- Fixed NPE in some tiles
+- Fixed going out of crafting GUI not restoring state (scrollbar and search term)
+- Fixed not being able to create a pattern in disconnected Pattern Grid
+
 ### 0.7
 **Bugfixes**
 - Fixed Crafting Grid / Pattern Grid not throwing items on break

src/main/java/refinedstorage/block/BlockMachine.java

@@ -54,6 +54,7 @@ public abstract class BlockMachine extends BlockBase {
         super.neighborChanged(state, world, pos, block);
 
         if (!world.isRemote) {
+            System.out.println("NeighbourChange");
             ((TileMachine) world.getTileEntity(pos)).searchController(world);
         }
     }

src/main/java/refinedstorage/gui/GuiCraftingSettings.java

@@ -62,7 +62,7 @@ public class GuiCraftingSettings extends GuiBase {
             if (keyCode == Keyboard.KEY_RETURN) {
                 startRequest();
             } else if (keyCode == Keyboard.KEY_ESCAPE) {
-                FMLClientHandler.instance().showGuiScreen(gridGui);
+                close();
             } else {
                 super.keyTyped(character, keyCode);
             }
@@ -84,7 +84,11 @@ public class GuiCraftingSettings extends GuiBase {
         if (quantity != null && quantity > 0 && quantity <= TileController.MAX_CRAFTING_QUANTITY_PER_REQUEST) {
             gridGui.getGrid().onCraftingRequested(id, quantity);
 
-            FMLClientHandler.instance().showGuiScreen(gridGui);
+            close();
         }
     }
+
+    private void close() {
+        FMLClientHandler.instance().showGuiScreen(gridGui);
+    }
 }

src/main/java/refinedstorage/gui/GuiGrid.java

@@ -56,12 +56,20 @@ public class GuiGrid extends GuiBase {
             addSideButton(new SideButtonRedstoneMode(grid.getRedstoneModeSetting()));
         }
 
-        searchField = new GuiTextField(0, fontRendererObj, x + 80 + 1, y + 6 + 1, 88 - 6, fontRendererObj.FONT_HEIGHT);
+        int sx = x + 80 + 1;
-        searchField.setEnableBackgroundDrawing(false);
+        int sy = y + 6 + 1;
-        searchField.setVisible(true);
+
-        searchField.setTextColor(16777215);
+        if (searchField == null) {
-        searchField.setCanLoseFocus(!TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode()));
+            searchField = new GuiTextField(0, fontRendererObj, sx, sy, 88 - 6, fontRendererObj.FONT_HEIGHT);
-        searchField.setFocused(TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode()));
+            searchField.setEnableBackgroundDrawing(false);
+            searchField.setVisible(true);
+            searchField.setTextColor(16777215);
+            searchField.setCanLoseFocus(!TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode()));
+            searchField.setFocused(TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode()));
+        } else {
+            searchField.xPosition = sx;
+            searchField.yPosition = sy;
+        }
 
         addSideButton(new SideButtonGridSortingDirection(grid));
         addSideButton(new SideButtonGridSortingType(grid));
@@ -300,13 +308,12 @@ public class GuiGrid extends GuiBase {
         boolean clickedClear = clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop);
         boolean clickedCreatePattern = clickedButton == 0 && isHoveringOverCreatePattern(mouseX - guiLeft, mouseY - guiTop);
 
-        boolean playClickSound = clickedClear || clickedCreatePattern;
+        if (clickedCreatePattern) {
+            BlockPos gridPos = ((TileGrid) grid).getPos();
 
-        if (grid.isConnected()) {
+            RefinedStorage.NETWORK.sendToServer(new MessageGridPatternCreate(gridPos.getX(), gridPos.getY(), gridPos.getZ()));
-            if (clickedCreatePattern) {
+        } else if (grid.isConnected()) {
-                BlockPos gridPos = ((TileGrid) grid).getPos();
+            if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null && (clickedButton == 0 || clickedButton == 1)) {
-                RefinedStorage.NETWORK.sendToServer(new MessageGridPatternCreate(gridPos.getX(), gridPos.getY(), gridPos.getZ()));
-            } else if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null && (clickedButton == 0 || clickedButton == 1)) {
                 grid.onItemPush(-1, clickedButton == 1);
             } else if (isHoveringOverItemInSlot() && container.getPlayer().inventory.getItemStack() == null) {
                 if (items.get(hoveringSlot).getQuantity() == 0 || (GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown())) {
@@ -328,7 +335,7 @@ public class GuiGrid extends GuiBase {
 
                     grid.onItemPull(hoveringItemId, flags);
                 }
-            } else if (clickedClear && grid.isConnected()) {
+            } else if (clickedClear) {
                 RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear((TileGrid) grid));
             } else {
                 for (Slot slot : container.getPlayerInventorySlots()) {
@@ -351,7 +358,7 @@ public class GuiGrid extends GuiBase {
             }
         }
 
-        if (playClickSound) {
+        if (clickedClear || clickedCreatePattern) {
             mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
         }
     }

src/main/java/refinedstorage/tile/CraftingTaskScheduler.java

@@ -8,32 +8,29 @@ import refinedstorage.tile.autocrafting.CraftingPattern;
 public class CraftingTaskScheduler {
     public static String NBT_SCHEDULED = "CraftingTaskScheduled";
 
-    private ItemStack scheduledFor;
+    private ItemStack scheduledItem;
 
     public boolean canSchedule(int compare, ItemStack item) {
-        // We can only reschedule if:
+        return scheduledItem == null || !RefinedStorageUtils.compareStack(scheduledItem, item, compare);
-        // - we didn't schedule anything before
-        // - the item we can't to schedule is another item
-        return scheduledFor == null || !RefinedStorageUtils.compareStack(scheduledFor, item, compare);
     }
 
     public void schedule(TileController controller, int compare, ItemStack item) {
         CraftingPattern pattern = controller.getPattern(item, compare);
 
         if (pattern != null) {
-            scheduledFor = item;
+            scheduledItem = item;
 
             controller.addCraftingTask(pattern);
         }
     }
 
     public void resetSchedule() {
-        this.scheduledFor = null;
+        this.scheduledItem = null;
     }
 
     public void writeToNBT(NBTTagCompound tag) {
-        if (scheduledFor != null) {
+        if (scheduledItem != null) {
-            tag.setTag(NBT_SCHEDULED, scheduledFor.serializeNBT());
+            tag.setTag(NBT_SCHEDULED, scheduledItem.serializeNBT());
         } else {
             tag.removeTag(NBT_SCHEDULED);
         }
@@ -41,7 +38,7 @@ public class CraftingTaskScheduler {
 
     public void read(NBTTagCompound tag) {
         if (tag.hasKey(NBT_SCHEDULED)) {
-            scheduledFor = ItemStack.loadItemStackFromNBT(tag.getCompoundTag(NBT_SCHEDULED));
+            scheduledItem = ItemStack.loadItemStackFromNBT(tag.getCompoundTag(NBT_SCHEDULED));
         }
     }
 }

src/main/java/refinedstorage/tile/TileBase.java

@@ -78,6 +78,7 @@ public abstract class TileBase extends TileEntity implements ITickable {
     public void readFromNBT(NBTTagCompound tag) {
         super.readFromNBT(tag);
 
+        System.out.println("READ FROM NBT " + pos);
         if (tag.hasKey(NBT_UPDATE)) {
             readUpdate(tag);
         } else {

src/main/java/refinedstorage/tile/TileController.java

@@ -261,7 +261,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
             this.type = (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE);
         }
 
-        return type;
+        return type == null ? EnumControllerType.NORMAL : type;
     }
 
     public int getWirelessGridRange() {

src/main/java/refinedstorage/tile/TileStorage.java

@@ -107,7 +107,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
             this.type = ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE));
         }
 
-        return type;
+        return type == null ? EnumStorageType.TYPE_1K : type;
     }
 
     @Override

src/main/java/refinedstorage/tile/grid/TileGrid.java

@@ -83,7 +83,7 @@ public class TileGrid extends TileMachine implements IGrid {
             this.type = (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE);
         }
 
-        return type;
+        return type == null ? EnumGridType.NORMAL : type;
     }
 
     @Override