From 51bb8700dafe6bfbf07bedb7744c3cd64eb16fae Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Wed, 22 Oct 2014 01:42:01 +0200 Subject: [PATCH] Added a ALL SelectedTab that will accept all messages (used for testing ?) --- .../java/mcp/mobius/opis/events/OpisServerTickHandler.java | 3 --- src/main/java/mcp/mobius/opis/network/enums/Message.java | 1 + .../mobius/opis/network/rcon/nexus/NexusInboundHandler.java | 2 +- src/main/java/mcp/mobius/opis/swing/SelectedTab.java | 3 ++- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java index 442d1d7..5c8e879 100644 --- a/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/src/main/java/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -153,9 +153,6 @@ public enum OpisServerTickHandler{ for (EntityPlayerMP player : PlayerTracker.INSTANCE.playersSwing){ PacketManager.sendFullUpdate(player); } - - - } } diff --git a/src/main/java/mcp/mobius/opis/network/enums/Message.java b/src/main/java/mcp/mobius/opis/network/enums/Message.java index ea801ee..945b156 100644 --- a/src/main/java/mcp/mobius/opis/network/enums/Message.java +++ b/src/main/java/mcp/mobius/opis/network/enums/Message.java @@ -137,6 +137,7 @@ public enum Message { } public boolean isDisplayActive(SelectedTab tab){ + if (tab == SelectedTab.ALL) return true; if (this.tabEnum.contains(SelectedTab.ANY)) return true; if (this.tabEnum.contains(SelectedTab.NONE)) return false; if (this.tabEnum.contains(tab)) return true; diff --git a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java index f9fa6df..2198ba7 100644 --- a/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java +++ b/src/main/java/mcp/mobius/opis/network/rcon/nexus/NexusInboundHandler.java @@ -38,7 +38,7 @@ public class NexusInboundHandler extends ChannelInboundHandlerAdapter { RConHandler.fakePlayersNexus.put(fakePlayer, ctx); PlayerTracker.INSTANCE.playersSwing.add(fakePlayer); - PlayerTracker.INSTANCE.playerTab.put(fakePlayer, SelectedTab.SUMMARY); + PlayerTracker.INSTANCE.playerTab.put(fakePlayer, SelectedTab.ALL); RConHandler.sendToPlayerNexus(new NetDataValue(Message.NEXUS_UUID, new NexusAuth(NexusClient.instance.uuid, NexusClient.instance.pass)), fakePlayer); RConHandler.sendToPlayerNexus(new NetDataValue(Message.STATUS_CURRENT_TIME, new SerialLong(System.currentTimeMillis())), fakePlayer); StringCache.INSTANCE.syncCache(fakePlayer); diff --git a/src/main/java/mcp/mobius/opis/swing/SelectedTab.java b/src/main/java/mcp/mobius/opis/swing/SelectedTab.java index 8c71efd..ac3682b 100644 --- a/src/main/java/mcp/mobius/opis/swing/SelectedTab.java +++ b/src/main/java/mcp/mobius/opis/swing/SelectedTab.java @@ -25,5 +25,6 @@ public enum SelectedTab { CLIENTEVENTS, THREADS, ANY, - NONE; + NONE, + ALL; }