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

Small cleanup

Browse Source
This commit is contained in:
Raoul Van den Berge
2017-07-05 11:41:32 +02:00
parent 638bf59278
commit f3ae4fa559
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
View File

@@ -217,6 +217,7 @@ public final class RSUtils {
return other; return other;
} }
@SuppressWarnings("unchecked")
public static <T> NonNullList<T> emptyNonNullList() { public static <T> NonNullList<T> emptyNonNullList() {
return (NonNullList<T>) EMPTY_NON_NULL_LIST; return (NonNullList<T>) EMPTY_NON_NULL_LIST;
} }

2
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java
View File

@@ -61,7 +61,7 @@ public class TileGrid extends TileNode<NetworkNodeGrid> {
t.getNode().markDirty(); t.getNode().markDirty();
}, p -> { }, p -> {
if (Minecraft.getMinecraft().currentScreen instanceof GuiGrid) { if (Minecraft.getMinecraft().currentScreen instanceof GuiGrid) {
((GuiGrid) Minecraft.getMinecraft().currentScreen).markForSorting(); GuiGrid.markForSorting();
} }
}); });
public static final TileDataParameter<Boolean, TileGrid> OREDICT_PATTERN = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().isOredictPattern(), (t, v) -> { public static final TileDataParameter<Boolean, TileGrid> OREDICT_PATTERN = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().isOredictPattern(), (t, v) -> {

12
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
View File

@@ -54,19 +54,19 @@ import java.util.List;
public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, IRedstoneConfigurable { public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, IRedstoneConfigurable {
public static final TileDataParameter<Integer, TilePortableGrid> REDSTONE_MODE = RedstoneMode.createParameter(); public static final TileDataParameter<Integer, TilePortableGrid> REDSTONE_MODE = RedstoneMode.createParameter();
public static final TileDataParameter<Integer, TilePortableGrid> ENERGY_STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.energyStorage.getEnergyStored()); public static final TileDataParameter<Integer, TilePortableGrid> ENERGY_STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.energyStorage.getEnergyStored());
public static final TileDataParameter<Integer, TilePortableGrid> SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getSortingDirection(), (t, v) -> { public static final TileDataParameter<Integer, TilePortableGrid> SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSortingDirection, (t, v) -> {
if (NetworkNodeGrid.isValidSortingDirection(v)) { if (NetworkNodeGrid.isValidSortingDirection(v)) {
t.setSortingDirection(v); t.setSortingDirection(v);
t.markDirty(); t.markDirty();
} }
}, p -> GuiGrid.markForSorting()); }, p -> GuiGrid.markForSorting());
public static final TileDataParameter<Integer, TilePortableGrid> SORTING_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getSortingType(), (t, v) -> { public static final TileDataParameter<Integer, TilePortableGrid> SORTING_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSortingType, (t, v) -> {
if (NetworkNodeGrid.isValidSortingType(v)) { if (NetworkNodeGrid.isValidSortingType(v)) {
t.setSortingType(v); t.setSortingType(v);
t.markDirty(); t.markDirty();
} }
}, p -> GuiGrid.markForSorting()); }, p -> GuiGrid.markForSorting());
public static final TileDataParameter<Integer, TilePortableGrid> SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getSearchBoxMode(), (t, v) -> { public static final TileDataParameter<Integer, TilePortableGrid> SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSearchBoxMode, (t, v) -> {
if (NetworkNodeGrid.isValidSearchBoxMode(v)) { if (NetworkNodeGrid.isValidSearchBoxMode(v)) {
t.setSearchBoxMode(v); t.setSearchBoxMode(v);
t.markDirty(); t.markDirty();
@@ -76,7 +76,7 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
((GuiGrid) Minecraft.getMinecraft().currentScreen).updateSearchFieldFocus(p); ((GuiGrid) Minecraft.getMinecraft().currentScreen).updateSearchFieldFocus(p);
} }
}); });
public static final TileDataParameter<Integer, TilePortableGrid> SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getSize(), (t, v) -> { public static final TileDataParameter<Integer, TilePortableGrid> SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSize, (t, v) -> {
if (NetworkNodeGrid.isValidSize(v)) { if (NetworkNodeGrid.isValidSize(v)) {
t.setSize(v); t.setSize(v);
t.markDirty(); t.markDirty();
@@ -86,12 +86,12 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
Minecraft.getMinecraft().currentScreen.initGui(); Minecraft.getMinecraft().currentScreen.initGui();
} }
}); });
public static final TileDataParameter<Integer, TilePortableGrid> TAB_SELECTED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getTabSelected(), (t, v) -> { public static final TileDataParameter<Integer, TilePortableGrid> TAB_SELECTED = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getTabSelected, (t, v) -> {
t.setTabSelected(v == t.getTabSelected() ? -1 : v); t.setTabSelected(v == t.getTabSelected() ? -1 : v);
t.markDirty(); t.markDirty();
}, p -> { }, p -> {
if (Minecraft.getMinecraft().currentScreen instanceof GuiGrid) { if (Minecraft.getMinecraft().currentScreen instanceof GuiGrid) {
((GuiGrid) Minecraft.getMinecraft().currentScreen).markForSorting(); GuiGrid.markForSorting();
} }
}); });