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

Fix grid crashes, fixes issues #271 and #266

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-17 00:11:30 +02:00
parent 122ea38e8a
commit 57c9c59754
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,6 +1,9 @@
# Refined Storage Changelog # Refined Storage Changelog
### 0.9 ### 0.9
**Bugfixes**
- Fixed crash with Grid
**Features** **Features**
- Added fluid storage - Added fluid storage
- Usage of Wireless Grid is now configurable - Usage of Wireless Grid is now configurable

9
src/main/java/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -1,7 +1,8 @@
package refinedstorage.gui.grid; package refinedstorage.gui.grid;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.ListMultimap;
import com.google.common.collect.Multimaps;
import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
@@ -41,8 +42,8 @@ public class GuiGrid extends GuiBase {
public static final GridSortingQuantity SORTING_QUANTITY = new GridSortingQuantity(); public static final GridSortingQuantity SORTING_QUANTITY = new GridSortingQuantity();
public static final GridSortingName SORTING_NAME = new GridSortingName(); public static final GridSortingName SORTING_NAME = new GridSortingName();
public static Multimap<Item, ClientStackItem> ITEMS = ArrayListMultimap.create(); public static final ListMultimap<Item, ClientStackItem> ITEMS = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
public static Multimap<Fluid, ClientStackFluid> FLUIDS = ArrayListMultimap.create(); public static final ListMultimap<Fluid, ClientStackFluid> FLUIDS = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
public static List<IClientStack> STACKS = new ArrayList<>(); public static List<IClientStack> STACKS = new ArrayList<>();
@@ -108,7 +109,7 @@ public class GuiGrid extends GuiBase {
List<IClientStack> stacks = new ArrayList<>(); List<IClientStack> stacks = new ArrayList<>();
if (grid.isConnected()) { if (grid.isConnected()) {
stacks.addAll(grid.getType() == EnumGridType.FLUID ? new ArrayList<>(FLUIDS.values()) : new ArrayList<>(ITEMS.values())); stacks.addAll(grid.getType() == EnumGridType.FLUID ? FLUIDS.values() : ITEMS.values());
String query = searchField.getText().trim().toLowerCase(); String query = searchField.getText().trim().toLowerCase();