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

Fixed grid performance by not sending grid data so often

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-25 19:38:45 +02:00
parent c43c6a4d71
commit c1e4af925e
13 changed files with 170 additions and 135 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
### 0.7.3
**Bugfixes**
- Fixed grid performance by not sending grid data so often
**Features**
- Crafting tasks are now sorted from new to old in the Crafting Monitor

2
src/main/java/refinedstorage/block/BlockGrid.java
View File

@@ -61,6 +61,8 @@ public class BlockGrid extends BlockMachine {
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
if (!world.isRemote) {
((TileGrid) world.getTileEntity(pos)).onGridOpened(player);
player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, pos.getX(), pos.getY(), pos.getZ());
}

4
src/main/java/refinedstorage/container/ContainerGrid.java
View File

@@ -74,8 +74,8 @@ public class ContainerGrid extends ContainerBase {
}
}
public TileGrid getGrid() {
return (TileGrid) grid;
public IGrid getGrid() {
return grid;
}
public List<SlotGridCrafting> getCraftingSlots() {

2
src/main/java/refinedstorage/network/MessageGridCraftingShift.java
View File

@@ -42,7 +42,7 @@ public class MessageGridCraftingShift extends MessageHandlerPlayerToServer<Messa
TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z));
if (tile instanceof TileGrid && ((TileGrid) tile).getType() == EnumGridType.CRAFTING && player.openContainer instanceof ContainerGrid) {
((ContainerGrid) player.openContainer).getGrid().onCraftedShift((ContainerGrid) player.openContainer, player);
((TileGrid) ((ContainerGrid) player.openContainer).getGrid()).onCraftedShift((ContainerGrid) player.openContainer, player);
}
}
}

2
src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java
View File

@@ -35,7 +35,7 @@ public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer<Me
@Override
public void handle(MessageGridCraftingTransfer message, EntityPlayerMP player) {
if (player.openContainer instanceof ContainerGrid) {
TileGrid grid = ((ContainerGrid) player.openContainer).getGrid();
TileGrid grid = (TileGrid) ((ContainerGrid) player.openContainer).getGrid();
if (grid.getType() == EnumGridType.CRAFTING || grid.getType() == EnumGridType.PATTERN) {
ItemStack[][] actualRecipe = new ItemStack[9][];

55
src/main/java/refinedstorage/network/MessageGridItems.java Executable file
View File

@@ -0,0 +1,55 @@
package refinedstorage.network;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.Minecraft;
import net.minecraft.inventory.Container;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import refinedstorage.container.ContainerGrid;
import refinedstorage.storage.ItemGroup;
import refinedstorage.tile.controller.TileController;
import java.util.ArrayList;
import java.util.List;
public class MessageGridItems implements IMessage, IMessageHandler<MessageGridItems, IMessage> {
private TileController controller;
private List<ItemGroup> groups = new ArrayList<ItemGroup>();
public MessageGridItems() {
}
public MessageGridItems(TileController controller) {
this.controller = controller;
}
@Override
public void fromBytes(ByteBuf buf) {
int size = buf.readInt();
for (int i = 0; i < size; ++i) {
groups.add(new ItemGroup(buf));
}
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeInt(controller.getItemGroups().size());
for (int i = 0; i < controller.getItemGroups().size(); ++i) {
controller.getItemGroups().get(i).toBytes(buf, i);
}
}
@Override
public IMessage onMessage(MessageGridItems message, MessageContext ctx) {
Container container = Minecraft.getMinecraft().thePlayer.openContainer;
if (container instanceof ContainerGrid) {
((ContainerGrid) container).getGrid().setItemGroups(message.groups);
}
return null;
}
}

47
src/main/java/refinedstorage/network/MessageWirelessGridItems.java
View File

@@ -1,47 +0,0 @@
package refinedstorage.network;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import refinedstorage.storage.ItemGroup;
import refinedstorage.tile.controller.TileController;
import refinedstorage.tile.grid.WirelessGrid;
import java.util.ArrayList;
import java.util.List;
public class MessageWirelessGridItems implements IMessage, IMessageHandler<MessageWirelessGridItems, IMessage> {
private TileController controller;
public MessageWirelessGridItems() {
}
public MessageWirelessGridItems(TileController controller) {
this.controller = controller;
}
@Override
public void fromBytes(ByteBuf buf) {
int size = buf.readInt();
List<ItemGroup> groups = new ArrayList<ItemGroup>();
for (int i = 0; i < size; ++i) {
groups.add(new ItemGroup(buf));
}
WirelessGrid.ITEM_GROUPS = groups;
WirelessGrid.LAST_ITEM_GROUP_UPDATE = System.currentTimeMillis();
}
@Override
public void toBytes(ByteBuf buf) {
controller.writeItemGroups(buf);
}
@Override
public IMessage onMessage(MessageWirelessGridItems message, MessageContext ctx) {
return null;
}
}

2
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -50,7 +50,6 @@ public class CommonProxy {
RefinedStorage.NETWORK.registerMessage(MessageGridCraftingPush.class, MessageGridCraftingPush.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageWirelessGridSettingsUpdate.class, MessageWirelessGridSettingsUpdate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageWirelessGridItems.class, MessageWirelessGridItems.class, id++, Side.CLIENT);
RefinedStorage.NETWORK.registerMessage(MessageWirelessGridStoragePush.class, MessageWirelessGridStoragePush.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageWirelessGridStoragePull.class, MessageWirelessGridStoragePull.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridCraftingShift.class, MessageGridCraftingShift.class, id++, Side.SERVER);
@@ -58,6 +57,7 @@ public class CommonProxy {
RefinedStorage.NETWORK.registerMessage(MessageWirelessGridCraftingStart.class, MessageWirelessGridCraftingStart.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridPatternCreate.class, MessageGridPatternCreate.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageCraftingMonitorCancel.class, MessageCraftingMonitorCancel.class, id++, Side.SERVER);
RefinedStorage.NETWORK.registerMessage(MessageGridItems.class, MessageGridItems.class, id++, Side.CLIENT);
NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler());

132
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -4,6 +4,8 @@ import cofh.api.energy.EnergyStorage;
import cofh.api.energy.IEnergyReceiver;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -12,12 +14,15 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.block.BlockController;
import refinedstorage.block.EnumControllerType;
import refinedstorage.container.ContainerController;
import refinedstorage.container.ContainerGrid;
import refinedstorage.item.ItemPattern;
import refinedstorage.network.MessageGridItems;
import refinedstorage.storage.IStorage;
import refinedstorage.storage.IStorageProvider;
import refinedstorage.storage.ItemGroup;
@@ -73,6 +78,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
private int wirelessGridRange;
private boolean couldRun;
private boolean syncing;
private long lastEnergyUpdate;
@@ -163,55 +169,6 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
}
}
public void syncMachines() {
this.wirelessGridRange = 0;
this.energyUsage = 0;
this.storages.clear();
this.patterns.clear();
for (TileMachine machine : machines) {
if (!machine.mayUpdate()) {
continue;
}
if (machine instanceof TileWirelessTransmitter) {
this.wirelessGridRange += ((TileWirelessTransmitter) machine).getRange();
}
if (machine instanceof IStorageProvider) {
((IStorageProvider) machine).provide(storages);
}
if (machine instanceof TileCrafter) {
TileCrafter crafter = (TileCrafter) machine;
for (int i = 0; i < TileCrafter.PATTERN_SLOTS; ++i) {
ItemStack pattern = crafter.getPatterns().getStackInSlot(i);
if (pattern != null && ItemPattern.isValid(pattern)) {
patterns.add(new CraftingPattern(crafter.getPos().getX(), crafter.getPos().getY(), crafter.getPos().getZ(), ItemPattern.isProcessing(pattern), ItemPattern.getInputs(pattern), ItemPattern.getOutputs(pattern)));
}
}
}
this.energyUsage += machine.getEnergyUsage();
}
Collections.sort(storages, new Comparator<IStorage>() {
@Override
public int compare(IStorage left, IStorage right) {
if (left.getPriority() == right.getPriority()) {
return 0;
}
return (left.getPriority() > right.getPriority()) ? -1 : 1;
}
});
syncItems();
}
public void addMachine(TileMachine machine) {
machinesToAdd.add(machine);
}
@@ -252,14 +209,6 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
return itemGroups;
}
public void writeItemGroups(ByteBuf buf) {
buf.writeInt(itemGroups.size());
for (ItemGroup group : itemGroups) {
group.toBytes(buf, itemGroups.indexOf(group));
}
}
public List<ICraftingTask> getCraftingTasks() {
return craftingTasks;
}
@@ -310,7 +259,58 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
return null;
}
private void syncMachines() {
this.wirelessGridRange = 0;
this.energyUsage = 0;
this.storages.clear();
this.patterns.clear();
for (TileMachine machine : machines) {
if (!machine.mayUpdate()) {
continue;
}
if (machine instanceof TileWirelessTransmitter) {
this.wirelessGridRange += ((TileWirelessTransmitter) machine).getRange();
}
if (machine instanceof IStorageProvider) {
((IStorageProvider) machine).provide(storages);
}
if (machine instanceof TileCrafter) {
TileCrafter crafter = (TileCrafter) machine;
for (int i = 0; i < TileCrafter.PATTERN_SLOTS; ++i) {
ItemStack pattern = crafter.getPatterns().getStackInSlot(i);
if (pattern != null && ItemPattern.isValid(pattern)) {
patterns.add(new CraftingPattern(crafter.getPos().getX(), crafter.getPos().getY(), crafter.getPos().getZ(), ItemPattern.isProcessing(pattern), ItemPattern.getInputs(pattern), ItemPattern.getOutputs(pattern)));
}
}
}
this.energyUsage += machine.getEnergyUsage();
}
Collections.sort(storages, new Comparator<IStorage>() {
@Override
public int compare(IStorage left, IStorage right) {
if (left.getPriority() == right.getPriority()) {
return 0;
}
return (left.getPriority() > right.getPriority()) ? -1 : 1;
}
});
syncItems();
syncItemsWithClients();
}
private void syncItems() {
this.syncing = true;
itemGroups.clear();
for (IStorage storage : storages) {
@@ -360,6 +360,22 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
}
itemGroups.removeAll(combinedGroups);
this.syncing = false;
}
public void syncItemsWithClients() {
if (!syncing) {
for (EntityPlayer player : worldObj.playerEntities) {
if (player.openContainer.getClass() == ContainerGrid.class) {
syncItemsWithClient((EntityPlayerMP) player);
}
}
}
}
public void syncItemsWithClient(EntityPlayerMP player) {
RefinedStorage.NETWORK.sendTo(new MessageGridItems(this), player);
}
public boolean push(ItemStack stack) {
@@ -368,6 +384,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
storage.push(stack);
syncItems();
syncItemsWithClients();
for (int i = 0; i < stack.stackSize; ++i) {
if (!craftingTasks.empty()) {
@@ -416,6 +433,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
if (newStack != null) {
syncItems();
syncItemsWithClients();
}
return newStack;

11
src/main/java/refinedstorage/tile/controller/WirelessGridHandler.java
View File

@@ -9,7 +9,6 @@ import refinedstorage.RefinedStorageGui;
import refinedstorage.RefinedStorageItems;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.item.ItemWirelessGrid;
import refinedstorage.network.MessageWirelessGridItems;
import refinedstorage.tile.grid.WirelessGridConsumer;
import java.util.ArrayList;
@@ -37,10 +36,6 @@ public class WirelessGridHandler {
if (!RefinedStorageUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) {
consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list
} else {
if (controller.mayRun()) {
RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(controller), (EntityPlayerMP) consumer.getPlayer());
}
}
}
}
@@ -54,6 +49,8 @@ public class WirelessGridHandler {
consumers.add(new WirelessGridConsumer(player, hand, player.getHeldItem(hand)));
controller.syncItemsWithClient((EntityPlayerMP) player);
player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, controller.getWorld(), RefinedStorageUtils.getIdFromHand(hand), 0, 0);
drainEnergy(player, ItemWirelessGrid.USAGE_OPEN);
@@ -100,4 +97,8 @@ public class WirelessGridHandler {
return null;
}
public List<WirelessGridConsumer> getConsumers() {
return consumers;
}
}

2
src/main/java/refinedstorage/tile/grid/IGrid.java
View File

@@ -11,6 +11,8 @@ public interface IGrid {
List<ItemGroup> getItemGroups();
void setItemGroups(List<ItemGroup> groups);
void onItemPush(int playerSlot, boolean one);
void onItemPull(int id, int flags);

28
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -2,6 +2,7 @@ package refinedstorage.tile.grid;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.*;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
@@ -91,6 +92,17 @@ public class TileGrid extends TileMachine implements IGrid {
return itemGroups;
}
@Override
public void setItemGroups(List<ItemGroup> itemGroups) {
this.itemGroups = itemGroups;
}
public void onGridOpened(EntityPlayer player) {
if (isConnected()) {
controller.syncItemsWithClient((EntityPlayerMP) player);
}
}
@Override
public void onItemPush(int playerSlot, boolean one) {
RefinedStorage.NETWORK.sendToServer(new MessageGridStoragePush(getPos().getX(), getPos().getY(), getPos().getZ(), playerSlot, one));
@@ -335,12 +347,6 @@ public class TileGrid extends TileMachine implements IGrid {
buf.writeInt(sortingDirection);
buf.writeInt(sortingType);
buf.writeInt(searchBoxMode);
if (connected) {
controller.writeItemGroups(buf);
} else {
buf.writeInt(0);
}
}
@Override
@@ -350,16 +356,6 @@ public class TileGrid extends TileMachine implements IGrid {
sortingDirection = buf.readInt();
sortingType = buf.readInt();
searchBoxMode = buf.readInt();
List<ItemGroup> groups = new ArrayList<ItemGroup>();
int size = buf.readInt();
for (int i = 0; i < size; ++i) {
groups.add(new ItemGroup(buf));
}
itemGroups = groups;
}
@Override

15
src/main/java/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -21,14 +21,13 @@ import java.util.ArrayList;
import java.util.List;
public class WirelessGrid implements IGrid {
public static long LAST_ITEM_GROUP_UPDATE = 0;
public static List<ItemGroup> ITEM_GROUPS = new ArrayList<ItemGroup>();
private ItemStack stack;
private EnumHand hand;
private int sortingType;
private int sortingDirection;
private int searchBoxMode;
private List<ItemGroup> itemGroups = new ArrayList<ItemGroup>();
private long lastUpdate;
public WirelessGrid(ItemStack stack, EnumHand hand) {
this.stack = stack;
@@ -45,7 +44,13 @@ public class WirelessGrid implements IGrid {
@Override
public List<ItemGroup> getItemGroups() {
return ITEM_GROUPS;
return itemGroups;
}
@Override
public void setItemGroups(List<ItemGroup> groups) {
this.itemGroups = groups;
this.lastUpdate = System.currentTimeMillis();
}
@Override
@@ -114,6 +119,6 @@ public class WirelessGrid implements IGrid {
@Override
public boolean isConnected() {
return System.currentTimeMillis() - LAST_ITEM_GROUP_UPDATE < 1000;
return System.currentTimeMillis() - lastUpdate < 1000;
}
}