Add custom tab compatibility for MC 1.8. #96

cnaude · Dec 21, 2014 · affa764 · affa764
1 parent 34aed20
commit affa764
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 32 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -135,6 +135,12 @@
       <version>1.8</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.8</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -274,7 +280,7 @@
     <dependency>
       <groupId>com.cnaude.shortify</groupId>
       <artifactId>Shortify</artifactId>
-      <version>1.7-SNAPSHOT</version>
+      <version>1.8-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -74,6 +74,14 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>spigot</artifactId>
+            <version>${bukkit.version}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Following dependency is provided by CraftBukkit -->
         <dependency>
@@ -254,7 +262,7 @@
         <dependency>
             <groupId>com.cnaude.shortify</groupId>
             <artifactId>Shortify</artifactId>
-            <version>1.7-SNAPSHOT</version>
+            <version>1.8-SNAPSHOT</version>
         </dependency>
 
         <!-- DynmapAPI -->

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -150,6 +150,7 @@ public class PurpleIRC extends JavaPlugin {
     private boolean stripIRCColors;
     private boolean stripIRCBackgroundColors;
     public boolean customTabList;
+    public String customTabGamemode;
     private boolean listSortByName;
     public boolean exactNickMatch;
     public boolean ignoreChatCancel;
@@ -652,10 +653,12 @@ private void loadConfig() {
         ircConnCheckInterval = getConfig().getLong("conn-check-interval");
         ircChannelCheckInterval = getConfig().getLong("channel-check-interval");
 
+        customTabGamemode = getConfig().getString("custom-tab-gamemode", "SPECTATOR");
         customTabList = getConfig().getBoolean("custom-tab-list", false);
         customTabPrefix = ChatColor.translateAlternateColorCodes('&', getConfig().getString("custom-tab-prefix", "[IRC] "));
         logDebug("custom-tab-list: " + customTabList);
         logDebug("custom-tab-prefix: " + customTabPrefix);
+        logDebug("custom-tab-gamemode: " + customTabGamemode);
     }
 
     private void loadBots() {

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java b/src/main/java/com/cnaude/purpleirc/Utilities/IRCMessageHandler.java
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.xml.transform.Templates;
 import org.bukkit.entity.Player;
 import org.pircbotx.Channel;
 import org.pircbotx.User;

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -30,9 +30,15 @@
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.google.common.base.Charsets;
+import com.mojang.authlib.GameProfile;
 import java.lang.reflect.InvocationTargetException;
-import java.util.List;
+import java.util.Arrays;
 import java.util.UUID;
+import net.minecraft.server.v1_8_R1.EntityPlayer;
+import net.minecraft.server.v1_8_R1.EnumPlayerInfoAction;
+import net.minecraft.server.v1_8_R1.MinecraftServer;
+import net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo;
+import net.minecraft.server.v1_8_R1.PlayerInteractManager;
 import org.bukkit.entity.Player;
 import org.pircbotx.Channel;
 import org.pircbotx.User;
@@ -125,44 +131,37 @@ private PacketContainer tabPacket(String name, boolean add) {
                 plugin.logError("tabPacket: " + ex.getMessage());
             }
         } else if (version.contains("MC: 1.8")) {
-            /*
             try {
-                packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
-                UUID uuid = plugin.getPlayerUuid(name);
+                UUID uuid = null; // = plugin.getPlayerUuid(name);
                 if (uuid == null) {
-                    uuid = java.util.UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8));
+                    uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8));
                 }
-                PlayerInfoData pid = new PlayerInfoData(
-                        packet,
-                        NativeGameMode.CREATIVE,
-                        0,
-                        new WrappedGameProfile(uuid, displayName),
-                        WrappedChatComponent.fromJson("{\"text\": \"" + displayName + "\"}"));
-                List<PlayerInfoData> pil = packet.getPlayerInfoDataLists().read(0);
-                int count = packet.getPlayerInfoDataLists().size();
-                pil.add(pid);
-                for (Player player : plugin.getServer().getOnlinePlayers()) {
-                    if (plugin.vanishHook != null) {
-                        if (plugin.vanishHook.isVanished(player)) {
-                            continue;
-                        }
-                    }
-                    pil.add(new PlayerInfoData(
-                            packet,
-                            NativeGameMode.valueOf(player.getGameMode().name()),
+                if (add) {
+                    packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
+
+                    PlayerInfoData pid = new PlayerInfoData(
+                            new WrappedGameProfile(uuid, displayName),
                             0,
-                            new WrappedGameProfile(player.getUniqueId(), player.getDisplayName()),
-                            WrappedChatComponent.fromJson("{\"text\": \"" + player.getDisplayName() + "\"}"))
+                            NativeGameMode.valueOf(plugin.customTabGamemode.toUpperCase()),
+                            WrappedChatComponent.fromJson("{\"text\": \"" + displayName + "\"}"));
+                    packet.getPlayerInfoDataLists().write(0, Arrays.asList(pid));
+                } else {
+                    plugin.logDebug("T: Removing: " + name);
+                    EntityPlayer pl = new EntityPlayer(   
+                            MinecraftServer.getServer(),
+                            MinecraftServer.getServer().getWorldServer(0),
+                            (GameProfile)(new WrappedGameProfile(uuid, displayName)).getHandle(),
+                            new PlayerInteractManager(MinecraftServer.getServer().getWorldServer(0))
+
                     );
+                    PacketPlayOutPlayerInfo pi = new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, pl);
+                    return PacketContainer.fromPacket(pi);
+
                 }
-                packet.getPlayerInfoDataLists().write(0, pil);                
                 return packet;
-
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());
-                ex.printStackTrace();
             }
-            */
         } else {
             plugin.logDebug("tabPacket: deprecated ");
             playerListConstructor = protocolManager.createPacketConstructor(Packets.Server.PLAYER_INFO, "", false, (int) 0);

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -210,6 +210,8 @@ strip-irc-bg-colors: true
 custom-tab-list: false
 # Nothing to see here
 custom-tab-prefix: '[I] '
+# IRC user gamemode in the tab list: ADVENTURE, CREATIVE, NOT_SET, SPECTATOR, SURVIVAL
+custom-tab-gamemode: SPECTATOR
 # IRC nick must be an exact match to a player name for token expanding
 nick-exact-match: true
 # IRC nick prefixes (can include & color codes)