1.8

alecgorge · Dec 24, 2014 · 201b6a3 · 201b6a3
1 parent 05c7972
commit 201b6a3
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 98 deletions.
diff --git a/jsonapi b/jsonapi
@@ -34,6 +34,7 @@ versions['1.7.2'] = package: 'v1_7_R1', cb_version: '1.7.2-R0.3'
 versions['1.7.5'] = package: 'v1_7_R2', cb_version: '1.7.5-R0.1-SNAPSHOT'
 versions['1.7.9'] = package: 'v1_7_R3', cb_version: '1.7.9-R0.2'
 versions['1.7.10'] = package: 'v1_7_R4', cb_version: '1.7.10-R0.1-SNAPSHOT'
+versions['1.8'] = package: 'v1_8_R1', cb_version: '1.8-R0.1-SNAPSHOT'
 
 versions['1.4']   = versions['1.4.7']
 versions['1.5']   = versions['1.5.2']
@@ -46,7 +47,7 @@ build_cmd = (ver, cmd = "clean install") ->
 
 	mc16OrNewer  = if v[0] >= 1 and v[1] >= 6 then "yes" else "no"
 	mc17OrNewer  = if v[0] >= 1 and v[1] >= 7 then "yes" else "no"
-	mc179OrNewer = if v[0] >= 1 and v[1] >= 7 and v[2] >= 9 then "yes" else "no"
+	mc179OrNewer = if v[0] >= 1 and v[1] >= 7 and (v.length == 2 or v[2] >= 9) then "yes" else "no"
 	return "mvn #{cmd} $@ -DmcPackage=#{ver.package} -DcbVersion=#{ver.cb_version} -Dmc16OrNewer=#{mc16OrNewer} -Dmc17OrNewer=#{mc17OrNewer} -Dmc179OrNewer=#{mc179OrNewer}"
 eclipse_cmd = (ver) ->
 	return build_cmd ver, "eclipse:eclipse"

diff --git a/pom.xml b/pom.xml
@@ -31,16 +31,6 @@
 	</organization>
 
 	<repositories>
-		<repository>
-			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/groups/public</url>
-			<releases>
-				<updatePolicy>always</updatePolicy>
-			</releases>
-			<snapshots>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
 		<repository>
 			<id>vault-repo</id>
 			<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
@@ -54,6 +44,10 @@
 			<id>ess-repo</id>
 			<url>http://repo.ess3.net/content/groups/essentials</url>
 		</repository>
+		<repository>
+    <id>shadowvolt-repo</id>
+    <url>http://ci.shadowvolt.com/plugin/repository/everything/</url>
+  </repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -274,12 +268,12 @@
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
 			<artifactId>Vault</artifactId>
-			<version>1.4.1</version>
+			<version>1.5.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.comphenix.protocol</groupId>
 			<artifactId>ProtocolLib</artifactId>
-			<version>3.4.0</version>
+			<version>3.6.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/APIv2Handler.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/APIv2Handler.java
@@ -9,15 +9,15 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.buffer.Unpooled;
-import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpRequest;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus;
-import net.minecraft.util.io.netty.handler.codec.http.HttpVersion;
-import net.minecraft.util.io.netty.handler.codec.http.QueryStringDecoder;
-import net.minecraft.util.io.netty.util.CharsetUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.QueryStringDecoder;
+import io.netty.util.CharsetUtil;
 
 import org.json.simpleForBukkit.JSONArray;
 import org.json.simpleForBukkit.JSONObject;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/BootstrapList.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/BootstrapList.java
@@ -10,11 +10,11 @@
 
 import com.google.common.collect.Lists;
 
-import net.minecraft.util.io.netty.channel.Channel;
+import io.netty.channel.Channel;
 
 // Hopefully, CB won't version these as well
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
 
 class BootstrapList implements List<Object> {
     private List<Object> delegate;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIChannelDecoder.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIChannelDecoder.java
@@ -7,13 +7,13 @@
 
 import com.alecgorge.minecraft.jsonapi.JSONAPI;
 
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.ChannelOption;
-import net.minecraft.util.io.netty.channel.ChannelPipeline;
-import net.minecraft.util.io.netty.handler.codec.ByteToMessageDecoder;
-import net.minecraft.util.io.netty.handler.codec.http.HttpObjectAggregator;
-import net.minecraft.util.io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpServerCodec;
 
 public class JSONAPIChannelDecoder extends ByteToMessageDecoder {
 	private JSONAPI						api;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIChannelReadHandler.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIChannelReadHandler.java
@@ -6,16 +6,16 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.buffer.ByteBufInputStream;
-import net.minecraft.util.io.netty.buffer.ByteBufOutputStream;
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelHandler;
-import net.minecraft.util.io.netty.channel.ChannelHandler.Sharable;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
-import net.minecraft.util.io.netty.channel.nio.NioEventLoopGroup;
-import net.minecraft.util.io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.handler.codec.MessageToByteEncoder;
 
 import com.alecgorge.minecraft.jsonapi.JSONAPI;
 import com.alecgorge.minecraft.jsonapi.JSONServer;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIHandler.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIHandler.java
@@ -2,31 +2,31 @@
 //#else
 package com.alecgorge.minecraft.jsonapi.packets.netty;
 
-import static net.minecraft.util.io.netty.handler.codec.http.HttpHeaders.isKeepAlive;
-import static net.minecraft.util.io.netty.handler.codec.http.HttpHeaders.Names.HOST;
-import static net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
-import static net.minecraft.util.io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static io.netty.handler.codec.http.HttpHeaders.isKeepAlive;
+import static io.netty.handler.codec.http.HttpHeaders.Names.HOST;
+import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
 import java.io.IOException;
 
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelFutureListener;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.SimpleChannelInboundHandler;
-import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpRequest;
-import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpRequest;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.HttpMethod;
-import net.minecraft.util.io.netty.handler.codec.http.QueryStringDecoder;
-import net.minecraft.util.io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import net.minecraft.util.io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import net.minecraft.util.io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
-import net.minecraft.util.io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import net.minecraft.util.io.netty.handler.codec.http.websocketx.WebSocketFrame;
-import net.minecraft.util.io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
-import net.minecraft.util.io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
-import net.minecraft.util.io.netty.util.CharsetUtil;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.QueryStringDecoder;
+import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
+import io.netty.util.CharsetUtil;
 
 import com.alecgorge.minecraft.jsonapi.JSONAPI;
 import com.alecgorge.minecraft.jsonapi.streams.StreamingResponse;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPINettyInjector.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPINettyInjector.java
@@ -1,7 +1,7 @@
 package com.alecgorge.minecraft.jsonapi.packets.netty;
 
 //#if mc17OrNewer=="yes"
-import net.minecraft.util.io.netty.channel.Channel;
+import io.netty.channel.Channel;
 
 import com.alecgorge.minecraft.jsonapi.packets.netty.router.JSONAPIDefaultRoutes;
 //#endif

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/NettyInjector.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/NettyInjector.java
@@ -5,13 +5,13 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
-import net.minecraft.util.io.netty.channel.Channel;
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelHandler;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.ChannelInboundHandler;
-import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
-import net.minecraft.util.io.netty.channel.ChannelInitializer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandler;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
 
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.VolatileField;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/JSONAPIDefaultRoutes.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/JSONAPIDefaultRoutes.java
@@ -2,13 +2,13 @@
 
 //#if mc17OrNewer!="yes"
 //#else
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.buffer.Unpooled;
-import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus;
-import net.minecraft.util.io.netty.handler.codec.http.HttpVersion;
-import net.minecraft.util.io.netty.util.CharsetUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.CharsetUtil;
 
 import com.alecgorge.minecraft.jsonapi.JSONAPI;
 import com.alecgorge.minecraft.jsonapi.packets.netty.APIv2Handler;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/RouteMatcher.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/RouteMatcher.java
@@ -18,9 +18,9 @@
  * You may elect to redistribute this code under either of these licenses.
  */
 
-import static net.minecraft.util.io.netty.handler.codec.http.HttpHeaders.isKeepAlive;
-import static net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
-import static net.minecraft.util.io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static io.netty.handler.codec.http.HttpHeaders.isKeepAlive;
+import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,17 +31,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.minecraft.util.io.netty.channel.ChannelFuture;
-import net.minecraft.util.io.netty.channel.ChannelFutureListener;
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.channel.SimpleChannelInboundHandler;
-import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpRequest;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
-import net.minecraft.util.io.netty.handler.codec.http.HttpMethod;
-import net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus;
-import net.minecraft.util.io.netty.handler.codec.http.HttpVersion;
-import net.minecraft.util.io.netty.handler.codec.http.QueryStringDecoder;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.QueryStringDecoder;
 
 import com.google.code.regexp.NamedMatcher;
 import com.google.code.regexp.NamedPattern;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/RoutedHttpRequest.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/RoutedHttpRequest.java
@@ -2,8 +2,8 @@
 
 //#if mc17OrNewer!="yes"
 //#else
-import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.FullHttpRequest;
 
 public class RoutedHttpRequest {
 	ChannelHandlerContext	ctx;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/RoutedHttpResponse.java b/src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/RoutedHttpResponse.java
@@ -2,8 +2,8 @@
 
 //#if mc17OrNewer!="yes"
 //#else
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpRequest;
-import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
 
 public class RoutedHttpResponse {
 	FullHttpResponse	res;

diff --git a/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java b/src/main/java/com/alecgorge/minecraft/jsonapi/util/OfflinePlayerLoader.java
@@ -8,7 +8,7 @@
 //$import net.minecraft.server./*$mcversion$*/.*;
 //$import org.bukkit.craftbukkit./*$mcversion$*/.*;
 //#if mc17OrNewer=="yes"
-import net.minecraft.util.com.mojang.authlib.GameProfile;
+import com.mojang.authlib.GameProfile;
 //#endif
 //#else
 import net.minecraft.server.v1_7_R1.*;