Skip to content

Commit bf56f39

Browse files
dmulloy2dmulloy2
committed
Merge pull request #205 from 0x277F/mc-1.9.4
Update to 1.9.4
2 parents 90f3619 + d876580 commit bf56f39

File tree

14 files changed

+61
-59
lines changed

14 files changed

+61
-59
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
.classpath
88
.settings/
99
bin/
10+
.idea/
11+
.iml
12+
.ipr
13+
.iws
1014

1115
*.pydevproject
1216
.metadata

‎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.2-R0.1-SNAPSHOT</version>
199+
<version>1.9.4-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.2-R0.1-SNAPSHOT</version>
205+
<version>1.9.4-R0.1-SNAPSHOT</version>
206206
<scope>provided</scope>
207207
</dependency>
208208
<dependency>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ public static class Server extends ObjectEnum<PacketType> {
175175
public static final PacketType SPAWN_POSITION = new PacketType(PROTOCOL, SENDER, 0x43, 0x05, "SpawnPosition");
176176
public static final PacketType UPDATE_TIME = new PacketType(PROTOCOL, SENDER, 0x44, 0x03, "UpdateTime");
177177
public static final PacketType TITLE = new PacketType(PROTOCOL, SENDER, 0x45, 0x45, "Title");
178-
public static final PacketType UPDATE_SIGN = new PacketType(PROTOCOL, SENDER, 0x46, 0x33, "UpdateSign");
179178
public static final PacketType NAMED_SOUND_EFFECT = new PacketType(PROTOCOL, SENDER, 0x47, 0x29, "NamedSoundEffect");
180179
public static final PacketType PLAYER_LIST_HEADER_FOOTER = new PacketType(PROTOCOL, SENDER, 0x48, 0x47, "PlayerListHeaderFooter");
181180
public static final PacketType COLLECT = new PacketType(PROTOCOL, SENDER, 0x49, 0x0D, "Collect");
@@ -201,6 +200,12 @@ public static class Server extends ObjectEnum<PacketType> {
201200
@Deprecated
202201
public static final PacketType STATISTICS = STATISTIC;
203202

203+
/**
204+
* @deprecated Replaced by {@link TILE_ENTITY_DATA}
205+
*/
206+
@Deprecated
207+
public static final PacketType UPDATE_SIGN = TILE_ENTITY_DATA;
208+
204209
// The instance must
205210
private final static Server INSTANCE = new Server();
206211

‎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_R1";
24+
public static final String PACKAGE_VERSION = "v1_9_R2";
2525
public static final String NMS = "net.minecraft.server." + PACKAGE_VERSION;
2626
public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
2727
}

‎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.2-R0.1-SNAPSHOT</version>
237+
<version>1.9.4-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.2-R0.1-SNAPSHOT</version>
243+
<version>1.9.4-R0.1-SNAPSHOT</version>
244244
<scope>provided</scope>
245245
</dependency>
246246
<dependency>

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

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

66
import java.util.logging.Logger;
77

8-
import net.minecraft.server.v1_9_R1.DispenserRegistry;
8+
import net.minecraft.server.v1_9_R2.DispenserRegistry;
99

1010
import org.bukkit.Bukkit;
1111
import org.bukkit.Server;
12-
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
13-
import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemFactory;
14-
import org.bukkit.craftbukkit.v1_9_R1.util.Versioning;
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;
1515

1616
import com.comphenix.protocol.utility.Constants;
1717
import com.comphenix.protocol.utility.MinecraftReflection;

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

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

31-
import net.minecraft.server.v1_9_R1.AttributeModifier;
32-
import net.minecraft.server.v1_9_R1.DataWatcher;
33-
import net.minecraft.server.v1_9_R1.Entity;
34-
import net.minecraft.server.v1_9_R1.EntityLightning;
35-
import net.minecraft.server.v1_9_R1.MobEffect;
36-
import net.minecraft.server.v1_9_R1.MobEffectList;
37-
import net.minecraft.server.v1_9_R1.PacketPlayOutBoss;
38-
import net.minecraft.server.v1_9_R1.PacketPlayOutUpdateAttributes;
39-
import net.minecraft.server.v1_9_R1.PacketPlayOutUpdateAttributes.AttributeSnapshot;
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;
4040

4141
import org.apache.commons.lang.SerializationUtils;
4242
import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -180,13 +180,6 @@ public void testGetStringArrays() {
180180
testObjectArray(tabComplete.getStringArrays(), 0, new String[0], new String[] { "hello", "world" });
181181
}
182182

183-
@Test
184-
public void testGetChatComponentArrays() {
185-
PacketContainer signChange = new PacketContainer(PacketType.Play.Server.UPDATE_SIGN);
186-
testObjectArray(signChange.getChatComponentArrays(), 0, new WrappedChatComponent[0],
187-
WrappedChatComponent.fromChatMessage("hello world"));
188-
}
189-
190183
@Test
191184
public void testGetIntegerArrays() {
192185
// Contains a byte array we will test

‎modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.times;
66
import static org.mockito.Mockito.verify;
7-
import net.minecraft.server.v1_9_R1.ChatComponentText;
8-
import net.minecraft.server.v1_9_R1.ChunkCoordIntPair;
9-
import net.minecraft.server.v1_9_R1.DataWatcher;
10-
import net.minecraft.server.v1_9_R1.IBlockData;
11-
import net.minecraft.server.v1_9_R1.IChatBaseComponent;
12-
import net.minecraft.server.v1_9_R1.IChatBaseComponent.ChatSerializer;
13-
import net.minecraft.server.v1_9_R1.NBTCompressedStreamTools;
14-
import net.minecraft.server.v1_9_R1.PacketPlayOutUpdateAttributes.AttributeSnapshot;
15-
import net.minecraft.server.v1_9_R1.PlayerConnection;
16-
import net.minecraft.server.v1_9_R1.ServerPing;
17-
import net.minecraft.server.v1_9_R1.ServerPing.ServerData;
18-
import net.minecraft.server.v1_9_R1.ServerPing.ServerPingPlayerSample;
7+
import net.minecraft.server.v1_9_R2.ChatComponentText;
8+
import net.minecraft.server.v1_9_R2.ChunkCoordIntPair;
9+
import net.minecraft.server.v1_9_R2.DataWatcher;
10+
import net.minecraft.server.v1_9_R2.IBlockData;
11+
import net.minecraft.server.v1_9_R2.IChatBaseComponent;
12+
import net.minecraft.server.v1_9_R2.IChatBaseComponent.ChatSerializer;
13+
import net.minecraft.server.v1_9_R2.NBTCompressedStreamTools;
14+
import net.minecraft.server.v1_9_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot;
15+
import net.minecraft.server.v1_9_R2.PlayerConnection;
16+
import net.minecraft.server.v1_9_R2.ServerPing;
17+
import net.minecraft.server.v1_9_R2.ServerPing.ServerData;
18+
import net.minecraft.server.v1_9_R2.ServerPing.ServerPingPlayerSample;
1919

2020
import org.bukkit.Material;
2121
import org.bukkit.block.Block;

‎modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.io.DataOutputStream;
99
import java.io.IOException;
1010

11-
import net.minecraft.server.v1_9_R1.IntHashMap;
11+
import net.minecraft.server.v1_9_R2.IntHashMap;
1212

1313
import org.bukkit.ChatColor;
1414
import org.bukkit.DyeColor;

‎modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ public static void initializeBukkit() {
1616

1717
@Test
1818
public void test() {
19-
net.minecraft.server.v1_9_R1.ChunkCoordIntPair pair = new net.minecraft.server.v1_9_R1.ChunkCoordIntPair(1, 2);
19+
net.minecraft.server.v1_9_R2.ChunkCoordIntPair pair = new net.minecraft.server.v1_9_R2.ChunkCoordIntPair(1, 2);
2020
ChunkCoordIntPair specific = ChunkCoordIntPair.getConverter().getSpecific(pair);
2121

2222
assertEquals(1, specific.getChunkX());
2323
assertEquals(2, specific.getChunkZ());
2424

25-
net.minecraft.server.v1_9_R1.ChunkCoordIntPair roundtrip =
26-
(net.minecraft.server.v1_9_R1.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
27-
getGeneric(net.minecraft.server.v1_9_R1.ChunkCoordIntPair.class, specific);
25+
net.minecraft.server.v1_9_R2.ChunkCoordIntPair roundtrip =
26+
(net.minecraft.server.v1_9_R2.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
27+
getGeneric(net.minecraft.server.v1_9_R2.ChunkCoordIntPair.class, specific);
2828

2929
assertEquals(1, roundtrip.x);
3030
assertEquals(2, roundtrip.z);

0 commit comments

Comments
 (0)