Skip to content

Commit 7d38227

Browse files
dmulloy2dmulloy2
committed
Update to Minecraft 1.11
1 parent b4f5f18 commit 7d38227

18 files changed

+99
-73
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.10.2-R0.1-SNAPSHOT</version>
199+
<version>1.11-R0.1-SNAPSHOT</version>
200200
<scope>provided</scope>
201201
</dependency>
202202
<dependency>
203203
<groupId>org.spigotmc</groupId>
204204
<artifactId>spigot</artifactId>
205-
<version>1.10.2-R0.1-SNAPSHOT</version>
205+
<version>1.11-R0.1-SNAPSHOT</version>
206206
<scope>provided</scope>
207207
</dependency>
208208
<dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ public String getPacketName() {
582582
/**
583583
* Protocol version of all the current IDs.
584584
*/
585-
private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.FROSTBURN_UPDATE;
585+
private static final MinecraftVersion PROTOCOL_VERSION = MinecraftVersion.EXPLORATION_UPDATE;
586586

587587
private final Protocol protocol;
588588
private final Sender sender;

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

Lines changed: 3 additions & 3 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.10.2";
42+
public static final String MAXIMUM_MINECRAFT_VERSION = "1.11";
4343

4444
/**
45-
* The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.10.2) was released.
45+
* The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.11) was released.
4646
*/
47-
public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-06-23";
47+
public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-11-14";
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_10_R1";
24+
public static final String PACKAGE_VERSION = "v1_11_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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ private static NavigableMap<MinecraftVersion, Integer> createLookup() {
4242
map.put(new MinecraftVersion(1, 9, 2), 109);
4343
map.put(new MinecraftVersion(1, 9, 4), 110);
4444
map.put(new MinecraftVersion(1, 10, 0), 210);
45+
map.put(new MinecraftVersion(1, 11, 0), 315);
4546
return map;
4647
}
4748

‎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.11 - the exploration update.
49+
*/
50+
public static final MinecraftVersion EXPLORATION_UPDATE = new MinecraftVersion("1.11");
51+
4752
/**
4853
* Version 1.10 - the frostburn update.
4954
*/

‎modules/ProtocolLib/pom.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<properties>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.build.number></project.build.number>
22+
<!-- Remove build number for release -->
23+
<project.fullVersion>${project.version}${project.build.number}</project.fullVersion>
2224
</properties>
2325

2426
<build>
@@ -87,11 +89,11 @@
8789
<manifestEntries>
8890
<Main-Class>com.comphenix.protocol.Application</Main-Class>
8991
<Implementation-Title>ProtocolLib</Implementation-Title>
90-
<Implementation-Version>${project.version}${project.build.number}</Implementation-Version>
92+
<Implementation-Version>${project.fullVersion}</Implementation-Version>
9193
<Implementation-Vendor>dmulloy2</Implementation-Vendor>
9294
</manifestEntries>
9395
</archive>
94-
<finalName>ProtocolLib</finalName>
96+
<finalName>${project.name}</finalName>
9597
</configuration>
9698
</plugin>
9799

@@ -234,13 +236,13 @@
234236
<dependency>
235237
<groupId>org.spigotmc</groupId>
236238
<artifactId>spigot-api</artifactId>
237-
<version>1.10.2-R0.1-SNAPSHOT</version>
239+
<version>1.11-R0.1-SNAPSHOT</version>
238240
<scope>provided</scope>
239241
</dependency>
240242
<dependency>
241243
<groupId>org.spigotmc</groupId>
242244
<artifactId>spigot</artifactId>
243-
<version>1.10.2-R0.1-SNAPSHOT</version>
245+
<version>1.11-R0.1-SNAPSHOT</version>
244246
<scope>provided</scope>
245247
</dependency>
246248
<dependency>

‎modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandProtocol.java‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.PrintWriter;
2323
import java.text.SimpleDateFormat;
2424
import java.util.Date;
25+
import java.util.HashSet;
2526
import java.util.Set;
2627
import java.util.concurrent.TimeUnit;
2728
import java.util.logging.Level;
@@ -252,16 +253,34 @@ private void dump(CommandSender sender) {
252253
pw.println();
253254

254255
Set<PacketListener> listeners = manager.getPacketListeners();
255-
if (listeners.size() > 0) {
256+
Set<Plugin> plugins = new HashSet<>();
257+
258+
if (!listeners.isEmpty()) {
256259
pw.println("Listeners:");
257260

258261
for (PacketListener listener : listeners) {
259262
pw.println(DetailedErrorReporter.getStringDescription(listener));
263+
264+
Plugin plugin = listener.getPlugin();
265+
if (plugin != null) {
266+
plugins.add(plugin);
267+
} else {
268+
pw.println("(Missing plugin!)");
269+
}
260270
}
271+
272+
pw.println();
261273
} else {
262274
pw.println("No listeners");
263275
}
264276

277+
if (!plugins.isEmpty()) {
278+
pw.println("Plugins Using ProtocolLib:");
279+
for (Plugin plugin : plugins) {
280+
pw.println(plugin.getName() + " by " + plugin.getDescription().getAuthors());
281+
}
282+
}
283+
265284
sender.sendMessage("Data dump written to " + file.getAbsolutePath());
266285
} catch (IOException ex) {
267286
ProtocolLogger.log(Level.SEVERE, "Failed to create dump:", ex);

‎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_11_R1.DispenserRegistry;
9+
810
import org.bukkit.Bukkit;
911
import org.bukkit.Server;
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;
12+
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
13+
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftItemFactory;
14+
import org.bukkit.craftbukkit.v1_11_R1.util.Versioning;
1315

1416
import com.comphenix.protocol.utility.Constants;
1517
import com.comphenix.protocol.utility.MinecraftReflection;
1618
import com.comphenix.protocol.utility.MinecraftVersion;
1719

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.util.Map;
2323
import java.util.Map.Entry;
2424

25+
import net.minecraft.server.v1_11_R1.PacketLoginInStart;
26+
2527
import org.junit.BeforeClass;
2628
import org.junit.Test;
2729

@@ -30,8 +32,6 @@
3032
import com.comphenix.protocol.injector.netty.NettyProtocolRegistry;
3133
import com.comphenix.protocol.injector.netty.ProtocolRegistry;
3234

33-
import net.minecraft.server.v1_10_R1.PacketLoginInStart;
34-
3535
/**
3636
* @author dmulloy2
3737
*/

0 commit comments

Comments
 (0)