Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-23 11:05:46 +01:00
Code Issues Projects Releases Wiki Activity

1.21

Browse Source
This commit is contained in:
Dan Mulloy 2024-06-13 18:01:40 -05:00
parent 389233f599
commit e726f6eb0d
No known key found for this signature in database
GPG Key ID: 3C5AD5D866D1539A
26 changed files with 372 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -35,7 +35,7 @@ repositories {
dependencies {
implementation 'net.bytebuddy:byte-buddy:1.14.14'
compileOnly 'org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT'
compileOnly 'org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT'
compileOnly 'org.spigotmc:spigot:1.21-R0.1-SNAPSHOT'
compileOnly 'io.netty:netty-all:4.0.23.Final'
compileOnly 'net.kyori:adventure-text-serializer-gson:4.14.0'
compileOnly 'com.googlecode.json-simple:json-simple:1.1.1'
@ -46,7 +46,7 @@ dependencies {
testImplementation 'org.mockito:mockito-core:5.6.0'
testImplementation 'io.netty:netty-common:4.1.97.Final'
testImplementation 'io.netty:netty-transport:4.1.97.Final'
testImplementation 'org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT'
testImplementation 'org.spigotmc:spigot:1.21-R0.1-SNAPSHOT'
testImplementation 'net.kyori:adventure-text-serializer-gson:4.14.0'
testImplementation 'net.kyori:adventure-text-serializer-plain:4.14.0'
}
@ -59,6 +59,14 @@ java {
withSourcesJar()
}
jar {
manifest {
attributes(
'paperweight-mappings-namespace': 'mojang'
)
}
}
shadowJar {
dependencies {
include(dependency('net.bytebuddy:byte-buddy:.*'))

4
src/main/java/com/comphenix/protocol/PacketType.java
View File

@ -229,6 +229,8 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
public static final PacketType RECIPE_UPDATE = new PacketType(PROTOCOL, SENDER, 0x77, "UpdateRecipes", "RecipeUpdate");
public static final PacketType TAGS = new PacketType(PROTOCOL, SENDER, 0x78, "UpdateTags", "Tags");
public static final PacketType PROJECTILE_POWER = new PacketType(PROTOCOL, SENDER, 0x79, "ProjectilePower");
public static final PacketType REPORT_DETAILS = new PacketType(PROTOCOL, SENDER, 0x7A, "CustomReportDetails");
public static final PacketType SERVER_LINKS = new PacketType(PROTOCOL, SENDER, 0x7B, "ServerLinks");
// ---- Removed in 1.9
@ -684,6 +686,8 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
public static final PacketType UPDATE_ENABLED_FEATURES = new PacketType(PROTOCOL, SENDER, 0x0C, "UpdateEnabledFeatures");
public static final PacketType UPDATE_TAGS = new PacketType(PROTOCOL, SENDER, 0x0D, "UpdateTags");
public static final PacketType SELECT_KNOWN_PACKS = new PacketType(PROTOCOL, SENDER, 0x0E, "ClientboundSelectKnownPacks");
public static final PacketType REPORT_DETAILS = new PacketType(PROTOCOL, SENDER, 0x0F, "CustomReportDetails");
public static final PacketType SERVER_LINKS = new PacketType(PROTOCOL, SENDER, 0x10, "ServerLinks");
/**
* @deprecated Removed in 1.20.4: replaced with new packets for removing and sending resource packs

102
src/main/java/com/comphenix/protocol/injector/StructureCache.java
View File

@ -17,19 +17,25 @@
package com.comphenix.protocol.injector;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.security.PublicKey;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.function.Supplier;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.injector.packet.KnownPacketData;
import com.comphenix.protocol.injector.packet.PacketRegistry;
import com.comphenix.protocol.reflect.FuzzyReflection;
import com.comphenix.protocol.reflect.StructureModifier;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
import com.comphenix.protocol.reflect.accessors.FieldAccessor;
import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
import com.comphenix.protocol.reflect.instances.DefaultInstances;
import com.comphenix.protocol.reflect.instances.InstanceCreator;
@ -41,9 +47,10 @@ import com.comphenix.protocol.utility.MinecraftVersion;
import com.comphenix.protocol.utility.ZeroBuffer;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import com.comphenix.protocol.wrappers.WrappedStreamCodec;
import com.google.common.base.Preconditions;
import com.google.common.base.Preconditions;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.dynamic.loading.ClassLoadingStrategy.Default;
import net.bytebuddy.implementation.FixedValue;
@ -57,14 +64,14 @@ import net.bytebuddy.matcher.ElementMatchers;
public class StructureCache {
// Structure modifiers
private static final Map<Class<?>, Supplier<Object>> CACHED_INSTANCE_CREATORS = new ConcurrentHashMap<>();
private static final Map<Class<?>, Optional<Supplier<Object>>> CACHED_INSTANCE_CREATORS = new ConcurrentHashMap<>();
private static final Map<PacketType, StructureModifier<Object>> STRUCTURE_MODIFIER_CACHE = new ConcurrentHashMap<>();
// packet data serializer which always returns an empty nbt tag compound
private static final Object TRICK_INIT_LOCK = new Object();
private static boolean TRICK_TRIED = false;
private static Supplier<Object> TRICKED_DATA_SERIALIZER_BASE;
private static Function<ByteBuf, Object> TRICKED_DATA_SERIALIZER_BASE;
private static Supplier<Object> TRICKED_DATA_SERIALIZER_JSON;
/**
@ -75,12 +82,40 @@ public class StructureCache {
return newInstance(packetClass);
}
public static boolean canCreateInstance(Class<?> clazz) {
Optional<Supplier<Object>> creator = CACHED_INSTANCE_CREATORS.computeIfAbsent(clazz, x ->
Optional.ofNullable(determineBestCreator(clazz)));
return creator.isPresent();
}
public static Object newInstance(Class<?> clazz) {
Supplier<Object> creator = CACHED_INSTANCE_CREATORS.computeIfAbsent(clazz, StructureCache::determineBestCreator);
return creator.get();
Optional<Supplier<Object>> creator = CACHED_INSTANCE_CREATORS.computeIfAbsent(clazz, x ->
Optional.ofNullable(determineBestCreator(clazz)));
if (!creator.isPresent()) {
throw new IllegalArgumentException("Cannot create instance of " + clazz);
}
return creator.get().get();
}
static Supplier<Object> determineBestCreator(Class<?> clazz) {
// certain packets are singletons which can't really be created
if (MinecraftReflection.isPacketClass(clazz)) {
FuzzyReflection fuzzy = FuzzyReflection.fromClass(clazz, false);
List<Field> singletons = fuzzy.getFieldList(FuzzyFieldContract.newBuilder()
.typeExact(clazz)
.requireModifier(Modifier.STATIC)
.requireModifier(Modifier.PUBLIC)
.build());
if (singletons.size() == 1) {
FieldAccessor accessor = Accessors.getFieldAccessor(singletons.get(0));
try {
accessor.get(null);
return () -> accessor.get(null);
} catch (Exception ignored) {
}
}
}
try {
InstanceCreator creator = InstanceCreator.forClass(clazz);
if (creator.get() != null) {
@ -95,21 +130,40 @@ public class StructureCache {
if (streamCodec != null && tryInitTrickDataSerializer()) {
try {
// first try with the base accessor
Object serializer = TRICKED_DATA_SERIALIZER_BASE.get();
Object serializer = TRICKED_DATA_SERIALIZER_BASE.apply(new ZeroBuffer());
streamCodec.decode(serializer); // throwaway instance, for testing
// method is working
return () -> streamCodec.decode(serializer);
} catch (Exception ignored) {
} catch (Exception ex) {
try {
// try with the json accessor
Object serializer = TRICKED_DATA_SERIALIZER_JSON.get();
streamCodec.decode(serializer); // throwaway instance, for testing
byte[] data;
if (clazz.equals(PacketType.Play.Server.MAP_CHUNK.getPacketClass())) {
data = KnownPacketData.MAP_CHUNK;
} else if (clazz.equals(PacketType.Play.Server.SCOREBOARD_OBJECTIVE.getPacketClass())) {
data = KnownPacketData.SCOREBOARD_OBJECTIVE;
} else {
throw ex;
}
// method is working
return () -> streamCodec.decode(serializer);
Object serializer = TRICKED_DATA_SERIALIZER_BASE.apply(Unpooled.copiedBuffer(data));
streamCodec.decode(serializer);
return () -> {
((ByteBuf) serializer).readerIndex(0);
return streamCodec.decode(serializer);
};
} catch (Exception ignored1) {
// shrug, fall back to default behaviour
try {
// try with the json accessor
Object serializer = TRICKED_DATA_SERIALIZER_JSON.get();
streamCodec.decode(serializer); // throwaway instance, for testing
// method is working
return () -> streamCodec.decode(serializer);
} catch (Exception ignored2) {
// shrug, fall back to default behaviour
}
}
}
}
@ -124,7 +178,7 @@ public class StructureCache {
if (tryInitTrickDataSerializer()) {
try {
// first try with the base accessor
Object serializer = TRICKED_DATA_SERIALIZER_BASE.get();
Object serializer = TRICKED_DATA_SERIALIZER_BASE.apply(new ZeroBuffer());
serializerAccessor.invoke(serializer); // throwaway instance, for testing
// method is working
@ -145,12 +199,12 @@ public class StructureCache {
}
}
// try via DefaultInstances as fallback
return () -> {
Object packetInstance = DefaultInstances.DEFAULT.create(clazz);
Objects.requireNonNull(packetInstance, "Unable to create instance for class " + clazz + " - " + tryInitTrickDataSerializer() + " - " + streamCodec);
return packetInstance;
};
Object instance = DefaultInstances.DEFAULT.create(clazz);
if (instance == null) {
return null;
}
return () -> DefaultInstances.DEFAULT.create(clazz);
}
/**
@ -206,7 +260,7 @@ public class StructureCache {
*/
public static Object newNullDataSerializer() {
tryInitTrickDataSerializer();
return TRICKED_DATA_SERIALIZER_BASE.get();
return TRICKED_DATA_SERIALIZER_BASE.apply(new ZeroBuffer());
}
static void initTrickDataSerializer() {
@ -236,10 +290,10 @@ public class StructureCache {
.parameterDerivedOf(ByteBuf.class)
.parameterDerivedOf(MinecraftReflection.getRegistryAccessClass())
.build()));
TRICKED_DATA_SERIALIZER_BASE = () -> accessor.invoke(new ZeroBuffer(), MinecraftRegistryAccess.get());
TRICKED_DATA_SERIALIZER_BASE = (buf) -> accessor.invoke(buf, MinecraftRegistryAccess.get());
} else {
ConstructorAccessor accessor = Accessors.getConstructorAccessor(serializerBase, ByteBuf.class);
TRICKED_DATA_SERIALIZER_BASE = () -> accessor.invoke(new ZeroBuffer());
TRICKED_DATA_SERIALIZER_BASE = accessor::invoke;
}
//xtended builder which intercepts the read string method as well

13
src/main/java/com/comphenix/protocol/injector/packet/KnownPacketData.java Normal file
View File

@ -0,0 +1,13 @@
package com.comphenix.protocol.injector.packet;
public final class KnownPacketData {
public static final byte[] SCOREBOARD_OBJECTIVE = {
4, 84, 101, 115, 116, 1
};
public static final byte[] MAP_CHUNK = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00
};
}

2
src/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java
View File

@ -370,7 +370,7 @@ public class PacketRegistry {
Class<?> idCodecEntryClass = MinecraftReflection.getMinecraftClass("network.codec.IdDispatchCodec$Entry", "network.codec.IdDispatchCodec$b");
Class<?> protocolDirectionClass = MinecraftReflection.getPacketFlowClass();
Function<?, ?> emptyFunction = input -> null;
Function<?, ?> emptyFunction = input -> input;
FuzzyReflection protocolInfoReflection = FuzzyReflection.fromClass(protocolInfoClass);

32
src/main/java/com/comphenix/protocol/reflect/StructureModifier.java
View File

@ -17,15 +17,6 @@
package com.comphenix.protocol.reflect;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.FieldAccessor;
import com.comphenix.protocol.reflect.instances.BannedGenerator;
import com.comphenix.protocol.reflect.instances.DefaultInstances;
import com.comphenix.protocol.reflect.instances.InstanceProvider;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
import java.lang.reflect.Field;
@ -43,6 +34,17 @@ import java.util.Optional;
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
import com.comphenix.protocol.injector.StructureCache;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.FieldAccessor;
import com.comphenix.protocol.reflect.instances.BannedGenerator;
import com.comphenix.protocol.reflect.instances.DefaultInstances;
import com.comphenix.protocol.reflect.instances.InstanceProvider;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
/**
* Provides list-oriented access to the fields of a Minecraft packet.
* <p>
@ -142,8 +144,9 @@ public class StructureModifier<T> {
for (FieldAccessor accessor : fields) {
Field field = accessor.getField();
if (!field.getType().isPrimitive() && !Modifier.isFinal(field.getModifiers())) {
if (DEFAULT_GENERATOR.hasDefault(field.getType())) {
if (!field.getType().isPrimitive()) {// && !Modifier.isFinal(field.getModifiers())) {
// if (DEFAULT_GENERATOR.hasDefault(field.getType())) {
if (StructureCache.canCreateInstance(field.getType())) {
requireDefaults.put(accessor, currentFieldIndex);
}
}
@ -395,13 +398,12 @@ public class StructureModifier<T> {
// They must be null or messages will be blank
Field field = accessor.getField();
if (field.getType().getCanonicalName().equals("net.md_5.bungee.api.chat.BaseComponent[]")) {
accessor.set(this.target, null);
accessor.set(target, null);
continue;
}
// get the default value and write the field
Object defaultValue = DEFAULT_GENERATOR.getDefault(field.getType());
accessor.set(this.target, defaultValue);
Object value = StructureCache.newInstance(field.getType());
accessor.set(target, value);
}
return this;

2
src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java
View File

@ -82,6 +82,8 @@ public class BukkitCloner implements Cloner {
fromWrapper(MinecraftReflection::getIChatBaseComponentClass, WrappedChatComponent::fromHandle);
fromWrapper(WrappedVillagerData::getNmsClass, WrappedVillagerData::fromHandle);
fromConverter(MinecraftReflection::getSectionPositionClass, BukkitConverters.getSectionPositionConverter());
fromManual(MinecraftReflection::getAttributeSnapshotClass, source ->
WrappedAttribute.fromHandle(source).shallowClone().getHandle());
try {
fromManual(ComponentConverter::getBaseComponentArrayClass, source ->

12
src/main/java/com/comphenix/protocol/reflect/instances/InstanceCreator.java
View File

@ -64,7 +64,7 @@ public final class InstanceCreator implements Supplier<Object> {
Object result = null;
int minCount = Integer.MAX_VALUE;
for (Constructor<?> testCtor : type.getConstructors()) {
for (Constructor<?> testCtor : type.getDeclaredConstructors()) {
Class<?>[] paramTypes = testCtor.getParameterTypes();
if (paramTypes.length > minCount) {
continue;
@ -73,9 +73,10 @@ public final class InstanceCreator implements Supplier<Object> {
Object[] testParams = createParams(paramTypes);
try {
result = testCtor.newInstance(testParams);
ConstructorAccessor testAccessor = Accessors.getConstructorAccessor(testCtor);
result = testAccessor.invoke(testParams);
minCount = paramTypes.length;
this.constructor = Accessors.getConstructorAccessor(testCtor);
this.constructor = testAccessor;
this.paramTypes = paramTypes;
} catch (Exception ignored) {
}
@ -105,9 +106,10 @@ public final class InstanceCreator implements Supplier<Object> {
Object[] testParams = createParams(paramTypes);
try {
result = testMethod.invoke(null, testParams);
MethodAccessor testAccessor = Accessors.getMethodAccessor(testMethod);
result = testAccessor.invoke(null, testParams);
minCount = paramTypes.length;
this.factoryMethod = Accessors.getMethodAccessor(testMethod);
this.factoryMethod = testAccessor;
this.paramTypes = paramTypes;
} catch (Exception ignored) {
}

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

@ -88,8 +88,11 @@ public final class MinecraftProtocolVersion {
map.put(new MinecraftVersion(1, 19, 4), 762);
map.put(new MinecraftVersion(1, 20, 0), 763);
map.put(new MinecraftVersion(1, 20, 1), 763);
map.put(new MinecraftVersion(1, 20, 2), 764);
map.put(new MinecraftVersion(1, 20, 3), 765);
map.put(new MinecraftVersion(1, 20, 5), 766);
map.put(new MinecraftVersion(1, 21, 0), 767);
return map;
}

4
src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java
View File

@ -418,6 +418,10 @@ public final class MinecraftReflection {
return is(getPacketClass(), obj);
}
public static boolean isPacketClass(Class<?> clazz) {
return is(getPacketClass(), clazz);
}
/**
* Determine if the given object is assignable to a NetServerHandler (PlayerConnection)
*

7
src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java
View File

@ -36,6 +36,11 @@ import org.bukkit.Server;
* @author Kristian
*/
public final class MinecraftVersion implements Comparable<MinecraftVersion>, Serializable {
/**
* Version 1.21.0 - the tricky trials update
*/
public static final MinecraftVersion v1_21_0 = new MinecraftVersion("1.21.0");
/**
* Version 1.20.5 - the cookie and transfer packet update
*/
@ -144,7 +149,7 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
/**
* The latest release version of minecraft.
*/
public static final MinecraftVersion LATEST = v1_20_5;
public static final MinecraftVersion LATEST = v1_21_0;
// used when serializing
private static final long serialVersionUID = -8695133558996459770L;

13
src/main/java/com/comphenix/protocol/utility/StreamSerializer.java
View File

@ -231,15 +231,15 @@ public class StreamSerializer {
* @return A deserialized item stack, or NULL if the serialized ItemStack was also NULL.
*/
public ItemStack deserializeItemStackFromByteArray(byte[] input) {
if (READ_ITEM_METHOD == null) {
READ_ITEM_METHOD = Accessors.getMethodAccessor(FuzzyReflection
.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true)
.getMethodByReturnTypeAndParameters("readItemStack", MinecraftReflection.getItemStackClass()));
}
ByteBuf buf = Unpooled.wrappedBuffer(input);
Object serializer = MinecraftReflection.getPacketDataSerializer(buf);
if (READ_ITEM_METHOD == null) {
READ_ITEM_METHOD = Accessors.getMethodAccessor(FuzzyReflection
.fromClass(serializer.getClass(), false)
.getMethodByReturnTypeAndParameters("readItemStack", MinecraftReflection.getItemStackClass()));
}
try {
// unwrap the item
Object nmsItem = READ_ITEM_METHOD.invoke(serializer);
@ -262,6 +262,7 @@ public class StreamSerializer {
* @throws IOException If the operation fails due to reflection problems.
*/
public void serializeItemStack(DataOutputStream output, ItemStack stack) throws IOException {
// TODO this functionality was replaced by the CODEC field in the nms ItemStack
if (WRITE_ITEM_METHOD == null) {
WRITE_ITEM_METHOD = Accessors.getMethodAccessor(FuzzyReflection
.fromClass(MinecraftReflection.getPacketDataSerializerClass(), true)

20
src/main/java/com/comphenix/protocol/wrappers/MinecraftKey.java
View File

@ -16,12 +16,13 @@
*/
package com.comphenix.protocol.wrappers;
import java.lang.reflect.Constructor;
import java.util.Locale;
import java.util.Objects;
import com.comphenix.protocol.reflect.EquivalentConverter;
import com.comphenix.protocol.reflect.StructureModifier;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
import com.comphenix.protocol.utility.MinecraftReflection;
/**
@ -130,7 +131,7 @@ public class MinecraftKey {
return Objects.hash(prefix, key);
}
private static Constructor<?> constructor = null;
private static ConstructorAccessor CONSTRUCTOR;
public static EquivalentConverter<MinecraftKey> getConverter() {
return new EquivalentConverter<MinecraftKey>() {
@ -141,19 +142,12 @@ public class MinecraftKey {
@Override
public Object getGeneric(MinecraftKey specific) {
if (constructor == null) {
try {
constructor = MinecraftReflection.getMinecraftKeyClass().getConstructor(String.class, String.class);
} catch (ReflectiveOperationException e) {
throw new RuntimeException("Failed to obtain MinecraftKey constructor", e);
}
if (CONSTRUCTOR == null) {
CONSTRUCTOR = Accessors.getConstructorAccessor(MinecraftReflection.getMinecraftKeyClass(),
String.class, String.class);
}
try {
return constructor.newInstance(specific.getPrefix(), specific.getKey());
} catch (ReflectiveOperationException e) {
throw new RuntimeException("Failed to create new MinecraftKey", e);
}
return CONSTRUCTOR.invoke(specific.getPrefix(), specific.getKey());
}
@Override

17
src/main/java/com/comphenix/protocol/wrappers/WrappedAttribute.java
View File

@ -264,6 +264,10 @@ public final class WrappedAttribute extends AbstractWrapper {
return newBuilder(this).modifiers(modifiers).build();
}
public WrappedAttribute shallowClone() {
return newBuilder(this).build();
}
@Override
public boolean equals(Object obj) {
if (this == obj)
@ -363,7 +367,7 @@ public final class WrappedAttribute extends AbstractWrapper {
private double baseValue = Double.NaN;
private String attributeKey;
private PacketContainer packet;
private Collection<WrappedAttributeModifier> modifiers = Collections.emptyList();
private Set<WrappedAttributeModifier> modifiers = new HashSet<>();
Builder(WrappedAttribute template) {
if (template != null) {
@ -407,7 +411,14 @@ public final class WrappedAttribute extends AbstractWrapper {
* @return This builder, for chaining.
*/
public Builder modifiers(Collection<WrappedAttributeModifier> modifiers) {
this.modifiers = Preconditions.checkNotNull(modifiers, "modifiers cannot be NULL - use an empty list instead.");
Preconditions.checkNotNull(modifiers, "modifiers cannot be NULL - use an empty list instead.");
this.modifiers.addAll(modifiers);
return this;
}
public Builder addModifier(WrappedAttributeModifier modifier) {
Preconditions.checkNotNull(modifier, "modifier cannot be NULL.");
this.modifiers.add(modifier);
return this;
}
@ -416,7 +427,9 @@ public final class WrappedAttribute extends AbstractWrapper {
*
* @param packet - the parent packet.
* @return This builder, for chaining.
* @deprecated Removed in 1.17
*/
@Deprecated
public Builder packet(PacketContainer packet) {
if (Preconditions.checkNotNull(packet, "packet cannot be NULL").getType() != PacketType.Play.Server.UPDATE_ATTRIBUTES) {
throw new IllegalArgumentException("Packet must be UPDATE_ATTRIBUTES (44)");

221
src/main/java/com/comphenix/protocol/wrappers/WrappedAttributeModifier.java
View File

@ -1,18 +1,22 @@
package com.comphenix.protocol.wrappers;
import java.lang.reflect.Constructor;
import java.util.Optional;
import java.util.UUID;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.comphenix.protocol.events.InternalStructure;
import com.comphenix.protocol.reflect.EquivalentConverter;
import com.comphenix.protocol.reflect.FuzzyReflection;
import com.comphenix.protocol.reflect.StructureModifier;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.utility.MinecraftVersion;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import javax.annotation.Nonnull;
import java.lang.reflect.Constructor;
import java.util.UUID;
import java.util.function.Supplier;
import com.google.common.base.Preconditions;
/**
* Represents a wrapper around a AttributeModifier.
@ -23,6 +27,8 @@ import java.util.function.Supplier;
*/
public class WrappedAttributeModifier extends AbstractWrapper {
private static final boolean OPERATION_ENUM = MinecraftVersion.VILLAGE_UPDATE.atOrAbove();
static final boolean USES_RESOURCE_LOCATION = MinecraftVersion.v1_21_0.atOrAbove();
private static final Class<?> OPERATION_CLASS;
private static final EquivalentConverter<Operation> OPERATION_CONVERTER;
@ -131,41 +137,24 @@ public class WrappedAttributeModifier extends AbstractWrapper {
throw new IllegalArgumentException("Corrupt operation ID " + id + " detected.");
}
}
// Shared structure modifier
private static StructureModifier<Object> BASE_MODIFIER;
// The constructor we are interested in
private static Constructor<?> ATTRIBUTE_MODIFIER_CONSTRUCTOR;
private static ConstructorAccessor ATTRIBUTE_MODIFIER_CONSTRUCTOR;
// A modifier for the wrapped handler
protected StructureModifier<Object> modifier;
protected InternalStructure modifier;
// Cached values
@Nullable
private final MinecraftKey key;
@Nullable
private final UUID uuid;
private final Supplier<String> name;
private final Operation operation;
private final double amount;
/**
* Construct a new wrapped attribute modifier with no associated handle.
* <p>
* Note that the handle object is not initialized after this constructor.
* @param uuid - the UUID.
* @param name - the human readable name.
* @param amount - the amount.
* @param operation - the operation.
*/
protected WrappedAttributeModifier(UUID uuid, String name, double amount, Operation operation) {
super(MinecraftReflection.getAttributeModifierClass());
// Use the supplied values instead of reading from the NMS instance
this.uuid = uuid;
this.name = () -> name;
this.amount = amount;
this.operation = operation;
}
/**
* Construct an attribute modifier wrapper around a given NMS instance.
* @param handle - the NMS instance.
@ -176,24 +165,29 @@ public class WrappedAttributeModifier extends AbstractWrapper {
super(MinecraftReflection.getAttributeModifierClass());
setHandle(handle);
initializeModifier(handle);
// Load final values, caching them
this.uuid = (UUID) modifier.withType(UUID.class).read(0);
StructureModifier<String> stringMod = modifier.withType(String.class);
if (stringMod.size() == 0) {
Supplier<String> supplier = (Supplier<String>) modifier.withType(Supplier.class).read(0);
this.name = supplier;
if (USES_RESOURCE_LOCATION) {
this.key = modifier.getMinecraftKeys().read(0);
this.uuid = null;
this.name = () -> null;
} else {
this.name = () -> stringMod.read(0);
this.key = null;
this.uuid = modifier.getUUIDs().read(0);
Optional<String> name = modifier.getStrings().optionRead(0);
if (name.isPresent()) {
this.name = name::get;
} else {
this.name = (Supplier<String>) modifier.getModifier().withType(Supplier.class).read(0);
}
}
this.amount = (Double) modifier.withType(double.class).read(0);
this.amount = modifier.getDoubles().read(0);
if (OPERATION_ENUM) {
this.operation = modifier.withType(OPERATION_CLASS, OPERATION_CONVERTER).readSafely(0);
this.operation = modifier.getModifier().withType(OPERATION_CLASS, OPERATION_CONVERTER).readSafely(0);
} else {
this.operation = Operation.fromId((Integer) modifier.withType(int.class).readSafely(0));
this.operation = Operation.fromId(modifier.getIntegers().readSafely(0));
}
}
@ -206,12 +200,31 @@ public class WrappedAttributeModifier extends AbstractWrapper {
* @param operation - the operation.
*/
protected WrappedAttributeModifier(@Nonnull Object handle, UUID uuid, String name, double amount, Operation operation) {
this(uuid, name, amount, operation);
super(MinecraftReflection.getAttributeModifierClass());
this.uuid = uuid;
this.name = () -> name;
this.amount = amount;
this.operation = operation;
this.key = null;
// Initialize handle and modifier
setHandle(handle);
initializeModifier(handle);
}
protected WrappedAttributeModifier(Object handle, MinecraftKey key, double amount, Operation operation) {
super(MinecraftReflection.getAttributeModifierClass());
this.uuid = null;
this.key = key;
this.amount = amount;
this.name = key::toString;
this.operation = operation;
setHandle(handle);
initializeModifier(handle);
}
/**
* Construct a new attribute modifier builder.
@ -256,11 +269,11 @@ public class WrappedAttributeModifier extends AbstractWrapper {
* @param handle - the handle.
*/
private void initializeModifier(@Nonnull Object handle) {
// Initialize modifier
if (BASE_MODIFIER == null) {
BASE_MODIFIER = new StructureModifier<>(MinecraftReflection.getAttributeModifierClass());
}
this.modifier = BASE_MODIFIER.withTarget(handle);
this.modifier = InternalStructure.getConverter().getSpecific(handle);
}
public MinecraftKey getKey() {
return key;
}
/**
@ -312,7 +325,7 @@ public class WrappedAttributeModifier extends AbstractWrapper {
* @param pending - TRUE if it is pending, FALSE otherwise.
*/
public void setPendingSynchronization(boolean pending) {
modifier.withType(boolean.class).write(0, pending);
modifier.getBooleans().write(0, pending);
}
/**
@ -320,7 +333,7 @@ public class WrappedAttributeModifier extends AbstractWrapper {
* @return TRUE if it is, FALSE otherwise.
*/
public boolean isPendingSynchronization() {
return (Boolean) modifier.withType(boolean.class).optionRead(0).orElse(false);
return modifier.getBooleans().optionRead(0).orElse(false);
}
/**
@ -331,25 +344,34 @@ public class WrappedAttributeModifier extends AbstractWrapper {
* @return TRUE if the given object is the same, FALSE otherwise.
*/
public boolean equals(Object obj) {
if (obj == this)
return true;
if (obj == this) return true;
if (obj == null) return false;
if (obj instanceof WrappedAttributeModifier) {
WrappedAttributeModifier other = (WrappedAttributeModifier) obj;
// Ensure they are equal
return Objects.equal(uuid, other.getUUID());
if (USES_RESOURCE_LOCATION) {
return this.key.equals(other.key);
} else {
return this.uuid.equals(other.uuid);
}
}
return false;
}
@Override
public int hashCode() {
return uuid != null ? uuid.hashCode() : 0;
if (USES_RESOURCE_LOCATION) {
return key != null ? key.hashCode() : 0;
} else {
return uuid != null ? uuid.hashCode() : 0;
}
}
@Override
public String toString() {
return "[amount=" + amount + ", operation=" + operation + ", name='" + name + "', id=" + uuid + ", serialize=" + isPendingSynchronization() + "]";
return "[key=" + key + ", amount=" + amount + ", operation=" + operation + "]";
}
/**
@ -363,13 +385,15 @@ public class WrappedAttributeModifier extends AbstractWrapper {
private String name = "Unknown";
private double amount;
private UUID uuid;
private MinecraftKey key;
private Builder(WrappedAttributeModifier template) {
if (template != null) {
operation = template.getOperation();
name = template.getName();
amount = template.getAmount();
uuid = template.getUUID();
this.operation = template.getOperation();
this.name = template.getName();
this.amount = template.getAmount();
this.uuid = template.getUUID();
this.key = template.getKey();
}
}
@ -382,6 +406,7 @@ public class WrappedAttributeModifier extends AbstractWrapper {
* @param uuid - the uuid to supply to the new object.
* @return This builder, for chaining.
*/
@Deprecated
public Builder uuid(@Nonnull UUID uuid) {
this.uuid = Preconditions.checkNotNull(uuid, "uuid cannot be NULL.");
return this;
@ -403,11 +428,21 @@ public class WrappedAttributeModifier extends AbstractWrapper {
* @param name - the name of the modifier.
* @return This builder, for chaining.
*/
@Deprecated
public Builder name(@Nonnull String name) {
this.name = Preconditions.checkNotNull(name, "name cannot be NULL.");
return this;
}
public Builder key(@Nonnull MinecraftKey key) {
this.key = Preconditions.checkNotNull(key, "key cannot be NULL.");
return this;
}
public Builder key(String prefix, String value) {
return key(new MinecraftKey(prefix, value));
}
/**
* Set the amount to modify in the operation.
*
@ -435,12 +470,28 @@ public class WrappedAttributeModifier extends AbstractWrapper {
// Construct it
try {
// No need to read these values with a modifier
return new WrappedAttributeModifier(
ATTRIBUTE_MODIFIER_CONSTRUCTOR.newInstance(
uuid, name, amount, getOperationParam(operation)),
uuid, name, amount, operation
);
if (USES_RESOURCE_LOCATION) {
if (key == null) {
UUID uuid = this.uuid != null ? this.uuid : UUID.randomUUID();
key = new MinecraftKey("protocollib", uuid.toString());
}
Object handle = ATTRIBUTE_MODIFIER_CONSTRUCTOR.invoke(
MinecraftKey.getConverter().getGeneric(key),
amount,
OPERATION_CONVERTER.getGeneric(operation)
);
return new WrappedAttributeModifier(handle, key, amount, operation);
} else {
Object handle = ATTRIBUTE_MODIFIER_CONSTRUCTOR.invoke(
uuid, name, amount, getOperationParam(operation));
return new WrappedAttributeModifier(
handle,
uuid, name, amount, operation
);
}
} catch (Exception e) {
throw new RuntimeException("Cannot construct AttributeModifier.", e);
}
@ -451,22 +502,30 @@ public class WrappedAttributeModifier extends AbstractWrapper {
return OPERATION_ENUM ? OPERATION_CONVERTER.getGeneric(operation) : operation.getId();
}
private static Constructor<?> getConstructor() {
FuzzyMethodContract.Builder builder = FuzzyMethodContract
.newBuilder()
.parameterCount(4)
private static ConstructorAccessor getConstructor() {
FuzzyMethodContract.Builder builder = FuzzyMethodContract.newBuilder();
if (USES_RESOURCE_LOCATION) {
builder.parameterCount(3)
.parameterDerivedOf(MinecraftReflection.getMinecraftKeyClass())
.parameterExactType(double.class)
.parameterExactType(OPERATION_CLASS);
} else {
builder.parameterCount(4)
.parameterDerivedOf(UUID.class, 0)
.parameterExactType(String.class, 1)
.parameterExactType(double.class, 2);
if (OPERATION_ENUM) {
builder = builder.parameterExactType(OPERATION_CLASS, 3);
} else {
builder = builder.parameterExactType(int.class, 3);
if (OPERATION_ENUM) {
builder.parameterExactType(OPERATION_CLASS, 3);
} else {
builder.parameterExactType(int.class, 3);
}
}
Constructor<?> ret = FuzzyReflection.fromClass(MinecraftReflection.getAttributeModifierClass(), true)
.getConstructor(builder.build());
ret.setAccessible(true);
return ret;
Constructor<?> ret = FuzzyReflection
.fromClass(MinecraftReflection.getAttributeModifierClass(), true)
.getConstructor(builder.build());
return Accessors.getConstructorAccessor(ret);
}
}

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

@ -17,35 +17,29 @@ import net.minecraft.core.LayeredRegistryAccess;
import net.minecraft.resources.RegistryDataLoader;
import net.minecraft.server.DataPackResources;
import net.minecraft.server.DispenserRegistry;
import net.minecraft.server.Main;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.RegistryLayer;
import net.minecraft.server.WorldLoader;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.dedicated.DedicatedServerProperties;
import net.minecraft.server.level.WorldServer;
import net.minecraft.server.packs.EnumResourcePackType;
import net.minecraft.server.packs.repository.ResourcePackLoader;
import net.minecraft.server.packs.repository.ResourcePackRepository;
import net.minecraft.server.packs.repository.ResourcePackSourceVanilla;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.world.flag.FeatureFlagSet;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.item.enchantment.Enchantments;
import org.apache.logging.log4j.LogManager;
import org.bukkit.Bukkit;
import org.bukkit.Keyed;
import org.bukkit.NamespacedKey;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_20_R4.CraftLootTable;
import org.bukkit.craftbukkit.v1_20_R4.CraftRegistry;
import org.bukkit.craftbukkit.v1_20_R4.CraftServer;
import org.bukkit.craftbukkit.v1_20_R4.CraftWorld;
import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemFactory;
import org.bukkit.craftbukkit.v1_20_R4.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.v1_20_R4.util.CraftNamespacedKey;
import org.bukkit.craftbukkit.v1_20_R4.util.Versioning;
import org.bukkit.craftbukkit.v1_21_R1.CraftLootTable;
import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry;
import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
import org.bukkit.craftbukkit.v1_21_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemFactory;
import org.bukkit.craftbukkit.v1_21_R1.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.v1_21_R1.util.Versioning;
import org.spigotmc.SpigotWorldConfig;
import static org.mockito.ArgumentMatchers.any;
@ -116,13 +110,13 @@ public class BukkitInitialization {
DataPackResources dataPackResources = DataPackResources.a(
resourceManager,
layeredRegistryAccess,
FeatureFlagSet.a() /* REGISTRY.allFlags() */,
FeatureFlags.d.a() /* REGISTRY.allFlags() */,
CommandDispatcher.ServerType.b /* DEDICATED */,
0,
MoreExecutors.directExecutor(),
MoreExecutors.directExecutor()
).join();
// dataPackResources.a(registryCustom); // .updateRegistryTags()
dataPackResources.g();
try {
IRegistry.class.getName();
@ -148,10 +142,10 @@ public class BukkitInitialization {
when(mockedServer.isPrimaryThread()).thenReturn(true);
when(mockedServer.getItemFactory()).thenReturn(CraftItemFactory.instance());
when(mockedServer.getUnsafe()).thenReturn(CraftMagicNumbers.INSTANCE);
/*when(mockedServer.getLootTable(any())).thenAnswer(invocation -> {
when(mockedServer.getLootTable(any())).thenAnswer(invocation -> {
NamespacedKey key = invocation.getArgument(0);
return new CraftLootTable(key, dataPackResources.b().b(CraftNamespacedKey.toMinecraft(key)));
});*/
return new CraftLootTable(key, dataPackResources.b().b(CraftLootTable.bukkitKeyToMinecraft(key)));
});
when(mockedServer.getRegistry(any())).thenAnswer(invocation -> {
Class<Keyed> registryType = invocation.getArgument(0);
return CraftRegistry.createRegistry(registryType, registryCustom);

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

@ -15,12 +15,9 @@
*/
package com.comphenix.protocol.events;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -43,15 +40,32 @@ import com.comphenix.protocol.reflect.accessors.FieldAccessor;
import com.comphenix.protocol.reflect.cloning.SerializableCloner;
import com.comphenix.protocol.utility.MinecraftMethods;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.wrappers.*;
import com.comphenix.protocol.wrappers.BlockPosition;
import com.comphenix.protocol.wrappers.BukkitConverters;
import com.comphenix.protocol.wrappers.ComponentConverter;
import com.comphenix.protocol.wrappers.CustomPacketPayloadWrapper;
import com.comphenix.protocol.wrappers.EnumWrappers;
import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
import com.comphenix.protocol.wrappers.EnumWrappers.EntityUseAction;
import com.comphenix.protocol.wrappers.EnumWrappers.Hand;
import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
import com.comphenix.protocol.wrappers.EnumWrappers.SoundCategory;
import com.comphenix.protocol.wrappers.MovingObjectPositionBlock;
import com.comphenix.protocol.wrappers.Pair;
import com.comphenix.protocol.wrappers.PlayerInfoData;
import com.comphenix.protocol.wrappers.WrappedBlockData;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import com.comphenix.protocol.wrappers.WrappedDataValue;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Registry;
import com.comphenix.protocol.wrappers.WrappedEnumEntityUseAction;
import com.comphenix.protocol.wrappers.WrappedGameProfile;
import com.comphenix.protocol.wrappers.WrappedMessageSignature;
import com.comphenix.protocol.wrappers.WrappedRegistry;
import com.comphenix.protocol.wrappers.WrappedRemoteChatSessionData;
import com.comphenix.protocol.wrappers.nbt.NbtCompound;
import com.comphenix.protocol.wrappers.nbt.NbtFactory;
import com.google.common.collect.Lists;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ClickEvent;
@ -61,10 +75,6 @@ import net.md_5.bungee.api.chat.hover.content.Text;
import net.minecraft.core.Holder;
import net.minecraft.core.IRegistry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.PacketDataSerializer;
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.custom.BrandPayload;
import net.minecraft.network.protocol.game.PacketPlayOutGameStateChange;
import net.minecraft.network.protocol.game.PacketPlayOutUpdateAttributes;
import net.minecraft.network.protocol.game.PacketPlayOutUpdateAttributes.AttributeSnapshot;
@ -91,17 +101,9 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static com.comphenix.protocol.utility.TestUtils.assertItemCollectionsEqual;
import static com.comphenix.protocol.utility.TestUtils.assertItemsEqual;
import static com.comphenix.protocol.utility.TestUtils.equivalentItem;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static com.comphenix.protocol.utility.TestUtils.*;
import static org.junit.jupiter.api.Assertions.*;
public class PacketContainerTest {
@ -199,6 +201,7 @@ public class PacketContainerTest {
}
@Test
@Disabled // TODO
public void testGetStringArrays() {
PacketContainer packet = new PacketContainer(PacketType.Play.Client.UPDATE_SIGN);
this.testObjectArray(packet.getStringArrays(), 0,
@ -508,14 +511,14 @@ public class PacketContainerTest {
// Initialize some test data
List<AttributeModifier> modifiers = Lists.newArrayList(
new AttributeModifier(UUID.randomUUID(), "Unknown synced attribute modifier", 10,
new AttributeModifier(MinecraftKey.a("protocollib:test"),10,
AttributeModifier.Operation.a));
// Obtain an AttributeSnapshot instance. This is complicated by the fact that AttributeSnapshots
// are inner classes (which is ultimately pointless because AttributeSnapshots don't access any
// members of the packet itself)
PacketPlayOutUpdateAttributes packet = (PacketPlayOutUpdateAttributes) attribute.getHandle();
IRegistry<AttributeBase> registry = BuiltInRegistries.u;
IRegistry<AttributeBase> registry = BuiltInRegistries.s;
AttributeBase base = registry.a(MinecraftKey.a("generic.max_health"));
AttributeSnapshot snapshot = new AttributeSnapshot(Holder.a(base), 20.0D, modifiers);
attribute.getSpecificModifier(List.class).write(0, Lists.newArrayList(snapshot));
@ -908,7 +911,7 @@ public class PacketContainerTest {
// Make sure watchable collections can be cloned
if (type == PacketType.Play.Server.ENTITY_METADATA) {
IRegistry<CatVariant> catVariantRegistry = BuiltInRegistries.ak;
IRegistry<CatVariant> catVariantRegistry = BuiltInRegistries.ai;
constructed.getDataValueCollectionModifier().write(0, Lists.newArrayList(
new WrappedDataValue(0, Registry.get(Byte.class), (byte) 1),
new WrappedDataValue(0, Registry.get(Float.class), 5F),

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

@ -12,8 +12,8 @@ import net.minecraft.server.level.PlayerChunkMap;
import net.minecraft.server.level.PlayerChunkMap.EntityTracker;
import net.minecraft.server.level.WorldServer;
import net.minecraft.world.entity.Entity;
import org.bukkit.craftbukkit.v1_20_R4.CraftWorld;
import org.bukkit.craftbukkit.v1_20_R4.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_21_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_21_R1.entity.CraftEntity;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

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

@ -13,7 +13,7 @@ import net.minecraft.world.level.ChunkCoordIntPair;
import net.minecraft.world.level.block.state.IBlockData;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import org.junit.jupiter.api.AfterAll;

2
src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTestUtil.java
View File

@ -3,7 +3,7 @@ package com.comphenix.protocol.utility;
public class MinecraftReflectionTestUtil {
public static final String RELEASE_TARGET = "1.20.6";
public static final String PACKAGE_VERSION = "v1_20_R4";
public static final String PACKAGE_VERSION = "v1_21_R1";
public static final String NMS = "net.minecraft";
public static final String OBC = "org.bukkit.craftbukkit." + PACKAGE_VERSION;

4
src/test/java/com/comphenix/protocol/utility/MinecraftVersionTest.java
View File

@ -18,7 +18,7 @@
package com.comphenix.protocol.utility;
import com.comphenix.protocol.BukkitInitialization;
import com.comphenix.protocol.utility.MinecraftVersion;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@ -48,7 +48,7 @@ class MinecraftVersionTest {
@Test
void testCurrent() {
assertEquals(MinecraftVersion.v1_20_5, MinecraftVersion.getCurrentVersion());
assertEquals(MinecraftVersion.v1_21_0, MinecraftVersion.getCurrentVersion());
}
@Test

14
src/test/java/com/comphenix/protocol/wrappers/AutoWrapperTest.java
View File

@ -2,13 +2,6 @@ package com.comphenix.protocol.wrappers;
import java.util.Optional;
import static com.comphenix.protocol.utility.MinecraftReflection.getMinecraftClass;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertSame;
import com.comphenix.protocol.BukkitInitialization;
import com.comphenix.protocol.utility.MinecraftReflection;
@ -16,12 +9,15 @@ import net.minecraft.advancements.AdvancementDisplay;
import net.minecraft.advancements.AdvancementFrameType;
import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.network.chat.contents.LiteralContents;
import net.minecraft.world.item.Items;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static com.comphenix.protocol.utility.MinecraftReflection.getMinecraftClass;
import static org.junit.jupiter.api.Assertions.*;
public class AutoWrapperTest {
@BeforeAll
@ -64,7 +60,7 @@ public class AutoWrapperTest {
(net.minecraft.world.item.ItemStack)MinecraftReflection.getMinecraftItemStack(new ItemStack(Material.ENDER_EYE)),
IChatBaseComponent.b("Test123"),
IChatBaseComponent.b("Test567"),
Optional.of(new net.minecraft.resources.MinecraftKey("minecraft", "test")),
Optional.of(net.minecraft.resources.MinecraftKey.a("minecraft", "test")),
AdvancementFrameType.b,
true,
false,

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

@ -94,7 +94,7 @@ public class WrappedAttributeTest {
modifiers.add((AttributeModifier) wrapper.getHandle());
}
IRegistry<AttributeBase> registry = BuiltInRegistries.u;
IRegistry<AttributeBase> registry = BuiltInRegistries.s;
String attributeKey = attribute.getAttributeKey();
MinecraftKey key = MinecraftKey.a(attributeKey);
AttributeBase base = registry.a(key);
@ -104,6 +104,7 @@ public class WrappedAttributeTest {
private AttributeModifier getModifierCopy(WrappedAttributeModifier modifier) {
AttributeModifier.Operation operation = AttributeModifier.Operation.values()[modifier.getOperation().getId()];
return new AttributeModifier(modifier.getUUID(), modifier.getName(), modifier.getAmount(), operation);
return new AttributeModifier((MinecraftKey) com.comphenix.protocol.wrappers.MinecraftKey.getConverter().getGeneric(modifier.getKey()),
modifier.getAmount(), operation);
}
}

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

@ -19,9 +19,9 @@ import net.minecraft.world.level.block.state.IBlockData;
import org.bukkit.Material;
import org.bukkit.block.BlockFace;
import org.bukkit.block.data.type.GlassPane;
import org.bukkit.craftbukkit.v1_20_R4.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_20_R4.block.impl.CraftStainedGlassPane;
import org.bukkit.craftbukkit.v1_20_R4.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.v1_21_R1.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_21_R1.block.impl.CraftStainedGlassPane;
import org.bukkit.craftbukkit.v1_21_R1.util.CraftMagicNumbers;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

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

@ -28,7 +28,7 @@ import com.comphenix.protocol.wrappers.nbt.NbtFactory;
import net.minecraft.world.entity.projectile.EntityEgg;
import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.craftbukkit.v1_20_R4.entity.CraftEgg;
import org.bukkit.craftbukkit.v1_21_R1.entity.CraftEgg;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import org.junit.jupiter.api.BeforeAll;

4
src/test/java/com/comphenix/protocol/wrappers/WrappedStreamCodecTests.java
View File

@ -10,8 +10,8 @@ import net.minecraft.network.protocol.game.PacketPlayOutOpenBook;
import net.minecraft.network.protocol.game.PacketPlayOutSetSlot;
import net.minecraft.world.EnumHand;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_20_R4.CraftRegistry;
import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry;
import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
import org.bukkit.inventory.ItemStack;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;