diff --git a/mcp/mobius/opis/data/holders/newtypes/CachedString.java b/mcp/mobius/opis/data/holders/newtypes/CachedString.java index 481c5ae..fbfbe59 100644 --- a/mcp/mobius/opis/data/holders/newtypes/CachedString.java +++ b/mcp/mobius/opis/data/holders/newtypes/CachedString.java @@ -4,6 +4,8 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.managers.StringCache; @@ -18,8 +20,13 @@ public class CachedString implements Comparable, ISerializable{ } public CachedString(String str){ - this.index = StringCache.INSTANCE.getIndex(str); - this.str = str; + if(FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){ + this.index = StringCache.INSTANCE.getIndex(str); + this.str = str; + } else { + this.index = -1; + this.str = str; + } } @Override diff --git a/mcp/mobius/opis/data/managers/StringCache.java b/mcp/mobius/opis/data/managers/StringCache.java index bc94320..d51cbe3 100644 --- a/mcp/mobius/opis/data/managers/StringCache.java +++ b/mcp/mobius/opis/data/managers/StringCache.java @@ -4,8 +4,10 @@ import java.util.ArrayList; import com.google.common.collect.HashBiMap; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; +import cpw.mods.fml.relauncher.Side; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.data.holders.ISerializable; @@ -19,7 +21,7 @@ public enum StringCache implements IMessageHandler { INSTANCE; private int currentIndex = -1; - private HashBiMap cache = HashBiMap.create(); + private HashBiMap cache = HashBiMap.create(); private ArrayList toSend = new ArrayList(); public String getString(int index){ @@ -49,9 +51,11 @@ public enum StringCache implements IMessageHandler { public void syncCache(Player player){ int i = 0; - while (i < this.toSend.size()){ - PacketDispatcher.sendPacketToPlayer(NetDataList.create(Message.STATUS_STRINGUPD_FULL, this.toSend.subList(i, Math.min(i + 50, this.toSend.size()))).packet, player); - + + ArrayList toSendCopy = new ArrayList(toSend); + + while (i < toSendCopy.size()){ + PacketDispatcher.sendPacketToPlayer(NetDataList.create(Message.STATUS_STRINGUPD_FULL, toSendCopy.subList(i, Math.min(i + 50, toSendCopy.size()))).packet, player); i += 50; } diff --git a/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java b/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java index 1e0356a..2cfa50f 100644 --- a/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java +++ b/mcp/mobius/opis/swing/panels/timingclient/PanelRenderEntities.java @@ -13,6 +13,7 @@ import javax.swing.table.DefaultTableModel; import net.miginfocom.swing.MigLayout; import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.api.ITabPanel; +import mcp.mobius.opis.data.holders.newtypes.CachedString; import mcp.mobius.opis.data.holders.newtypes.DataEntityRender; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.network.enums.Message; @@ -43,7 +44,7 @@ public class PanelRenderEntities extends JPanel implements ITabPanel, IMessageHa table = new JTableStats( new String[] {"Name", "Coordinates", "Timing"}, - new Class[] {String.class, Object.class, DataTiming.class} + new Class[] {CachedString.class, Object.class, DataTiming.class} ); scrollPane.setViewportView(table);