Upstream
/
ProtocolLib
mirror of https://github.com/dmulloy2/ProtocolLib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to 1.16.4 (#1007)

This commit is contained in:
Aurora 2020-11-09 21:11:48 +01:00 committed by GitHub
parent 4bc9e8b7b7
commit 7bac4ec634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -17,7 +17,7 @@
<project.fullVersion>${project.version}</project.fullVersion> <project.fullVersion>${project.version}</project.fullVersion>
<powermock.version>2.0.7</powermock.version> <powermock.version>2.0.7</powermock.version>
<spigot.version>1.16.3-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.16.4-R0.1-SNAPSHOT</spigot.version>
</properties> </properties>
<build> <build>
@ -166,7 +166,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version> <version>3.2.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>

2
src/main/java/com/comphenix/protocol/utility/Constants.java
View File

@ -21,7 +21,7 @@ package com.comphenix.protocol.utility;
*/ */
public final class Constants { public final class Constants {
public static final String PACKAGE_VERSION = "v1_16_R2"; public static final String PACKAGE_VERSION = "v1_16_R3";
public static final String NMS = "net.minecraft.server." + PACKAGE_VERSION; public static final String NMS = "net.minecraft.server." + PACKAGE_VERSION;
public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION; public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;
public static final MinecraftVersion CURRENT_VERSION = MinecraftVersion.NETHER_UPDATE_2; public static final MinecraftVersion CURRENT_VERSION = MinecraftVersion.NETHER_UPDATE_2;

1
src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java
View File

@ -71,6 +71,7 @@ public class MinecraftProtocolVersion {
map.put(new MinecraftVersion(1, 16, 1), 736); map.put(new MinecraftVersion(1, 16, 1), 736);
map.put(new MinecraftVersion(1, 16, 2), 751); map.put(new MinecraftVersion(1, 16, 2), 751);
map.put(new MinecraftVersion(1, 16, 3), 753); map.put(new MinecraftVersion(1, 16, 3), 753);
map.put(new MinecraftVersion(1, 16, 4), 754);
return map; return map;
} }

12
src/test/java/com/comphenix/protocol/BukkitInitialization.java
View File

@ -6,17 +6,17 @@ import java.util.List;
import com.comphenix.protocol.reflect.FieldUtils; import com.comphenix.protocol.reflect.FieldUtils;
import com.comphenix.protocol.utility.Constants; import com.comphenix.protocol.utility.Constants;
import net.minecraft.server.v1_16_R2.DispenserRegistry; import net.minecraft.server.v1_16_R3.DispenserRegistry;
import net.minecraft.server.v1_16_R2.WorldServer; import net.minecraft.server.v1_16_R3.WorldServer;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.v1_16_R2.CraftServer; import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemFactory; import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemFactory;
import org.bukkit.craftbukkit.v1_16_R2.util.Versioning; import org.bukkit.craftbukkit.v1_16_R3.util.Versioning;
import org.spigotmc.SpigotWorldConfig; import org.spigotmc.SpigotWorldConfig;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;

6
src/test/java/com/comphenix/protocol/PacketTypeTest.java
View File

@ -27,9 +27,9 @@ import com.comphenix.protocol.utility.Constants;
import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.utility.MinecraftVersion; import com.comphenix.protocol.utility.MinecraftVersion;
import net.minecraft.server.v1_16_R2.EnumProtocol; import net.minecraft.server.v1_16_R3.EnumProtocol;
import net.minecraft.server.v1_16_R2.EnumProtocolDirection; import net.minecraft.server.v1_16_R3.EnumProtocolDirection;
import net.minecraft.server.v1_16_R2.PacketLoginInStart; import net.minecraft.server.v1_16_R3.PacketLoginInStart;
import org.apache.commons.lang.WordUtils; import org.apache.commons.lang.WordUtils;
import org.junit.AfterClass; import org.junit.AfterClass;

6
src/test/java/com/comphenix/protocol/events/PacketContainerTest.java
View File

@ -38,9 +38,9 @@ import com.comphenix.protocol.wrappers.nbt.NbtFactory;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.md_5.bungee.api.chat.*; import net.md_5.bungee.api.chat.*;
import net.minecraft.server.v1_16_R2.*; import net.minecraft.server.v1_16_R3.*;
import net.minecraft.server.v1_16_R2.MinecraftKey; import net.minecraft.server.v1_16_R3.MinecraftKey;
import net.minecraft.server.v1_16_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot; import net.minecraft.server.v1_16_R3.PacketPlayOutUpdateAttributes.AttributeSnapshot;
import org.apache.commons.lang.SerializationUtils; import org.apache.commons.lang.SerializationUtils;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.EqualsBuilder;

14
src/test/java/com/comphenix/protocol/injector/EntityUtilitiesTest.java
View File

@ -3,16 +3,16 @@ package com.comphenix.protocol.injector;
import com.comphenix.protocol.BukkitInitialization; import com.comphenix.protocol.BukkitInitialization;
import com.comphenix.protocol.reflect.accessors.Accessors; import com.comphenix.protocol.reflect.accessors.Accessors;
import net.minecraft.server.v1_16_R2.ChunkProviderServer; import net.minecraft.server.v1_16_R3.ChunkProviderServer;
import net.minecraft.server.v1_16_R2.Entity; import net.minecraft.server.v1_16_R3.Entity;
import net.minecraft.server.v1_16_R2.PlayerChunkMap; import net.minecraft.server.v1_16_R3.PlayerChunkMap;
import net.minecraft.server.v1_16_R2.PlayerChunkMap.EntityTracker; import net.minecraft.server.v1_16_R3.PlayerChunkMap.EntityTracker;
import net.minecraft.server.v1_16_R2.WorldServer; import net.minecraft.server.v1_16_R3.WorldServer;
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectMap; import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

4
src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java
View File

@ -6,8 +6,8 @@ import static org.junit.Assert.assertEquals;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import net.minecraft.server.v1_16_R2.ItemStack; import net.minecraft.server.v1_16_R3.ItemStack;
import net.minecraft.server.v1_16_R2.NonNullList; import net.minecraft.server.v1_16_R3.NonNullList;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

26
src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java
View File

@ -6,22 +6,22 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import net.minecraft.server.v1_16_R2.ChatComponentText; import net.minecraft.server.v1_16_R3.ChatComponentText;
import net.minecraft.server.v1_16_R2.ChunkCoordIntPair; import net.minecraft.server.v1_16_R3.ChunkCoordIntPair;
import net.minecraft.server.v1_16_R2.DataWatcher; import net.minecraft.server.v1_16_R3.DataWatcher;
import net.minecraft.server.v1_16_R2.IBlockData; import net.minecraft.server.v1_16_R3.IBlockData;
import net.minecraft.server.v1_16_R2.IChatBaseComponent; import net.minecraft.server.v1_16_R3.IChatBaseComponent;
import net.minecraft.server.v1_16_R2.IChatBaseComponent.ChatSerializer; import net.minecraft.server.v1_16_R3.IChatBaseComponent.ChatSerializer;
import net.minecraft.server.v1_16_R2.NBTCompressedStreamTools; import net.minecraft.server.v1_16_R3.NBTCompressedStreamTools;
import net.minecraft.server.v1_16_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot; import net.minecraft.server.v1_16_R3.PacketPlayOutUpdateAttributes.AttributeSnapshot;
import net.minecraft.server.v1_16_R2.PlayerConnection; import net.minecraft.server.v1_16_R3.PlayerConnection;
import net.minecraft.server.v1_16_R2.ServerPing; import net.minecraft.server.v1_16_R3.ServerPing;
import net.minecraft.server.v1_16_R2.ServerPing.ServerData; import net.minecraft.server.v1_16_R3.ServerPing.ServerData;
import net.minecraft.server.v1_16_R2.ServerPing.ServerPingPlayerSample; import net.minecraft.server.v1_16_R3.ServerPing.ServerPingPlayerSample;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.junit.AfterClass; import org.junit.AfterClass;

6
src/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java
View File

@ -16,14 +16,14 @@ public class ChunkCoordIntPairTest {
@Test @Test
public void test() { public void test() {
net.minecraft.server.v1_16_R2.ChunkCoordIntPair pair = new net.minecraft.server.v1_16_R2.ChunkCoordIntPair(1, 2); net.minecraft.server.v1_16_R3.ChunkCoordIntPair pair = new net.minecraft.server.v1_16_R3.ChunkCoordIntPair(1, 2);
ChunkCoordIntPair specific = ChunkCoordIntPair.getConverter().getSpecific(pair); ChunkCoordIntPair specific = ChunkCoordIntPair.getConverter().getSpecific(pair);
assertEquals(1, specific.getChunkX()); assertEquals(1, specific.getChunkX());
assertEquals(2, specific.getChunkZ()); assertEquals(2, specific.getChunkZ());
net.minecraft.server.v1_16_R2.ChunkCoordIntPair roundtrip = net.minecraft.server.v1_16_R3.ChunkCoordIntPair roundtrip =
(net.minecraft.server.v1_16_R2.ChunkCoordIntPair) ChunkCoordIntPair.getConverter(). (net.minecraft.server.v1_16_R3.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
getGeneric(specific); getGeneric(specific);
assertEquals(1, roundtrip.x); assertEquals(1, roundtrip.x);

12
src/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java
View File

@ -3,12 +3,12 @@ package com.comphenix.protocol.wrappers;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import net.minecraft.server.v1_16_R2.EnumChatVisibility; import net.minecraft.server.v1_16_R3.EnumChatVisibility;
import net.minecraft.server.v1_16_R2.EnumDifficulty; import net.minecraft.server.v1_16_R3.EnumDifficulty;
import net.minecraft.server.v1_16_R2.EnumGamemode; import net.minecraft.server.v1_16_R3.EnumGamemode;
import net.minecraft.server.v1_16_R2.EnumProtocol; import net.minecraft.server.v1_16_R3.EnumProtocol;
import net.minecraft.server.v1_16_R2.PacketPlayInClientCommand.EnumClientCommand; import net.minecraft.server.v1_16_R3.PacketPlayInClientCommand.EnumClientCommand;
import net.minecraft.server.v1_16_R2.PacketPlayInUseEntity.EnumEntityUseAction; import net.minecraft.server.v1_16_R3.PacketPlayInUseEntity.EnumEntityUseAction;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

12
src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java
View File

@ -6,12 +6,12 @@ import static org.junit.Assert.assertTrue;
import java.util.List; import java.util.List;
import net.minecraft.server.v1_16_R2.AttributeBase; import net.minecraft.server.v1_16_R3.AttributeBase;
import net.minecraft.server.v1_16_R2.AttributeModifier; import net.minecraft.server.v1_16_R3.AttributeModifier;
import net.minecraft.server.v1_16_R2.IRegistry; import net.minecraft.server.v1_16_R3.IRegistry;
import net.minecraft.server.v1_16_R2.MinecraftKey; import net.minecraft.server.v1_16_R3.MinecraftKey;
import net.minecraft.server.v1_16_R2.PacketPlayOutUpdateAttributes; import net.minecraft.server.v1_16_R3.PacketPlayOutUpdateAttributes;
import net.minecraft.server.v1_16_R2.PacketPlayOutUpdateAttributes.AttributeSnapshot; import net.minecraft.server.v1_16_R3.PacketPlayOutUpdateAttributes.AttributeSnapshot;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;

8
src/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java
View File

@ -18,14 +18,14 @@ package com.comphenix.protocol.wrappers;
import com.comphenix.protocol.BukkitInitialization; import com.comphenix.protocol.BukkitInitialization;
import net.minecraft.server.v1_16_R2.IBlockData; import net.minecraft.server.v1_16_R3.IBlockData;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.data.type.GlassPane; import org.bukkit.block.data.type.GlassPane;
import org.bukkit.craftbukkit.v1_16_R2.block.data.CraftBlockData; import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_16_R2.block.impl.CraftStainedGlassPane; import org.bukkit.craftbukkit.v1_16_R3.block.impl.CraftStainedGlassPane;
import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers; import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

10
src/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java
View File

@ -23,10 +23,10 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer; import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject; import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import net.minecraft.server.v1_16_R2.EntityEgg; import net.minecraft.server.v1_16_R3.EntityEgg;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEgg; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEgg;
import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -87,8 +87,8 @@ public class WrappedDataWatcherTest {
@Test @Test
public void testSerializers() { public void testSerializers() {
Serializer blockPos = Registry.get(net.minecraft.server.v1_16_R2.BlockPosition.class, false); Serializer blockPos = Registry.get(net.minecraft.server.v1_16_R3.BlockPosition.class, false);
Serializer optionalBlockPos = Registry.get(net.minecraft.server.v1_16_R2.BlockPosition.class, true); Serializer optionalBlockPos = Registry.get(net.minecraft.server.v1_16_R3.BlockPosition.class, true);
assertNotSame(blockPos, optionalBlockPos); assertNotSame(blockPos, optionalBlockPos);
// assertNull(Registry.get(ItemStack.class, false)); // assertNull(Registry.get(ItemStack.class, false));

6
src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java
View File

@ -30,9 +30,9 @@ import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import net.minecraft.server.v1_16_R2.ItemStack; import net.minecraft.server.v1_16_R3.ItemStack;
import net.minecraft.server.v1_16_R2.Items; import net.minecraft.server.v1_16_R3.Items;
import net.minecraft.server.v1_16_R2.NBTTagTypes; import net.minecraft.server.v1_16_R3.NBTTagTypes;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;