This commit is contained in:
ProfMobius committed 2014-10-20 23:07:40 +02:00
1 parent c7c123c01c
commit e2b15b242e
5 files changed
+11 -51

No files matched your search

+3 -2
View File
@@ -63,8 +63,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.registry.GameRegistry;
@Mod(modid="Opis", name="Opis", version="1.3.0", dependencies="required-after:MobiusCore@[1.2.4]", acceptableRemoteVersions="*")
//@Mod(modid="Opis", name="Opis", version="1.2.2")
@Mod(modid="Opis", name="Opis", version="1.3.0")
//@Mod(modid="Opis", name="Opis", version="1.3.0", dependencies="required-after:MobiusCore@[1.2.4]", acceptableRemoteVersions="*")
public class modOpis {
@@ -39,17 +39,17 @@ public enum Message {
VALUE_TIMING_HANDLERS,
VALUE_TIMING_WORLDTICK,
VALUE_TIMING_ENTUPDATE,
VALUE_TIMING_TICK,
VALUE_TIMING_TICK, //OUTDATED
VALUE_TIMING_NETWORK,
VALUE_AMOUNT_TILEENTS(EnumSet.of(SelectedTab.SUMMARY)),
VALUE_AMOUNT_ENTITIES(EnumSet.of(SelectedTab.SUMMARY)),
VALUE_AMOUNT_TILEENTS(EnumSet.of(SelectedTab.SUMMARY)), //OUTDATED
VALUE_AMOUNT_ENTITIES(EnumSet.of(SelectedTab.SUMMARY)), //OUTDATED
VALUE_AMOUNT_HANDLERS(EnumSet.of(SelectedTab.SUMMARY)),
VALUE_AMOUNT_UPLOAD (EnumSet.of(SelectedTab.SUMMARY)),
VALUE_AMOUNT_DOWNLOAD(EnumSet.of(SelectedTab.SUMMARY)),
VALUE_AMOUNT_UPLOAD (EnumSet.of(SelectedTab.SUMMARY)), //OUTDATED
VALUE_AMOUNT_DOWNLOAD(EnumSet.of(SelectedTab.SUMMARY)), //OUTDATED
VALUE_CHUNK_FORCED (EnumSet.of(SelectedTab.SUMMARY)),
VALUE_CHUNK_LOADED (EnumSet.of(SelectedTab.SUMMARY)),
VALUE_CHUNK_FORCED (EnumSet.of(SelectedTab.SUMMARY)), //OUTDATED
VALUE_CHUNK_LOADED (EnumSet.of(SelectedTab.SUMMARY)), //OUTDATED
STATUS_START,
STATUS_STOP,
@@ -156,13 +156,6 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_ACCESS_LEVEL, SwingUI.instance());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_SHOW_SWING, SwingUI.instance());
//MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_TILEENTS, panelSummary);
//MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_ENTITIES, panelSummary);
//MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_UPLOAD, panelSummary);
//MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_DOWNLOAD, panelSummary);
//MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_TICK, panelSummary);
//MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_CHUNK_FORCED, panelSummary);
//MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_CHUNK_LOADED, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.NEXUS_DATA, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_AMOUNT_HANDLERS, panelSummary);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.VALUE_TIMING_TILEENTS, panelSummary);
@@ -329,40 +329,6 @@ public class PanelSummary extends JPanelMsgHandler implements ITabPanel{
@Override
public boolean handleMessage(Message msg, PacketBase rawdata) {
switch(msg){
case VALUE_AMOUNT_TILEENTS:{
this.getLblAmountTileEnts().setText(String.valueOf(((SerialInt)rawdata.value).value));
break;
}
case VALUE_AMOUNT_ENTITIES:{
this.getLblAmountEntities().setText(String.valueOf(((SerialInt)rawdata.value).value));
break;
}
//case VALUE_AMOUNT_HANDLERS:{
// this.getLblAmountHandlers().setText(String.valueOf(((SerialInt)rawdata.value).value));
// break;
//}
case VALUE_AMOUNT_UPLOAD:{
double uploadKB = (((SerialLong)rawdata.value).value) / 1024.0;
this.getLblAmountUpload().setText(String.format("%.3f", uploadKB));
break;
}
case VALUE_AMOUNT_DOWNLOAD:{
double downloadKB = (((SerialLong)rawdata.value).value) / 1024.0;
this.getLblAmountDownload().setText(String.format("%.3f", downloadKB));
break;
}
case VALUE_TIMING_TICK:{
this.setTimingTick(rawdata.value);
break;
}
case VALUE_CHUNK_FORCED:{
this.getLblAmountForced().setText(String.valueOf(((SerialInt)rawdata.value).value));
break;
}
case VALUE_CHUNK_LOADED:{
this.getLblAmountLoaded().setText(String.valueOf(((SerialInt)rawdata.value).value));
break;
}
case NEXUS_DATA:{
NexusData data = (NexusData)rawdata.value;