Skip to content
This repository was archived by the owner on Aug 31, 2019. It is now read-only.

Commit 451ac44

Browse files
committed
Snapshot support
1 parent c24a0c6 commit 451ac44

11 files changed

+7189
-96
lines changed
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
From 2efc57050fec1d420a0cbfca71bba0d75a7fb832 Mon Sep 17 00:00:00 2001
2+
From: mrapple <[email protected]>
3+
Date: Mon, 1 Sep 2014 00:34:00 -0500
4+
Subject: [PATCH] Snapshot protocol
5+
6+
7+
diff --git a/src/main/java/org/bukkit/ProtocolVersion.java b/src/main/java/org/bukkit/ProtocolVersion.java
8+
new file mode 100644
9+
index 0000000..0df20f6
10+
--- /dev/null
11+
+++ b/src/main/java/org/bukkit/ProtocolVersion.java
12+
@@ -0,0 +1,41 @@
13+
+package org.bukkit;
14+
+
15+
+import java.util.*;
16+
+
17+
+/**
18+
+ * The ProtocolVersion enum is an enumeration of all protocol versions supported
19+
+ * by the server implementation.
20+
+ */
21+
+public enum ProtocolVersion {
22+
+
23+
+ MC_1_7("1.7", 4, 5),
24+
+ MC_1_8("1.8", 41, 42, 43, 44, 45, 46, 47),
25+
+ UNKNOWN("Unknown", -1);
26+
+
27+
+ private static final ProtocolVersion[] VALUES = ProtocolVersion.values();
28+
+ private final List<Integer> protocolVersions;
29+
+ private final String versionName;
30+
+
31+
+ private ProtocolVersion(String versionName, Integer... protocolVersions) {
32+
+ this.versionName = versionName;
33+
+ this.protocolVersions = new ArrayList<Integer>(Arrays.asList(protocolVersions));
34+
+ }
35+
+
36+
+ public List<Integer> getProtocolVersions() {
37+
+ return protocolVersions;
38+
+ }
39+
+
40+
+ public String getVersionName() {
41+
+ return versionName;
42+
+ }
43+
+
44+
+ public static ProtocolVersion getVersion(int versionNumber) {
45+
+ for (ProtocolVersion ver : VALUES) {
46+
+ if (ver.getProtocolVersions().contains(versionNumber)) {
47+
+ return ver;
48+
+ }
49+
+ }
50+
+
51+
+ return ProtocolVersion.UNKNOWN;
52+
+ }
53+
+}
54+
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
55+
index c4cd0d7..fbe28f0 100644
56+
--- a/src/main/java/org/bukkit/entity/Player.java
57+
+++ b/src/main/java/org/bukkit/entity/Player.java
58+
@@ -1162,4 +1162,13 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
59+
* @return The locale
60+
*/
61+
public String getLocale();
62+
- }
63+
+
64+
+ // XimeBukkit start - 1.8 protocol support
65+
+ /**
66+
+ * Gets the client's version.
67+
+ *
68+
+ * @return {@link ProtocolVersion} enum describing what version the client is using
69+
+ */
70+
+ public org.bukkit.ProtocolVersion getProtocolVersion();
71+
+ // XimeBukkit end
72+
+}
73+
--
74+
1.8.5.2 (Apple Git-48)
75+

CraftBukkit/0001-Add-necessary-files-from-mc-dev.patch

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 17750effc418b52ca73629795cb0f4deeef4039f Mon Sep 17 00:00:00 2001
1+
From f758839b7f6e264ce324caaad53307e1ba74152d Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Tue, 18 Dec 2012 22:12:16 -0600
44
Subject: [PATCH] Add necessary files from mc-dev
@@ -1282,6 +1282,68 @@ index 0000000..115fee6
12821282
+ this.a((PacketPlayOutListener) packetlistener);
12831283
+ }
12841284
+}
1285+
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutOpenWindow.java b/src/main/java/net/minecraft/server/PacketPlayOutOpenWindow.java
1286+
new file mode 100644
1287+
index 0000000..a26bc77
1288+
--- /dev/null
1289+
+++ b/src/main/java/net/minecraft/server/PacketPlayOutOpenWindow.java
1290+
@@ -0,0 +1,56 @@
1291+
+package net.minecraft.server;
1292+
+
1293+
+public class PacketPlayOutOpenWindow extends Packet {
1294+
+
1295+
+ private int a;
1296+
+ private int b;
1297+
+ private String c;
1298+
+ private int d;
1299+
+ private boolean e;
1300+
+ private int f;
1301+
+
1302+
+ public PacketPlayOutOpenWindow() {}
1303+
+
1304+
+ public PacketPlayOutOpenWindow(int i, int j, String s, int k, boolean flag) {
1305+
+ this.a = i;
1306+
+ this.b = j;
1307+
+ this.c = s;
1308+
+ this.d = k;
1309+
+ this.e = flag;
1310+
+ }
1311+
+
1312+
+ public PacketPlayOutOpenWindow(int i, int j, String s, int k, boolean flag, int l) {
1313+
+ this(i, j, s, k, flag);
1314+
+ this.f = l;
1315+
+ }
1316+
+
1317+
+ public void a(PacketPlayOutListener packetplayoutlistener) {
1318+
+ packetplayoutlistener.a(this);
1319+
+ }
1320+
+
1321+
+ public void a(PacketDataSerializer packetdataserializer) {
1322+
+ this.a = packetdataserializer.readUnsignedByte();
1323+
+ this.b = packetdataserializer.readUnsignedByte();
1324+
+ this.c = packetdataserializer.c(32);
1325+
+ this.d = packetdataserializer.readUnsignedByte();
1326+
+ this.e = packetdataserializer.readBoolean();
1327+
+ if (this.b == 11) {
1328+
+ this.f = packetdataserializer.readInt();
1329+
+ }
1330+
+ }
1331+
+
1332+
+ public void b(PacketDataSerializer packetdataserializer) {
1333+
+ packetdataserializer.writeByte(this.a);
1334+
+ packetdataserializer.writeByte(this.b);
1335+
+ packetdataserializer.a(this.c);
1336+
+ packetdataserializer.writeByte(this.d);
1337+
+ packetdataserializer.writeBoolean(this.e);
1338+
+ if (this.b == 11) {
1339+
+ packetdataserializer.writeInt(this.f);
1340+
+ }
1341+
+ }
1342+
+
1343+
+ public void handle(PacketListener packetlistener) {
1344+
+ this.a((PacketPlayOutListener) packetlistener);
1345+
+ }
1346+
+}
12851347
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java
12861348
new file mode 100644
12871349
index 0000000..a58dc60

CraftBukkit/0077-Fix-unloaded-chunk-freezing.patch

Lines changed: 0 additions & 90 deletions
This file was deleted.

CraftBukkit/0078-Simplify-junk-login-messages.patch renamed to CraftBukkit/0077-Simplify-junk-login-messages.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5ca14a19570b77133e0ab19e488522a292701667 Mon Sep 17 00:00:00 2001
1+
From 25fb006af0c478a5f7e42b1beadfab44ae35d1d5 Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Fri, 1 Aug 2014 12:51:06 -0500
44
Subject: [PATCH] Simplify junk login messages

CraftBukkit/0079-Fix-skull-bedrock-breaking-bug.patch renamed to CraftBukkit/0078-Fix-skull-bedrock-breaking-bug.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5acf3aed098bcfe0658ff710de7c65dfab189022 Mon Sep 17 00:00:00 2001
1+
From 3453c6a02af1b3b15e029904f0fc63d047d41f16 Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Mon, 11 Aug 2014 10:58:32 -0500
44
Subject: [PATCH] Fix skull bedrock breaking bug

CraftBukkit/0080-Remove-Overmapped-and-legacy-methods.patch renamed to CraftBukkit/0079-Remove-Overmapped-and-legacy-methods.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 76b51c83620b6df11aaae3493225df3eb69f1334 Mon Sep 17 00:00:00 2001
1+
From 87ac491e16ce0dce92ceb4cdfd95447d4737b567 Mon Sep 17 00:00:00 2001
22
From: Jedediah Smith <[email protected]>
33
Date: Thu, 21 Aug 2014 02:21:45 -0400
44
Subject: [PATCH] Remove Overmapped and legacy methods

CraftBukkit/0081-Remove-this-shit.patch renamed to CraftBukkit/0080-Remove-this-shit.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1211019f77e5c9ea57dee25c5a4555aac2ef8e3d Mon Sep 17 00:00:00 2001
1+
From e7a53e087a672b989cd87d529e566b86b690e3e7 Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Mon, 1 Sep 2014 15:37:16 -0500
44
Subject: [PATCH] Remove this shit

CraftBukkit/0082-Fix-explosions-not-moving-invulnerable-entities.patch renamed to CraftBukkit/0081-Fix-explosions-not-moving-invulnerable-entities.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b0351c5df667dd603c94fd3c34095e09a84fb4f3 Mon Sep 17 00:00:00 2001
1+
From de99abb9a775263c9071b21211ba025d8d33f205 Mon Sep 17 00:00:00 2001
22
From: Thinkofdeath <[email protected]>
33
Date: Thu, 26 Jun 2014 14:29:11 +0100
44
Subject: [PATCH] Fix explosions not moving invulnerable entities

0 commit comments

Comments
 (0)