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

Ancients legends didn't say anything about forgetfulness

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-07 02:31:17 +02:00
parent e689d2a6eb
commit 57954276da
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ import refinedstorage.gui.grid.stack.ClientStackItem;
import refinedstorage.gui.grid.stack.IClientStack; import refinedstorage.gui.grid.stack.IClientStack;
import refinedstorage.gui.sidebutton.*; import refinedstorage.gui.sidebutton.*;
import refinedstorage.integration.jei.IntegrationJEI; import refinedstorage.integration.jei.IntegrationJEI;
import refinedstorage.integration.jei.RefinedStorageJEIPlugin; import refinedstorage.integration.jei.RSJEIPlugin;
import refinedstorage.network.*; import refinedstorage.network.*;
import refinedstorage.tile.grid.IGrid; import refinedstorage.tile.grid.IGrid;
import refinedstorage.tile.grid.TileGrid; import refinedstorage.tile.grid.TileGrid;
@@ -417,7 +417,7 @@ public class GuiGrid extends GuiBase {
private void updateJEI() { private void updateJEI() {
if (IntegrationJEI.isLoaded() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) { if (IntegrationJEI.isLoaded() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) {
RefinedStorageJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText()); RSJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
} }
} }

4
src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java → src/main/java/refinedstorage/integration/jei/RSJEIPlugin.java
View File

@@ -9,8 +9,8 @@ import refinedstorage.RSBlocks;
import refinedstorage.container.ContainerSolderer; import refinedstorage.container.ContainerSolderer;
@JEIPlugin @JEIPlugin
public class RefinedStorageJEIPlugin extends BlankModPlugin { public class RSJEIPlugin extends BlankModPlugin {
public static RefinedStorageJEIPlugin INSTANCE; public static RSJEIPlugin INSTANCE;
private IJeiRuntime runtime; private IJeiRuntime runtime;

4
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -57,7 +57,7 @@ import refinedstorage.network.MessageGridItemUpdate;
import refinedstorage.tile.config.IRedstoneConfigurable; import refinedstorage.tile.config.IRedstoneConfigurable;
import refinedstorage.tile.config.RedstoneMode; import refinedstorage.tile.config.RedstoneMode;
import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.RefinedStorageSerializers; import refinedstorage.tile.data.RSSerializers;
import refinedstorage.tile.data.TileDataParameter; import refinedstorage.tile.data.TileDataParameter;
import refinedstorage.tile.externalstorage.FluidStorageExternal; import refinedstorage.tile.externalstorage.FluidStorageExternal;
import refinedstorage.tile.externalstorage.ItemStorageExternal; import refinedstorage.tile.externalstorage.ItemStorageExternal;
@@ -91,7 +91,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
} }
}); });
public static final TileDataParameter<List<ClientNode>> NODES = new TileDataParameter<>(RefinedStorageSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), new ITileDataProducer<List<ClientNode>, TileController>() { public static final TileDataParameter<List<ClientNode>> NODES = new TileDataParameter<>(RSSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), new ITileDataProducer<List<ClientNode>, TileController>() {
@Override @Override
public List<ClientNode> getValue(TileController tile) { public List<ClientNode> getValue(TileController tile) {
List<ClientNode> nodes = new ArrayList<>(); List<ClientNode> nodes = new ArrayList<>();

4
src/main/java/refinedstorage/tile/TileCraftingMonitor.java
View File

@@ -3,7 +3,7 @@ package refinedstorage.tile;
import refinedstorage.RS; import refinedstorage.RS;
import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement; import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.RefinedStorageSerializers; import refinedstorage.tile.data.RSSerializers;
import refinedstorage.tile.data.TileDataParameter; import refinedstorage.tile.data.TileDataParameter;
import java.util.Collections; import java.util.Collections;
@@ -11,7 +11,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class TileCraftingMonitor extends TileNode { public class TileCraftingMonitor extends TileNode {
public static final TileDataParameter<List<ICraftingMonitorElement>> ELEMENTS = new TileDataParameter<>(RefinedStorageSerializers.CRAFTING_MONITOR_ELEMENT_SERIALIZER, Collections.emptyList(), new ITileDataProducer<List<ICraftingMonitorElement>, TileCraftingMonitor>() { public static final TileDataParameter<List<ICraftingMonitorElement>> ELEMENTS = new TileDataParameter<>(RSSerializers.CRAFTING_MONITOR_ELEMENT_SERIALIZER, Collections.emptyList(), new ITileDataProducer<List<ICraftingMonitorElement>, TileCraftingMonitor>() {
@Override @Override
public List<ICraftingMonitorElement> getValue(TileCraftingMonitor tile) { public List<ICraftingMonitorElement> getValue(TileCraftingMonitor tile) {
if (tile.connected) { if (tile.connected) {

6
src/main/java/refinedstorage/tile/TileFluidInterface.java
View File

@@ -17,7 +17,7 @@ import refinedstorage.inventory.ItemHandlerUpgrade;
import refinedstorage.item.ItemUpgrade; import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.config.IComparable; import refinedstorage.tile.config.IComparable;
import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.RefinedStorageSerializers; import refinedstorage.tile.data.RSSerializers;
import refinedstorage.tile.data.TileDataParameter; import refinedstorage.tile.data.TileDataParameter;
public class TileFluidInterface extends TileNode implements IComparable { public class TileFluidInterface extends TileNode implements IComparable {
@@ -25,14 +25,14 @@ public class TileFluidInterface extends TileNode implements IComparable {
public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter(); public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
public static final TileDataParameter<FluidStack> TANK_IN = new TileDataParameter<>(RefinedStorageSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() { public static final TileDataParameter<FluidStack> TANK_IN = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() {
@Override @Override
public FluidStack getValue(TileFluidInterface tile) { public FluidStack getValue(TileFluidInterface tile) {
return tile.tankIn.getFluid(); return tile.tankIn.getFluid();
} }
}); });
public static final TileDataParameter<FluidStack> TANK_OUT = new TileDataParameter<>(RefinedStorageSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() { public static final TileDataParameter<FluidStack> TANK_OUT = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() {
@Override @Override
public FluidStack getValue(TileFluidInterface tile) { public FluidStack getValue(TileFluidInterface tile) {
return tile.tankOut.getFluid(); return tile.tankOut.getFluid();

2
src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java → src/main/java/refinedstorage/tile/data/RSSerializers.java
View File

@@ -16,7 +16,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
public final class RefinedStorageSerializers { public final class RSSerializers {
public static final DataSerializer<List<ClientNode>> CLIENT_NODE_SERIALIZER = new DataSerializer<List<ClientNode>>() { public static final DataSerializer<List<ClientNode>> CLIENT_NODE_SERIALIZER = new DataSerializer<List<ClientNode>>() {
@Override @Override
public void write(PacketBuffer buf, List<ClientNode> nodes) { public void write(PacketBuffer buf, List<ClientNode> nodes) {