Skip to content

Commit f51427b

Browse files
dmulloy2dmulloy2
committed
Update to 1.10
1 parent cdcb6a6 commit f51427b

17 files changed

+76
-88
lines changed

‎modules/API/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@
196196
<dependency>
197197
<groupId>org.spigotmc</groupId>
198198
<artifactId>spigot-api</artifactId>
199-
<version>1.9.4-R0.1-SNAPSHOT</version>
199+
<version>1.10-R0.1-SNAPSHOT</version>
200200
<scope>provided</scope>
201201
</dependency>
202202
<dependency>
203203
<groupId>org.spigotmc</groupId>
204204
<artifactId>spigot</artifactId>
205-
<version>1.9.4-R0.1-SNAPSHOT</version>
205+
<version>1.10-R0.1-SNAPSHOT</version>
206206
<scope>provided</scope>
207207
</dependency>
208208
<dependency>

‎modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public class ProtocolLibrary {
3939
/**
4040
* The maximum version ProtocolLib has been tested with.
4141
*/
42-
public static final String MAXIMUM_MINECRAFT_VERSION = "1.9.4";
42+
public static final String MAXIMUM_MINECRAFT_VERSION = "1.10";
4343

4444
/**
4545
* The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.9.4) was released.
4646
*/
47-
public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-05-10";
47+
public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-06-08";
4848

4949
/**
5050
* Plugins that are currently incompatible with ProtocolLib.

‎modules/API/src/main/java/com/comphenix/protocol/utility/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222

2323
public final class Constants {
24-
public static final String PACKAGE_VERSION = "v1_9_R2";
24+
public static final String PACKAGE_VERSION = "v1_10_R1";
2525
public static final String NMS = "net.minecraft.server." + PACKAGE_VERSION;
2626
public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
2727
}

‎modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.util.NavigableMap;
55
import java.util.TreeMap;
66

7-
import com.comphenix.protocol.ProtocolLibrary;
87
import com.google.common.collect.Maps;
98

109
/**
@@ -42,6 +41,7 @@ private static NavigableMap<MinecraftVersion, Integer> createLookup() {
4241
map.put(new MinecraftVersion(1, 9, 0), 107);
4342
map.put(new MinecraftVersion(1, 9, 2), 109);
4443
map.put(new MinecraftVersion(1, 9, 4), 110);
44+
map.put(new MinecraftVersion(1, 10, 0), 210);
4545
return map;
4646
}
4747

@@ -50,7 +50,7 @@ private static NavigableMap<MinecraftVersion, Integer> createLookup() {
5050
* @return The version number.
5151
*/
5252
public static int getCurrentVersion() {
53-
return getVersion(ProtocolLibrary.getProtocolManager().getMinecraftVersion());
53+
return getVersion(MinecraftVersion.getCurrentVersion());
5454
}
5555

5656
/**

‎modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ public class MinecraftVersion implements Comparable<MinecraftVersion>, Serializa
4444
*/
4545
private static final Pattern VERSION_PATTERN = Pattern.compile(".*\\(.*MC.\\s*([a-zA-z0-9\\-\\.]+)\\s*\\)");
4646

47+
/**
48+
* Version 1.10 - the frostburn update.
49+
*/
50+
public static final MinecraftVersion FROSTBURN_UPDATE = new MinecraftVersion("1.10");
51+
4752
/**
4853
* Version 1.9 - the combat update.
4954
*/

‎modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java‎

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package com.comphenix.protocol.wrappers;
22

3-
import io.netty.buffer.ByteBuf;
4-
import io.netty.buffer.Unpooled;
5-
import io.netty.handler.codec.base64.Base64;
6-
73
import java.awt.image.BufferedImage;
84
import java.awt.image.RenderedImage;
95
import java.io.ByteArrayInputStream;
@@ -19,40 +15,32 @@
1915
import org.bukkit.entity.Player;
2016

2117
import com.comphenix.protocol.PacketType;
22-
import com.comphenix.protocol.ProtocolLibrary;
23-
import com.comphenix.protocol.ProtocolManager;
2418
import com.comphenix.protocol.injector.BukkitUnwrapper;
2519
import com.comphenix.protocol.reflect.EquivalentConverter;
2620
import com.comphenix.protocol.reflect.accessors.Accessors;
2721
import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
2822
import com.comphenix.protocol.reflect.accessors.FieldAccessor;
2923
import com.comphenix.protocol.reflect.accessors.MethodAccessor;
24+
import com.comphenix.protocol.utility.MinecraftProtocolVersion;
3025
import com.comphenix.protocol.utility.MinecraftReflection;
3126
import com.comphenix.protocol.utility.MinecraftVersion;
3227
import com.comphenix.protocol.utility.Util;
3328
import com.google.common.base.Charsets;
3429
import com.google.common.base.Preconditions;
3530
import com.google.common.base.Splitter;
3631
import com.google.common.collect.ImmutableList;
37-
import com.google.common.collect.ImmutableMap;
3832
import com.google.common.collect.Lists;
3933
import com.google.common.io.ByteStreams;
4034

35+
import io.netty.buffer.ByteBuf;
36+
import io.netty.buffer.Unpooled;
37+
import io.netty.handler.codec.base64.Base64;
38+
4139
/**
4240
* Represents a server ping packet data.
4341
* @author Kristian
4442
*/
4543
public class WrappedServerPing extends AbstractWrapper {
46-
/**
47-
* Lookup of Minecraft versions and ping version numbers.
48-
*/
49-
private static ImmutableMap<MinecraftVersion, Integer> VERSION_NUMBERS = ImmutableMap.<MinecraftVersion, Integer>builder()
50-
.put(MinecraftVersion.WORLD_UPDATE, 4)
51-
.put(MinecraftVersion.SKIN_UPDATE, 5)
52-
.put(MinecraftVersion.BOUNTIFUL_UPDATE, 47)
53-
.build();
54-
private static MinecraftVersion LAST_VERSION = MinecraftVersion.BOUNTIFUL_UPDATE;
55-
5644
private static Class<?> GAME_PROFILE = MinecraftReflection.getGameProfileClass();
5745
private static Class<?> GAME_PROFILE_ARRAY = MinecraftReflection.getArrayClass(GAME_PROFILE);
5846

@@ -101,7 +89,7 @@ public class WrappedServerPing extends AbstractWrapper {
10189
/**
10290
* Construct a new server ping initialized with a zero player count, and zero maximum.
10391
* <p>
104-
* Note that the version string is set to 1.8.
92+
* Note that the version string is set to 1.9.4.
10593
*/
10694
public WrappedServerPing() {
10795
super(MinecraftReflection.getServerPingClass());
@@ -129,14 +117,8 @@ protected void resetPlayers() {
129117
* Reset the version string to the default state.
130118
*/
131119
protected void resetVersion() {
132-
ProtocolManager manager = ProtocolLibrary.getProtocolManager();
133-
MinecraftVersion minecraftVersion = LAST_VERSION;
134-
135-
// Fetch the latest known version
136-
if (manager != null) {
137-
minecraftVersion = manager.getMinecraftVersion();
138-
}
139-
version = VERSION_CONSTRUCTOR.invoke(minecraftVersion.toString(), VERSION_NUMBERS.get(minecraftVersion));
120+
MinecraftVersion minecraftVersion = MinecraftVersion.getCurrentVersion();
121+
version = VERSION_CONSTRUCTOR.invoke(minecraftVersion.toString(), MinecraftProtocolVersion.getCurrentVersion());
140122
VERSION.set(handle, version);
141123
}
142124

‎modules/ProtocolLib/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@
234234
<dependency>
235235
<groupId>org.spigotmc</groupId>
236236
<artifactId>spigot-api</artifactId>
237-
<version>1.9.4-R0.1-SNAPSHOT</version>
237+
<version>1.10-R0.1-SNAPSHOT</version>
238238
<scope>provided</scope>
239239
</dependency>
240240
<dependency>
241241
<groupId>org.spigotmc</groupId>
242242
<artifactId>spigot</artifactId>
243-
<version>1.9.4-R0.1-SNAPSHOT</version>
243+
<version>1.10-R0.1-SNAPSHOT</version>
244244
<scope>provided</scope>
245245
</dependency>
246246
<dependency>

‎modules/ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
import java.util.logging.Logger;
77

8-
import net.minecraft.server.v1_9_R2.DispenserRegistry;
9-
108
import org.bukkit.Bukkit;
119
import org.bukkit.Server;
12-
import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
13-
import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemFactory;
14-
import org.bukkit.craftbukkit.v1_9_R2.util.Versioning;
10+
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
11+
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemFactory;
12+
import org.bukkit.craftbukkit.v1_10_R1.util.Versioning;
1513

1614
import com.comphenix.protocol.utility.Constants;
1715
import com.comphenix.protocol.utility.MinecraftReflection;
1816
import com.comphenix.protocol.utility.MinecraftVersion;
1917

18+
import net.minecraft.server.v1_10_R1.DispenserRegistry;
19+
2020
/**
2121
* Used to ensure that ProtocolLib and Bukkit is prepared to be tested.
2222
*

‎modules/ProtocolLib/src/test/java/com/comphenix/protocol/PacketTypeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.comphenix.protocol.injector.netty.NettyProtocolRegistry;
1515
import com.comphenix.protocol.injector.netty.ProtocolRegistry;
1616

17-
import net.minecraft.server.v1_9_R2.PacketLoginInStart;
17+
import net.minecraft.server.v1_10_R1.PacketLoginInStart;
1818

1919
public class PacketTypeTest {
2020

‎modules/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@
2828
import java.util.Objects;
2929
import java.util.UUID;
3030

31-
import net.minecraft.server.v1_9_R2.AttributeModifier;
32-
import net.minecraft.server.v1_9_R2.DataWatcher;
33-
import net.minecraft.server.v1_9_R2.Entity;
34-
import net.minecraft.server.v1_9_R2.EntityLightning;
35-
import net.minecraft.server.v1_9_R2.MobEffect;
36-
import net.minecraft.server.v1_9_R2.MobEffectList;
37-
import net.minecraft.server.v1_9_R2.PacketPlayOutBoss;
38-
import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes;
39-
import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot;
40-
4131
import org.apache.commons.lang.SerializationUtils;
4232
import org.apache.commons.lang3.builder.EqualsBuilder;
4333
import org.bukkit.ChatColor;
@@ -76,6 +66,16 @@
7666
import com.comphenix.protocol.wrappers.nbt.NbtFactory;
7767
import com.google.common.collect.Lists;
7868

69+
import net.minecraft.server.v1_10_R1.AttributeModifier;
70+
import net.minecraft.server.v1_10_R1.DataWatcher;
71+
import net.minecraft.server.v1_10_R1.Entity;
72+
import net.minecraft.server.v1_10_R1.EntityLightning;
73+
import net.minecraft.server.v1_10_R1.MobEffect;
74+
import net.minecraft.server.v1_10_R1.MobEffectList;
75+
import net.minecraft.server.v1_10_R1.PacketPlayOutBoss;
76+
import net.minecraft.server.v1_10_R1.PacketPlayOutUpdateAttributes;
77+
import net.minecraft.server.v1_10_R1.PacketPlayOutUpdateAttributes.AttributeSnapshot;
78+
7979
// Ensure that the CraftItemFactory is mockable
8080
@RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
8181
@PowerMockIgnore({ "org.apache.log4j.*", "org.apache.logging.*", "org.bukkit.craftbukkit.libs.jline.*" })

0 commit comments

Comments
 (0)