Skip to content

Commit 201b6a3

Browse files
alecgorgealecgorge
committed
1.8
1 parent 05c7972 commit 201b6a3

14 files changed

+93
-98
lines changed

‎jsonapi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ versions['1.7.2'] = package: 'v1_7_R1', cb_version: '1.7.2-R0.3'
3434
versions['1.7.5'] = package: 'v1_7_R2', cb_version: '1.7.5-R0.1-SNAPSHOT'
3535
versions['1.7.9'] = package: 'v1_7_R3', cb_version: '1.7.9-R0.2'
3636
versions['1.7.10'] = package: 'v1_7_R4', cb_version: '1.7.10-R0.1-SNAPSHOT'
37+
versions['1.8'] = package: 'v1_8_R1', cb_version: '1.8-R0.1-SNAPSHOT'
3738

3839
versions['1.4'] = versions['1.4.7']
3940
versions['1.5'] = versions['1.5.2']
@@ -46,7 +47,7 @@ build_cmd = (ver, cmd = "clean install") ->
4647

4748
mc16OrNewer = if v[0] >= 1 and v[1] >= 6 then "yes" else "no"
4849
mc17OrNewer = if v[0] >= 1 and v[1] >= 7 then "yes" else "no"
49-
mc179OrNewer = if v[0] >= 1 and v[1] >= 7 and v[2] >= 9 then "yes" else "no"
50+
mc179OrNewer = if v[0] >= 1 and v[1] >= 7 and (v.length == 2 or v[2] >= 9) then "yes" else "no"
5051
return "mvn #{cmd} $@ -DmcPackage=#{ver.package} -DcbVersion=#{ver.cb_version} -Dmc16OrNewer=#{mc16OrNewer} -Dmc17OrNewer=#{mc17OrNewer} -Dmc179OrNewer=#{mc179OrNewer}"
5152
eclipse_cmd = (ver) ->
5253
return build_cmd ver, "eclipse:eclipse"

‎pom.xml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,6 @@
3131
</organization>
3232

3333
<repositories>
34-
<repository>
35-
<id>bukkit-repo</id>
36-
<url>http://repo.bukkit.org/content/groups/public</url>
37-
<releases>
38-
<updatePolicy>always</updatePolicy>
39-
</releases>
40-
<snapshots>
41-
<updatePolicy>always</updatePolicy>
42-
</snapshots>
43-
</repository>
4434
<repository>
4535
<id>vault-repo</id>
4636
<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
@@ -54,6 +44,10 @@
5444
<id>ess-repo</id>
5545
<url>http://repo.ess3.net/content/groups/essentials</url>
5646
</repository>
47+
<repository>
48+
<id>shadowvolt-repo</id>
49+
<url>http://ci.shadowvolt.com/plugin/repository/everything/</url>
50+
</repository>
5751
</repositories>
5852
<pluginRepositories>
5953
<pluginRepository>
@@ -274,12 +268,12 @@
274268
<dependency>
275269
<groupId>net.milkbowl.vault</groupId>
276270
<artifactId>Vault</artifactId>
277-
<version>1.4.1</version>
271+
<version>1.5.2</version>
278272
</dependency>
279273
<dependency>
280274
<groupId>com.comphenix.protocol</groupId>
281275
<artifactId>ProtocolLib</artifactId>
282-
<version>3.4.0</version>
276+
<version>3.6.3-SNAPSHOT</version>
283277
</dependency>
284278
<dependency>
285279
<groupId>io.netty</groupId>

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/APIv2Handler.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
import java.util.List;
1010
import java.util.logging.Logger;
1111

12-
import net.minecraft.util.io.netty.buffer.ByteBuf;
13-
import net.minecraft.util.io.netty.buffer.Unpooled;
14-
import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpResponse;
15-
import net.minecraft.util.io.netty.handler.codec.http.FullHttpRequest;
16-
import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
17-
import net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus;
18-
import net.minecraft.util.io.netty.handler.codec.http.HttpVersion;
19-
import net.minecraft.util.io.netty.handler.codec.http.QueryStringDecoder;
20-
import net.minecraft.util.io.netty.util.CharsetUtil;
12+
import io.netty.buffer.ByteBuf;
13+
import io.netty.buffer.Unpooled;
14+
import io.netty.handler.codec.http.DefaultFullHttpResponse;
15+
import io.netty.handler.codec.http.FullHttpRequest;
16+
import io.netty.handler.codec.http.FullHttpResponse;
17+
import io.netty.handler.codec.http.HttpResponseStatus;
18+
import io.netty.handler.codec.http.HttpVersion;
19+
import io.netty.handler.codec.http.QueryStringDecoder;
20+
import io.netty.util.CharsetUtil;
2121

2222
import org.json.simpleForBukkit.JSONArray;
2323
import org.json.simpleForBukkit.JSONObject;

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/BootstrapList.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
import com.google.common.collect.Lists;
1212

13-
import net.minecraft.util.io.netty.channel.Channel;
13+
import io.netty.channel.Channel;
1414

1515
// Hopefully, CB won't version these as well
16-
import net.minecraft.util.io.netty.channel.ChannelFuture;
17-
import net.minecraft.util.io.netty.channel.ChannelHandler;
16+
import io.netty.channel.ChannelFuture;
17+
import io.netty.channel.ChannelHandler;
1818

1919
class BootstrapList implements List<Object> {
2020
private List<Object> delegate;

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIChannelDecoder.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import com.alecgorge.minecraft.jsonapi.JSONAPI;
99

10-
import net.minecraft.util.io.netty.buffer.ByteBuf;
11-
import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
12-
import net.minecraft.util.io.netty.channel.ChannelOption;
13-
import net.minecraft.util.io.netty.channel.ChannelPipeline;
14-
import net.minecraft.util.io.netty.handler.codec.ByteToMessageDecoder;
15-
import net.minecraft.util.io.netty.handler.codec.http.HttpObjectAggregator;
16-
import net.minecraft.util.io.netty.handler.codec.http.HttpServerCodec;
10+
import io.netty.buffer.ByteBuf;
11+
import io.netty.channel.ChannelHandlerContext;
12+
import io.netty.channel.ChannelOption;
13+
import io.netty.channel.ChannelPipeline;
14+
import io.netty.handler.codec.ByteToMessageDecoder;
15+
import io.netty.handler.codec.http.HttpObjectAggregator;
16+
import io.netty.handler.codec.http.HttpServerCodec;
1717

1818
public class JSONAPIChannelDecoder extends ByteToMessageDecoder {
1919
private JSONAPI api;

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIChannelReadHandler.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
import java.util.List;
77
import java.util.Map.Entry;
88

9-
import net.minecraft.util.io.netty.buffer.ByteBuf;
10-
import net.minecraft.util.io.netty.buffer.ByteBufInputStream;
11-
import net.minecraft.util.io.netty.buffer.ByteBufOutputStream;
12-
import net.minecraft.util.io.netty.channel.Channel;
13-
import net.minecraft.util.io.netty.channel.ChannelHandler;
14-
import net.minecraft.util.io.netty.channel.ChannelHandler.Sharable;
15-
import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
16-
import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
17-
import net.minecraft.util.io.netty.channel.nio.NioEventLoopGroup;
18-
import net.minecraft.util.io.netty.handler.codec.MessageToByteEncoder;
9+
import io.netty.buffer.ByteBuf;
10+
import io.netty.buffer.ByteBufInputStream;
11+
import io.netty.buffer.ByteBufOutputStream;
12+
import io.netty.channel.Channel;
13+
import io.netty.channel.ChannelHandler;
14+
import io.netty.channel.ChannelHandler.Sharable;
15+
import io.netty.channel.ChannelHandlerContext;
16+
import io.netty.channel.ChannelInboundHandlerAdapter;
17+
import io.netty.channel.nio.NioEventLoopGroup;
18+
import io.netty.handler.codec.MessageToByteEncoder;
1919

2020
import com.alecgorge.minecraft.jsonapi.JSONAPI;
2121
import com.alecgorge.minecraft.jsonapi.JSONServer;

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPIHandler.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
//#else
33
package com.alecgorge.minecraft.jsonapi.packets.netty;
44

5-
import static net.minecraft.util.io.netty.handler.codec.http.HttpHeaders.isKeepAlive;
6-
import static net.minecraft.util.io.netty.handler.codec.http.HttpHeaders.Names.HOST;
7-
import static net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
8-
import static net.minecraft.util.io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
5+
import static io.netty.handler.codec.http.HttpHeaders.isKeepAlive;
6+
import static io.netty.handler.codec.http.HttpHeaders.Names.HOST;
7+
import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
8+
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
99

1010
import java.io.IOException;
1111

12-
import net.minecraft.util.io.netty.channel.ChannelFuture;
13-
import net.minecraft.util.io.netty.channel.ChannelFutureListener;
14-
import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
15-
import net.minecraft.util.io.netty.channel.SimpleChannelInboundHandler;
16-
import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpRequest;
17-
import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpResponse;
18-
import net.minecraft.util.io.netty.handler.codec.http.FullHttpRequest;
19-
import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
20-
import net.minecraft.util.io.netty.handler.codec.http.HttpMethod;
21-
import net.minecraft.util.io.netty.handler.codec.http.QueryStringDecoder;
22-
import net.minecraft.util.io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
23-
import net.minecraft.util.io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
24-
import net.minecraft.util.io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
25-
import net.minecraft.util.io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
26-
import net.minecraft.util.io.netty.handler.codec.http.websocketx.WebSocketFrame;
27-
import net.minecraft.util.io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
28-
import net.minecraft.util.io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
29-
import net.minecraft.util.io.netty.util.CharsetUtil;
12+
import io.netty.channel.ChannelFuture;
13+
import io.netty.channel.ChannelFutureListener;
14+
import io.netty.channel.ChannelHandlerContext;
15+
import io.netty.channel.SimpleChannelInboundHandler;
16+
import io.netty.handler.codec.http.DefaultFullHttpRequest;
17+
import io.netty.handler.codec.http.DefaultFullHttpResponse;
18+
import io.netty.handler.codec.http.FullHttpRequest;
19+
import io.netty.handler.codec.http.FullHttpResponse;
20+
import io.netty.handler.codec.http.HttpMethod;
21+
import io.netty.handler.codec.http.QueryStringDecoder;
22+
import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
23+
import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
24+
import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
25+
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
26+
import io.netty.handler.codec.http.websocketx.WebSocketFrame;
27+
import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
28+
import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
29+
import io.netty.util.CharsetUtil;
3030

3131
import com.alecgorge.minecraft.jsonapi.JSONAPI;
3232
import com.alecgorge.minecraft.jsonapi.streams.StreamingResponse;

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/JSONAPINettyInjector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.alecgorge.minecraft.jsonapi.packets.netty;
22

33
//#if mc17OrNewer=="yes"
4-
import net.minecraft.util.io.netty.channel.Channel;
4+
import io.netty.channel.Channel;
55

66
import com.alecgorge.minecraft.jsonapi.packets.netty.router.JSONAPIDefaultRoutes;
77
//#endif

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/NettyInjector.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import java.lang.reflect.Field;
66
import java.lang.reflect.Method;
77
import java.util.List;
8-
import net.minecraft.util.io.netty.channel.Channel;
9-
import net.minecraft.util.io.netty.channel.ChannelFuture;
10-
import net.minecraft.util.io.netty.channel.ChannelHandler;
11-
import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
12-
import net.minecraft.util.io.netty.channel.ChannelInboundHandler;
13-
import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
14-
import net.minecraft.util.io.netty.channel.ChannelInitializer;
8+
import io.netty.channel.Channel;
9+
import io.netty.channel.ChannelFuture;
10+
import io.netty.channel.ChannelHandler;
11+
import io.netty.channel.ChannelHandlerContext;
12+
import io.netty.channel.ChannelInboundHandler;
13+
import io.netty.channel.ChannelInboundHandlerAdapter;
14+
import io.netty.channel.ChannelInitializer;
1515

1616
import com.comphenix.protocol.reflect.FuzzyReflection;
1717
import com.comphenix.protocol.reflect.VolatileField;

‎src/main/java/com/alecgorge/minecraft/jsonapi/packets/netty/router/JSONAPIDefaultRoutes.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
//#if mc17OrNewer!="yes"
44
//#else
5-
import net.minecraft.util.io.netty.buffer.ByteBuf;
6-
import net.minecraft.util.io.netty.buffer.Unpooled;
7-
import net.minecraft.util.io.netty.handler.codec.http.DefaultFullHttpResponse;
8-
import net.minecraft.util.io.netty.handler.codec.http.FullHttpResponse;
9-
import net.minecraft.util.io.netty.handler.codec.http.HttpResponseStatus;
10-
import net.minecraft.util.io.netty.handler.codec.http.HttpVersion;
11-
import net.minecraft.util.io.netty.util.CharsetUtil;
5+
import io.netty.buffer.ByteBuf;
6+
import io.netty.buffer.Unpooled;
7+
import io.netty.handler.codec.http.DefaultFullHttpResponse;
8+
import io.netty.handler.codec.http.FullHttpResponse;
9+
import io.netty.handler.codec.http.HttpResponseStatus;
10+
import io.netty.handler.codec.http.HttpVersion;
11+
import io.netty.util.CharsetUtil;
1212

1313
import com.alecgorge.minecraft.jsonapi.JSONAPI;
1414
import com.alecgorge.minecraft.jsonapi.packets.netty.APIv2Handler;

0 commit comments

Comments
 (0)