Update to 1.5 & don't deploy proxy to maven, only APIs

api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>net.md-5</groupId>
     <artifactId>bungeecord-parent</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>BungeeCord</name>

protocol/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

protocol/src/main/java/net/md_5/bungee/protocol/PacketDefinitions.java

@@ -12,7 +12,7 @@ public class PacketDefinitions
     public enum OpCode
     {
 
-        BOOLEAN, BULK_CHUNK, BYTE, BYTE_INT, DOUBLE, FLOAT, INT, INT_3, INT_BYTE, ITEM, LONG, METADATA, OPTIONAL_MOTION, SHORT, SHORT_BYTE, SHORT_ITEM, STRING, USHORT_BYTE
+        BOOLEAN, BULK_CHUNK, BYTE, BYTE_INT, DOUBLE, FLOAT, INT, INT_3, INT_BYTE, ITEM, LONG, METADATA, OPTIONAL_MOTION, SHORT, SHORT_BYTE, SHORT_ITEM, STRING, TEAM, USHORT_BYTE
     }
 
     static
@@ -213,6 +213,10 @@ public class PacketDefinitions
         {
             STRING, INT, INT, INT, FLOAT, BYTE
         };
+        opCodes[0x3F] = new OpCode[]
+        {
+            STRING, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, INT
+        };
         opCodes[0x46] = new OpCode[]
         {
             BYTE, BYTE
@@ -223,7 +227,7 @@ public class PacketDefinitions
         };
         opCodes[0x64] = new OpCode[]
         {
-            BYTE, BYTE, STRING, BYTE
+            BYTE, BYTE, STRING, BYTE, BOOLEAN
         };
         opCodes[0x65] = new OpCode[]
         {
@@ -297,6 +301,22 @@ public class PacketDefinitions
         {
             BYTE
         };
+        opCodes[0xCE] = new OpCode[]
+        {
+            STRING, STRING, BYTE
+        };
+        opCodes[0xCF] = new OpCode[]
+        {
+            STRING, BYTE, STRING, INT
+        };
+        opCodes[0xD0] = new OpCode[]
+        {
+            BYTE, STRING
+        };
+        opCodes[0xD1] = new OpCode[]
+        {
+            TEAM
+        };
         opCodes[0xFA] = new OpCode[]
         {
             STRING, SHORT_BYTE

protocol/src/main/java/net/md_5/bungee/protocol/netty/Instruction.java

@@ -23,9 +23,12 @@ abstract class Instruction
     static final Instruction SHORT_BYTE = new ShortHeader( BYTE );
     static final Instruction SHORT_ITEM = new ShortHeader( ITEM );
     static final Instruction STRING = new ShortHeader( new Jump( 2 ) );
+    static final Instruction TEAM = new Team();
     static final Instruction USHORT_BYTE = new UnsignedShortByte();
     // Illegal forward references below this line
     static final Instruction BYTE_INT = new ByteHeader( INT );
+    // Custom instructions
+    static final Instruction STRING_ARRAY = new ShortHeader( STRING );
 
     abstract void read(ByteBuf in) throws IOException;
 }

protocol/src/main/java/net/md_5/bungee/protocol/netty/Team.java

@@ -0,0 +1,26 @@
+package net.md_5.bungee.protocol.netty;
+
+import io.netty.buffer.ByteBuf;
+import java.io.IOException;
+
+class Team extends Instruction
+{
+
+    @Override
+    void read(ByteBuf in) throws IOException
+    {
+        STRING.read( in );
+        byte mode = in.readByte();
+        if ( mode == 0 || mode == 2 )
+        {
+            STRING.read( in );
+            STRING.read( in );
+            STRING.read( in );
+            BYTE.read( in );
+        }
+        if ( mode == 0 || mode == 3 || mode == 4 )
+        {
+            STRING_ARRAY.read( in );
+        }
+    }
+}

proxy/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.md-5</groupId>
         <artifactId>bungeecord-parent</artifactId>
-        <version>1.4.7-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -49,6 +49,14 @@
     <build>
         <finalName>BungeeCord</finalName>
         <plugins>
+            <plugin>
+                <!-- Don't deploy proxy to maven repo, only APIs -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

proxy/src/main/java/net/md_5/bungee/BungeeCord.java

@@ -54,11 +54,11 @@ public class BungeeCord extends ProxyServer
     /**
      * Server protocol version.
      */
-    public static final byte PROTOCOL_VERSION = 51;
+    public static final byte PROTOCOL_VERSION = 60;
     /**
      * Server game version.
      */
-    public static final String GAME_VERSION = "1.4.6";
+    public static final String GAME_VERSION = "1.5";
     /**
      * Current operation state.
      */