Skip to content

Commit 7bac4ec

Browse files
aurorasmilesaurorasmiles
authored
Update to 1.16.4 (#1007)
1 parent 4bc9e8b commit 7bac4ec

15 files changed

+65
-64
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<project.fullVersion>${project.version}</project.fullVersion>
1818

1919
<powermock.version>2.0.7</powermock.version>
20-
<spigot.version>1.16.3-R0.1-SNAPSHOT</spigot.version>
20+
<spigot.version>1.16.4-R0.1-SNAPSHOT</spigot.version>
2121
</properties>
2222

2323
<build>
@@ -166,7 +166,7 @@
166166
<plugin>
167167
<groupId>org.apache.maven.plugins</groupId>
168168
<artifactId>maven-source-plugin</artifactId>
169-
<version>3.2.0</version>
169+
<version>3.2.1</version>
170170
<executions>
171171
<execution>
172172
<id>attach-sources</id>

‎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_16_R2";
24+
public static final String PACKAGE_VERSION = "v1_16_R3";
2525
public static final String NMS = "net.minecraft.server." + PACKAGE_VERSION;
2626
public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
2727
public static final MinecraftVersion CURRENT_VERSION = MinecraftVersion.NETHER_UPDATE_2;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ private static NavigableMap<MinecraftVersion, Integer> createLookup() {
7171
map.put(new MinecraftVersion(1, 16, 1), 736);
7272
map.put(new MinecraftVersion(1, 16, 2), 751);
7373
map.put(new MinecraftVersion(1, 16, 3), 753);
74+
map.put(new MinecraftVersion(1, 16, 4), 754);
7475
return map;
7576
}
7677

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
import com.comphenix.protocol.reflect.FieldUtils;
77
import com.comphenix.protocol.utility.Constants;
88

9-
import net.minecraft.server.v1_16_R2.DispenserRegistry;
10-
import net.minecraft.server.v1_16_R2.WorldServer;
9+
import net.minecraft.server.v1_16_R3.DispenserRegistry;
10+
import net.minecraft.server.v1_16_R3.WorldServer;
1111

1212
import org.apache.logging.log4j.LogManager;
1313
import org.bukkit.Bukkit;
1414
import org.bukkit.Server;
1515
import org.bukkit.World;
16-
import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
17-
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
18-
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemFactory;
19-
import org.bukkit.craftbukkit.v1_16_R2.util.Versioning;
16+
import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
17+
import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
18+
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemFactory;
19+
import org.bukkit.craftbukkit.v1_16_R3.util.Versioning;
2020
import org.spigotmc.SpigotWorldConfig;
2121

2222
import static org.mockito.Mockito.mock;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import com.comphenix.protocol.utility.MinecraftReflection;
2828
import com.comphenix.protocol.utility.MinecraftVersion;
2929

30-
import net.minecraft.server.v1_16_R2.EnumProtocol;
31-
import net.minecraft.server.v1_16_R2.EnumProtocolDirection;
32-
import net.minecraft.server.v1_16_R2.PacketLoginInStart;
30+
import net.minecraft.server.v1_16_R3.EnumProtocol;
31+
import net.minecraft.server.v1_16_R3.EnumProtocolDirection;
32+
import net.minecraft.server.v1_16_R3.PacketLoginInStart;
3333

3434
import org.apache.commons.lang.WordUtils;
3535
import org.junit.AfterClass;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
import com.google.common.collect.Lists;
3939

4040
import net.md_5.bungee.api.chat.*;
41-
import net.minecraft.server.v1_16_R2.*;
42-
import net.minecraft.server.v1_16_R2.MinecraftKey;
43-
import net.minecraft.server.v1_16_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot;
41+
import net.minecraft.server.v1_16_R3.*;
42+
import net.minecraft.server.v1_16_R3.MinecraftKey;
43+
import net.minecraft.server.v1_16_R3.PacketPlayOutUpdateAttributes.AttributeSnapshot;
4444

4545
import org.apache.commons.lang.SerializationUtils;
4646
import org.apache.commons.lang.builder.EqualsBuilder;

‎src/test/java/com/comphenix/protocol/injector/EntityUtilitiesTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
import com.comphenix.protocol.BukkitInitialization;
44
import com.comphenix.protocol.reflect.accessors.Accessors;
55

6-
import net.minecraft.server.v1_16_R2.ChunkProviderServer;
7-
import net.minecraft.server.v1_16_R2.Entity;
8-
import net.minecraft.server.v1_16_R2.PlayerChunkMap;
9-
import net.minecraft.server.v1_16_R2.PlayerChunkMap.EntityTracker;
10-
import net.minecraft.server.v1_16_R2.WorldServer;
6+
import net.minecraft.server.v1_16_R3.ChunkProviderServer;
7+
import net.minecraft.server.v1_16_R3.Entity;
8+
import net.minecraft.server.v1_16_R3.PlayerChunkMap;
9+
import net.minecraft.server.v1_16_R3.PlayerChunkMap.EntityTracker;
10+
import net.minecraft.server.v1_16_R3.WorldServer;
1111

1212
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectMap;
1313
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
14-
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
15-
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity;
14+
import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
15+
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity;
1616
import org.junit.BeforeClass;
1717
import org.junit.Test;
1818

‎src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.util.Arrays;
77
import java.util.List;
88

9-
import net.minecraft.server.v1_16_R2.ItemStack;
10-
import net.minecraft.server.v1_16_R2.NonNullList;
9+
import net.minecraft.server.v1_16_R3.ItemStack;
10+
import net.minecraft.server.v1_16_R3.NonNullList;
1111

1212
import org.junit.BeforeClass;
1313
import org.junit.Test;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
import static org.mockito.Mockito.times;
77
import static org.mockito.Mockito.verify;
88

9-
import net.minecraft.server.v1_16_R2.ChatComponentText;
10-
import net.minecraft.server.v1_16_R2.ChunkCoordIntPair;
11-
import net.minecraft.server.v1_16_R2.DataWatcher;
12-
import net.minecraft.server.v1_16_R2.IBlockData;
13-
import net.minecraft.server.v1_16_R2.IChatBaseComponent;
14-
import net.minecraft.server.v1_16_R2.IChatBaseComponent.ChatSerializer;
15-
import net.minecraft.server.v1_16_R2.NBTCompressedStreamTools;
16-
import net.minecraft.server.v1_16_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot;
17-
import net.minecraft.server.v1_16_R2.PlayerConnection;
18-
import net.minecraft.server.v1_16_R2.ServerPing;
19-
import net.minecraft.server.v1_16_R2.ServerPing.ServerData;
20-
import net.minecraft.server.v1_16_R2.ServerPing.ServerPingPlayerSample;
9+
import net.minecraft.server.v1_16_R3.ChatComponentText;
10+
import net.minecraft.server.v1_16_R3.ChunkCoordIntPair;
11+
import net.minecraft.server.v1_16_R3.DataWatcher;
12+
import net.minecraft.server.v1_16_R3.IBlockData;
13+
import net.minecraft.server.v1_16_R3.IChatBaseComponent;
14+
import net.minecraft.server.v1_16_R3.IChatBaseComponent.ChatSerializer;
15+
import net.minecraft.server.v1_16_R3.NBTCompressedStreamTools;
16+
import net.minecraft.server.v1_16_R3.PacketPlayOutUpdateAttributes.AttributeSnapshot;
17+
import net.minecraft.server.v1_16_R3.PlayerConnection;
18+
import net.minecraft.server.v1_16_R3.ServerPing;
19+
import net.minecraft.server.v1_16_R3.ServerPing.ServerData;
20+
import net.minecraft.server.v1_16_R3.ServerPing.ServerPingPlayerSample;
2121

2222
import org.bukkit.Material;
2323
import org.bukkit.block.Block;
24-
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
24+
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
2525
import org.bukkit.entity.Entity;
2626
import org.bukkit.inventory.ItemStack;
2727
import org.junit.AfterClass;

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

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

1717
@Test
1818
public void test() {
19-
net.minecraft.server.v1_16_R2.ChunkCoordIntPair pair = new net.minecraft.server.v1_16_R2.ChunkCoordIntPair(1, 2);
19+
net.minecraft.server.v1_16_R3.ChunkCoordIntPair pair = new net.minecraft.server.v1_16_R3.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_16_R2.ChunkCoordIntPair roundtrip =
26-
(net.minecraft.server.v1_16_R2.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
25+
net.minecraft.server.v1_16_R3.ChunkCoordIntPair roundtrip =
26+
(net.minecraft.server.v1_16_R3.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
2727
getGeneric(specific);
2828

2929
assertEquals(1, roundtrip.x);

0 commit comments

Comments
 (0)