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

Only issue a network update on TickPhase START

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-23 16:51:18 +02:00
parent fde2dc6ef2
commit fd19a0c17c
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/apiimpl/network/NetworkMaster.java
View File

@@ -172,6 +172,7 @@ public class NetworkMaster implements INetworkMaster {
INetworkSlave slave = slaves.next(); INetworkSlave slave = slaves.next();
if (slave.canUpdate()) { if (slave.canUpdate()) {
System.out.println("Updating slave " + slave);
slave.updateSlave(); slave.updateSlave();
} }
@@ -185,6 +186,7 @@ public class NetworkMaster implements INetworkMaster {
} }
} }
} }
System.out.println("===Done===");
for (ICraftingTask taskToCancel : craftingTasksToCancel) { for (ICraftingTask taskToCancel : craftingTasksToCancel) {
taskToCancel.onCancelled(this); taskToCancel.onCancelled(this);

20
src/main/java/refinedstorage/apiimpl/network/NetworkMasterEventHandler.java
View File

@@ -11,22 +11,26 @@ import java.util.Map;
public class NetworkMasterEventHandler { public class NetworkMasterEventHandler {
@SubscribeEvent @SubscribeEvent
public void onWorldTick(TickEvent.WorldTickEvent e) { public void onWorldTick(TickEvent.WorldTickEvent e) {
Map<BlockPos, INetworkMaster> networks = NetworkMasterRegistry.get(e.world); if (e.phase == TickEvent.Phase.START) {
Map<BlockPos, INetworkMaster> networks = NetworkMasterRegistry.get(e.world);
if (networks != null) { if (networks != null) {
for (INetworkMaster network : networks.values()) { for (INetworkMaster network : networks.values()) {
if (network.getWorld() == null) { if (network.getWorld() == null) {
network.setWorld(e.world); network.setWorld(e.world);
}
network.update();
} }
network.update();
} }
} }
} }
@SubscribeEvent @SubscribeEvent
public void onWorldLoad(WorldEvent.Load e) { public void onWorldLoad(WorldEvent.Load e) {
NetworkMasterSavedData.getOrLoad(e.getWorld()); if (!e.getWorld().isRemote) {
NetworkMasterSavedData.getOrLoad(e.getWorld());
}
} }
@SubscribeEvent @SubscribeEvent

2
src/main/java/refinedstorage/gui/GuiGrid.java
View File

@@ -243,7 +243,7 @@ public class GuiGrid extends GuiBase {
@Override @Override
public void drawForeground(int mouseX, int mouseY) { public void drawForeground(int mouseX, int mouseY) {
drawString(7, 8, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid")); drawString(7, 7, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid"));
if (grid.getType() == EnumGridType.CRAFTING) { if (grid.getType() == EnumGridType.CRAFTING) {
drawString(7, 95, t("container.crafting")); drawString(7, 95, t("container.crafting"));