Remove some nasty code.
This commit is contained in:
@@ -21,7 +21,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.API;
|
|||||||
import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridFluid;
|
import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridFluid;
|
||||||
import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridItem;
|
import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridItem;
|
||||||
import com.raoulvdberge.refinedstorage.block.BlockGrid;
|
import com.raoulvdberge.refinedstorage.block.BlockGrid;
|
||||||
import com.raoulvdberge.refinedstorage.container.ContainerGrid;
|
|
||||||
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
|
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
|
||||||
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter;
|
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilter;
|
||||||
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
|
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
|
||||||
@@ -87,10 +86,10 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware {
|
|||||||
super.onContentsChanged(slot);
|
super.onContentsChanged(slot);
|
||||||
|
|
||||||
ItemStack pattern = getStackInSlot(slot);
|
ItemStack pattern = getStackInSlot(slot);
|
||||||
if (slot == 1 && !pattern.isEmpty()) {
|
if (slot == 1 && !pattern.isEmpty() && world != null) {
|
||||||
boolean isPatternProcessing = ItemPattern.isProcessing(pattern);
|
boolean isPatternProcessing = ItemPattern.isProcessing(pattern);
|
||||||
|
|
||||||
if (isPatternProcessing && processingPattern) {
|
if (isPatternProcessing && isProcessingPattern()) {
|
||||||
for (int i = 0; i < 9; ++i) {
|
for (int i = 0; i < 9; ++i) {
|
||||||
matrixProcessing.setStackInSlot(i, StackUtils.nullToEmpty(ItemPattern.getInputSlot(pattern, i)));
|
matrixProcessing.setStackInSlot(i, StackUtils.nullToEmpty(ItemPattern.getInputSlot(pattern, i)));
|
||||||
}
|
}
|
||||||
@@ -98,13 +97,11 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware {
|
|||||||
for (int i = 0; i < 9; ++i) {
|
for (int i = 0; i < 9; ++i) {
|
||||||
matrixProcessing.setStackInSlot(9 + i, StackUtils.nullToEmpty(ItemPattern.getOutputSlot(pattern, i)));
|
matrixProcessing.setStackInSlot(9 + i, StackUtils.nullToEmpty(ItemPattern.getOutputSlot(pattern, i)));
|
||||||
}
|
}
|
||||||
} else if (!isPatternProcessing && !processingPattern) {
|
} else if (!isPatternProcessing && !isProcessingPattern()) {
|
||||||
for (int i = 0; i < 9; ++i) {
|
for (int i = 0; i < 9; ++i) {
|
||||||
matrix.setInventorySlotContents(i, StackUtils.nullToEmpty(ItemPattern.getInputSlot(pattern, i)));
|
matrix.setInventorySlotContents(i, StackUtils.nullToEmpty(ItemPattern.getInputSlot(pattern, i)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sendSlotUpdate(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -405,23 +402,6 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void sendSlotUpdate(boolean initSlots) {
|
|
||||||
if (!world.isRemote) {
|
|
||||||
world.getMinecraftServer()
|
|
||||||
.getPlayerList()
|
|
||||||
.getPlayers()
|
|
||||||
.stream()
|
|
||||||
.filter(player -> player.openContainer instanceof ContainerGrid && ((ContainerGrid) player.openContainer).getTile() != null && ((ContainerGrid) player.openContainer).getTile().getPos().equals(pos))
|
|
||||||
.forEach(player -> {
|
|
||||||
if (initSlots) {
|
|
||||||
((ContainerGrid) player.openContainer).initSlots();
|
|
||||||
}
|
|
||||||
|
|
||||||
((ContainerGrid) player.openContainer).sendAllSlots();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClosed(EntityPlayer player) {
|
public void onClosed(EntityPlayer player) {
|
||||||
// NO OP
|
// NO OP
|
||||||
|
|||||||
@@ -47,8 +47,6 @@ public class MessageGridClear extends MessageHandlerPlayerToServer<MessageGridCl
|
|||||||
} else if (grid.getType() == GridType.PATTERN) {
|
} else if (grid.getType() == GridType.PATTERN) {
|
||||||
((NetworkNodeGrid) grid).clearMatrix();
|
((NetworkNodeGrid) grid).clearMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
((NetworkNodeGrid) grid).sendSlotUpdate(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.tile.grid;
|
|||||||
import com.raoulvdberge.refinedstorage.api.network.grid.GridType;
|
import com.raoulvdberge.refinedstorage.api.network.grid.GridType;
|
||||||
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
|
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
|
||||||
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
|
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
|
||||||
|
import com.raoulvdberge.refinedstorage.container.ContainerGrid;
|
||||||
import com.raoulvdberge.refinedstorage.gui.GuiBase;
|
import com.raoulvdberge.refinedstorage.gui.GuiBase;
|
||||||
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
|
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
|
||||||
import com.raoulvdberge.refinedstorage.tile.TileNode;
|
import com.raoulvdberge.refinedstorage.tile.TileNode;
|
||||||
@@ -70,7 +71,16 @@ public class TileGrid extends TileNode<NetworkNodeGrid> {
|
|||||||
t.getNode().setProcessingPattern(v);
|
t.getNode().setProcessingPattern(v);
|
||||||
t.getNode().clearMatrix();
|
t.getNode().clearMatrix();
|
||||||
t.getNode().markDirty();
|
t.getNode().markDirty();
|
||||||
t.getNode().sendSlotUpdate(true);
|
|
||||||
|
t.getWorld().getMinecraftServer()
|
||||||
|
.getPlayerList()
|
||||||
|
.getPlayers()
|
||||||
|
.stream()
|
||||||
|
.filter(player -> player.openContainer instanceof ContainerGrid && ((ContainerGrid) player.openContainer).getTile() != null && ((ContainerGrid) player.openContainer).getTile().getPos().equals(t.getPos()))
|
||||||
|
.forEach(player -> {
|
||||||
|
((ContainerGrid) player.openContainer).initSlots();
|
||||||
|
((ContainerGrid) player.openContainer).sendAllSlots();
|
||||||
|
});
|
||||||
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, GuiBase::initGui));
|
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, GuiBase::initGui));
|
||||||
|
|
||||||
public static void trySortGrid(boolean initial) {
|
public static void trySortGrid(boolean initial) {
|
||||||
|
|||||||
Reference in New Issue
Block a user