Remove Spigot related code. (Use PurpleIRC-spigot from now on)

cnaude · Jan 1, 2015 · 77c6e1b · 77c6e1b
1 parent 43d2c28
commit 77c6e1b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 57 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -127,14 +127,8 @@
   <dependencies>
     <dependency>
       <groupId>org.bukkit</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.8</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.8</version>
+      <artifactId>bukkit</artifactId>
+      <version>1.7.9-R0.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -339,7 +333,7 @@
   <properties>
     <build.number>SNAPSHOT</build.number>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <bukkit.version>1.8</bukkit.version>
+    <bukkit.version>1.7.9-R0.1</bukkit.version>
   </properties>
 </project>
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Bukkit API Version, change if out dated -->
-        <bukkit.version>1.8</bukkit.version>
+        <bukkit.version>1.7.9-R0.1</bukkit.version>
         <build.number>SNAPSHOT</build.number>
     </properties>
 
@@ -67,18 +67,11 @@
        -->
     </repositories>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>${bukkit.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-
+    <dependencies>        
+        <!-- Bukkit -->
         <dependency>
             <groupId>org.bukkit</groupId>
-            <artifactId>spigot</artifactId>
+            <artifactId>bukkit</artifactId>
             <version>${bukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -214,6 +214,11 @@ public PurpleIRC() {
     public void onEnable() {
         LOG_HEADER = "[" + this.getName() + "]";
         LOG_HEADER_F = ChatColor.DARK_PURPLE + "[" + this.getName() + "]" + ChatColor.RESET;
+        if (getServer().getVersion().contains("Spigot") && getServer().getVersion().contains("MC: 1.8")) {
+            logError("This plugin is not compatible with Spigot 1.8. Please download the Spigot version from the Spigot site.");
+            this.getPluginLoader().disablePlugin(this);
+            return;
+        }
         pluginFolder = getDataFolder();
         botsFolder = new File(pluginFolder + "/bots");
         configFile = new File(pluginFolder, "config.yml");

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -25,15 +25,9 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.injector.PacketConstructor;
 import com.comphenix.protocol.reflect.FieldAccessException;
-import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
-import com.comphenix.protocol.wrappers.PlayerInfoData;
-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.Arrays;
-import java.util.UUID;
 import org.bukkit.entity.Player;
 import org.pircbotx.Channel;
 import org.pircbotx.User;
@@ -125,37 +119,6 @@ private PacketContainer tabPacket(String name, boolean add) {
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());
             }
-        } else if (version.contains("MC: 1.8")) {
-            try {
-                UUID uuid = null; // = plugin.getPlayerUuid(name);
-                if (uuid == null) {
-                    uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8));
-                }
-                if (add) {
-                    packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
-
-                    PlayerInfoData pid = new PlayerInfoData(
-                            new WrappedGameProfile(uuid, displayName),
-                            0,
-                            NativeGameMode.valueOf(plugin.customTabGamemode.toUpperCase()),
-                            WrappedChatComponent.fromJson("{\"text\": \"" + displayName + "\"}"));
-                    packet.getPlayerInfoDataLists().write(0, Arrays.asList(pid));
-                } else {
-                    plugin.logDebug("T: Removing: " + name);
-                    net.minecraft.server.v1_8_R1.EntityPlayer pl = new net.minecraft.server.v1_8_R1.EntityPlayer(
-                            net.minecraft.server.v1_8_R1.MinecraftServer.getServer(),
-                            net.minecraft.server.v1_8_R1.MinecraftServer.getServer().getWorldServer(0),
-                            (GameProfile) (new WrappedGameProfile(uuid, displayName)).getHandle(),
-                            new net.minecraft.server.v1_8_R1.PlayerInteractManager(net.minecraft.server.v1_8_R1.MinecraftServer.getServer().getWorldServer(0))
-                    );
-                    net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo pi = new net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo(net.minecraft.server.v1_8_R1.EnumPlayerInfoAction.REMOVE_PLAYER, pl);
-                    return PacketContainer.fromPacket(pi);
-
-                }
-                return packet;
-            } catch (Exception ex) {
-                plugin.logError("tabPacket: " + ex.getMessage());
-            }
         } else {
             plugin.logDebug("tabPacket: deprecated ");
             playerListConstructor = protocolManager.createPacketConstructor(Packets.Server.PLAYER_INFO, "", false, (int) 0);