mirror of
https://github.com/dmulloy2/ProtocolLib.git
synced 2025-04-04 19:25:58 +02:00
Restore backwards compatibility (#1235)
* Remove usages of net.minecraft and craftbukkit * Restore packet type backward compatibility (tested on 1.8) * Re-add last removed packets * Fix sub class naming for newer minecraft versions
This commit is contained in:
Pasqual Koschmieder
GitHub
parent
76930ae6e8
commit
90a38cc15c
@ -143,9 +143,9 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
|
||||
public static final PacketType LOGIN = new PacketType(PROTOCOL, SENDER, 0x26, "Login", "SPacketJoinGame");
|
||||
public static final PacketType MAP = new PacketType(PROTOCOL, SENDER, 0x27, "Map", "SPacketMaps");
|
||||
public static final PacketType OPEN_WINDOW_MERCHANT = new PacketType(PROTOCOL, SENDER, 0x28, "OpenWindowMerchant");
|
||||
public static final PacketType REL_ENTITY_MOVE = new PacketType(PROTOCOL, SENDER, 0x29, "Entity$PacketPlayOutRelEntityMove");
|
||||
public static final PacketType REL_ENTITY_MOVE_LOOK = new PacketType(PROTOCOL, SENDER, 0x2A, "Entity$PacketPlayOutRelEntityMoveLook");
|
||||
public static final PacketType ENTITY_LOOK = new PacketType(PROTOCOL, SENDER, 0x2B, "Entity$PacketPlayOutEntityLook");
|
||||
public static final PacketType REL_ENTITY_MOVE = new PacketType(PROTOCOL, SENDER, 0x29, "Entity$PacketPlayOutRelEntityMove", "Entity$RelEntityMove");
|
||||
public static final PacketType REL_ENTITY_MOVE_LOOK = new PacketType(PROTOCOL, SENDER, 0x2A, "Entity$PacketPlayOutRelEntityMoveLook", "Entity$RelEntityMoveLook");
|
||||
public static final PacketType ENTITY_LOOK = new PacketType(PROTOCOL, SENDER, 0x2B, "Entity$PacketPlayOutEntityLook", "Entity$EntityLook");
|
||||
public static final PacketType VEHICLE_MOVE = new PacketType(PROTOCOL, SENDER, 0x2C, "VehicleMove", "SPacketMoveVehicle");
|
||||
public static final PacketType OPEN_BOOK = new PacketType(PROTOCOL, SENDER, 0x2D, "OpenBook");
|
||||
public static final PacketType OPEN_WINDOW = new PacketType(PROTOCOL, SENDER, 0x2E, "OpenWindow", "SPacketOpenWindow");
|
||||
@ -267,7 +267,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
|
||||
* @deprecated Removed in 1.14
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType BED = new PacketType(PROTOCOL, SENDER, 0x33, "Bed", "SPacketUseBed");
|
||||
public static final PacketType BED = new PacketType(PROTOCOL, SENDER, 251, "Bed", "SPacketUseBed");
|
||||
|
||||
/**
|
||||
* @deprecated Renamed to {@link #BED}
|
||||
@ -279,25 +279,37 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
|
||||
* @deprecated Removed in 1.16
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType SPAWN_ENTITY_WEATHER = new PacketType(PROTOCOL, SENDER, 0x02, "SpawnEntityWeather", "SPacketSpawnGlobalEntity");
|
||||
public static final PacketType SPAWN_ENTITY_WEATHER = new PacketType(PROTOCOL, SENDER, 250, "SpawnEntityWeather", "SPacketSpawnGlobalEntity");
|
||||
|
||||
/**
|
||||
* @deprecated Removed in 1.17, split into separate packets
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType TITLE = new PacketType(PROTOCOL, SENDER, 0x00, "Title");
|
||||
public static final PacketType TITLE = new PacketType(PROTOCOL, SENDER, 249, "Title");
|
||||
|
||||
/**
|
||||
* @deprecated Removed in 1.17, split into separate packets
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType WORLD_BORDER = new PacketType(PROTOCOL, SENDER, 0x00, "WorldBorder");
|
||||
public static final PacketType WORLD_BORDER = new PacketType(PROTOCOL, SENDER, 248, "WorldBorder");
|
||||
|
||||
/**
|
||||
* @deprecated Removed in 1.17, split into separate packets
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType COMBAT_EVENT = new PacketType(PROTOCOL, SENDER, 0x00, "CombatEvent");
|
||||
public static final PacketType COMBAT_EVENT = new PacketType(PROTOCOL, SENDER, 247, "CombatEvent");
|
||||
|
||||
/**
|
||||
* @deprecated Removed in 1.17
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType TRANSACTION = new PacketType(PROTOCOL, SENDER, 246, "Transaction", "SPacketConfirmTransaction");
|
||||
|
||||
/**
|
||||
* @deprecated Made abstract in 1.17, no actual packet anymore
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType ENTITY = new PacketType(PROTOCOL, SENDER, 245, "Entity", "SPacketEntity");
|
||||
|
||||
private final static Server INSTANCE = new Server();
|
||||
|
||||
@ -336,10 +348,10 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
|
||||
public static final PacketType JIGSAW_GENERATE = new PacketType(PROTOCOL, SENDER, 0x0E, "JigsawGenerate");
|
||||
public static final PacketType KEEP_ALIVE = new PacketType(PROTOCOL, SENDER, 0x0F, "KeepAlive", "CPacketKeepAlive");
|
||||
public static final PacketType DIFFICULTY_LOCK = new PacketType(PROTOCOL, SENDER, 0x10, "DifficultyLock");
|
||||
public static final PacketType POSITION = new PacketType(PROTOCOL, SENDER, 0x11, "Flying$PacketPlayInPosition");
|
||||
public static final PacketType POSITION_LOOK = new PacketType(PROTOCOL, SENDER, 0x12, "Flying$PacketPlayInPositionLook");
|
||||
public static final PacketType LOOK = new PacketType(PROTOCOL, SENDER, 0x13, "Flying$PacketPlayInLook");
|
||||
public static final PacketType GROUND = new PacketType(PROTOCOL, SENDER, 0x14, "Flying$d");
|
||||
public static final PacketType POSITION = new PacketType(PROTOCOL, SENDER, 0x11, "Flying$PacketPlayInPosition", "Flying$Position", "CPacketPlayer$Position");
|
||||
public static final PacketType POSITION_LOOK = new PacketType(PROTOCOL, SENDER, 0x12, "Flying$PacketPlayInPositionLook", "Flying$PositionLook", "CPacketPlayer$PositionRotation");
|
||||
public static final PacketType LOOK = new PacketType(PROTOCOL, SENDER, 0x13, "Flying$PacketPlayInLook", "Flying$Look", "CPacketPlayer$Rotation");
|
||||
public static final PacketType GROUND = new PacketType(PROTOCOL, SENDER, 0x14, "Flying$d", "Flying", "CPacketPlayer");
|
||||
public static final PacketType VEHICLE_MOVE = new PacketType(PROTOCOL, SENDER, 0x15, "VehicleMove", "CPacketVehicleMove");
|
||||
public static final PacketType BOAT_MOVE = new PacketType(PROTOCOL, SENDER, 0x16, "BoatMove", "CPacketSteerBoat");
|
||||
public static final PacketType PICK_ITEM = new PacketType(PROTOCOL, SENDER, 0x17, "PickItem");
|
||||
@ -347,7 +359,7 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
|
||||
public static final PacketType ABILITIES = new PacketType(PROTOCOL, SENDER, 0x19, "Abilities", "CPacketPlayerAbilities");
|
||||
public static final PacketType BLOCK_DIG = new PacketType(PROTOCOL, SENDER, 0x1A, "BlockDig", "CPacketPlayerDigging");
|
||||
public static final PacketType ENTITY_ACTION = new PacketType(PROTOCOL, SENDER, 0x1B, "EntityAction", "CPacketEntityAction");
|
||||
public static final PacketType STEER_VEHICLE = new PacketType(PROTOCOL, SENDER, 0x1C, "SteerVehicle");
|
||||
public static final PacketType STEER_VEHICLE = new PacketType(PROTOCOL, SENDER, 0x1C, "SteerVehicle", "CPacketInput");
|
||||
public static final PacketType PONG = new PacketType(PROTOCOL, SENDER, 0x1D, "Pong", "ServerboundPongPacket");
|
||||
public static final PacketType RECIPE_SETTINGS = new PacketType(PROTOCOL, SENDER, 0x1E, "RecipeSettings");
|
||||
public static final PacketType RECIPE_DISPLAYED = new PacketType(PROTOCOL, SENDER, 0x1F, "RecipeDisplayed", "CPacketRecipeInfo");
|
||||
@ -368,6 +380,12 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
|
||||
public static final PacketType USE_ITEM = new PacketType(PROTOCOL, SENDER, 0x2E, "UseItem", "CPacketPlayerTryUseItemOnBlock");
|
||||
public static final PacketType BLOCK_PLACE = new PacketType(PROTOCOL, SENDER, 0x2F, "BlockPlace", "CPacketPlayerTryUseItem");
|
||||
|
||||
/**
|
||||
* @deprecated Removed in 1.17
|
||||
*/
|
||||
@Deprecated
|
||||
public static final PacketType TRANSACTION = new PacketType(PROTOCOL, SENDER, 255, "Transaction", "CPacketConfirmTransaction");
|
||||
|
||||
private final static Client INSTANCE = new Client();
|
||||
|
||||
// Prevent accidental construction
|
||||
|
||||
@ -17,13 +17,22 @@
|
||||
|
||||
package com.comphenix.protocol.events;
|
||||
|
||||
import java.io.*;
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.io.ObjectOutputStream;
|
||||
import java.io.Serializable;
|
||||
import java.lang.reflect.Array;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.*;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@ -34,8 +43,6 @@ import com.comphenix.protocol.reflect.*;
|
||||
import com.comphenix.protocol.reflect.cloning.*;
|
||||
import com.comphenix.protocol.reflect.cloning.AggregateCloner.BuilderParameters;
|
||||
import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
|
||||
import com.comphenix.protocol.reflect.instances.DefaultInstances;
|
||||
import com.comphenix.protocol.reflect.instances.InstanceProvider;
|
||||
import com.comphenix.protocol.utility.MinecraftMethods;
|
||||
import com.comphenix.protocol.utility.MinecraftReflection;
|
||||
import com.comphenix.protocol.utility.MinecraftVersion;
|
||||
@ -45,6 +52,7 @@ import com.comphenix.protocol.wrappers.EnumWrappers.*;
|
||||
import com.comphenix.protocol.wrappers.nbt.NbtBase;
|
||||
import com.comphenix.protocol.wrappers.nbt.NbtCompound;
|
||||
import com.comphenix.protocol.wrappers.nbt.NbtFactory;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.Maps;
|
||||
@ -53,7 +61,6 @@ import com.google.common.collect.Sets;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.UnpooledByteBufAllocator;
|
||||
|
||||
import net.minecraft.network.PacketDataSerializer;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.World;
|
||||
@ -1247,10 +1254,12 @@ public class PacketContainer implements Serializable {
|
||||
|
||||
// Create a default instance of the packet
|
||||
if (MinecraftVersion.CAVES_CLIFFS_1.atOrAbove()) {
|
||||
PacketDataSerializer serializer = new PacketDataSerializer(buffer);
|
||||
Object serializer = MinecraftReflection.getPacketDataSerializer(buffer);
|
||||
|
||||
try {
|
||||
handle = type.getPacketClass().getConstructor(PacketDataSerializer.class).newInstance(serializer);
|
||||
handle = type.getPacketClass()
|
||||
.getConstructor(MinecraftReflection.getPacketDataSerializerClass())
|
||||
.newInstance(serializer);
|
||||
} catch (ReflectiveOperationException ex) {
|
||||
// they might have a static method to create them instead
|
||||
Method method = FuzzyReflection.fromClass(type.getPacketClass(), true)
|
||||
@ -1258,7 +1267,7 @@ public class PacketContainer implements Serializable {
|
||||
.newBuilder()
|
||||
.requireModifier(Modifier.STATIC)
|
||||
.returnTypeExact(type.getPacketClass())
|
||||
.parameterExactArray(PacketDataSerializer.class)
|
||||
.parameterExactArray(MinecraftReflection.getPacketDataSerializerClass())
|
||||
.build());
|
||||
try {
|
||||
handle = method.invoke(null, serializer);
|
||||
|
||||
@ -19,20 +19,29 @@ package com.comphenix.protocol.injector;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.injector.packet.PacketRegistry;
|
||||
import com.comphenix.protocol.reflect.accessors.Accessors;
|
||||
import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
|
||||
import com.comphenix.protocol.reflect.StructureModifier;
|
||||
import com.comphenix.protocol.reflect.compiler.BackgroundCompiler;
|
||||
import com.comphenix.protocol.reflect.compiler.CompiledStructureModifier;
|
||||
import com.comphenix.protocol.reflect.instances.DefaultInstances;
|
||||
import com.comphenix.protocol.utility.ByteBuddyFactory;
|
||||
import com.comphenix.protocol.utility.MinecraftMethods;
|
||||
import com.comphenix.protocol.utility.MinecraftReflection;
|
||||
import com.comphenix.protocol.utility.ZeroBuffer;
|
||||
import com.comphenix.protocol.utility.ZeroPacketDataSerializer;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import com.google.common.base.Preconditions;
|
||||
import net.minecraft.network.PacketDataSerializer;
|
||||
|
||||
import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
|
||||
import net.bytebuddy.implementation.FixedValue;
|
||||
import net.bytebuddy.matcher.ElementMatchers;
|
||||
|
||||
/**
|
||||
* Caches structure modifiers.
|
||||
@ -41,23 +50,37 @@ import net.minecraft.network.PacketDataSerializer;
|
||||
public class StructureCache {
|
||||
// Structure modifiers
|
||||
private static final ConcurrentMap<PacketType, StructureModifier<Object>> structureModifiers = new ConcurrentHashMap<>();
|
||||
// invocation cache for packets
|
||||
private static final ConcurrentMap<Class<?>, Supplier<Object>> PACKET_INSTANCE_CREATORS = new ConcurrentHashMap<>();
|
||||
// packet data serializer which always returns an empty nbt tag compound
|
||||
private static boolean trickTried;
|
||||
private static ConstructorAccessor TRICKED_DATA_SERIALIZER;
|
||||
|
||||
private static final Set<PacketType> compiling = new HashSet<>();
|
||||
|
||||
public static Object newPacket(Class<?> clazz) {
|
||||
Object result = DefaultInstances.DEFAULT.create(clazz);
|
||||
|
||||
// TODO make these generic
|
||||
if (result == null) {
|
||||
try {
|
||||
return clazz.getConstructor(PacketDataSerializer.class).newInstance(new PacketDataSerializer(new ZeroBuffer()));
|
||||
} catch (ReflectiveOperationException ex) {
|
||||
try {
|
||||
return clazz.getConstructor(PacketDataSerializer.class).newInstance(new ZeroPacketDataSerializer());
|
||||
} catch (ReflectiveOperationException ex1) {
|
||||
throw new IllegalArgumentException("Failed to create packet: " + clazz, ex);
|
||||
return PACKET_INSTANCE_CREATORS.computeIfAbsent(clazz, $ -> {
|
||||
ConstructorAccessor accessor = Accessors.getConstructorAccessorOrNull(clazz, MinecraftReflection.getPacketDataSerializerClass());
|
||||
if (accessor != null) {
|
||||
return () -> {
|
||||
try {
|
||||
return accessor.invoke(MinecraftReflection.getPacketDataSerializer(new ZeroBuffer()));
|
||||
} catch (Exception exception) {
|
||||
// try trick nms around as they want a non-null compound in the map_chunk packet constructor
|
||||
ConstructorAccessor trickyDataSerializerAccessor = getTrickDataSerializerOrNull();
|
||||
if (trickyDataSerializerAccessor != null) {
|
||||
return accessor.invoke(trickyDataSerializerAccessor.invoke(new ZeroBuffer()));
|
||||
}
|
||||
// the tricks are over
|
||||
throw new IllegalArgumentException("Unable to create packet " + clazz, exception);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
throw new IllegalArgumentException("No matching constructor to create packet in class " + clazz);
|
||||
}).get();
|
||||
}
|
||||
|
||||
return result;
|
||||
@ -148,4 +171,34 @@ public class StructureCache {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a packet data serializer sub-class if needed to allow the fixed read of a NbtTagCompound because of a null
|
||||
* check in the MapChunk packet constructor.
|
||||
* @return an accessor to a constructor which creates a data serializer.
|
||||
*/
|
||||
private static ConstructorAccessor getTrickDataSerializerOrNull() {
|
||||
if (TRICKED_DATA_SERIALIZER == null && !trickTried) {
|
||||
// ensure that we only try once to create the class
|
||||
trickTried = true;
|
||||
try {
|
||||
// create an empty instance of a nbt tag compound that we can re-use when needed
|
||||
Object compound = Accessors.getConstructorAccessor(MinecraftReflection.getNBTCompoundClass()).invoke();
|
||||
// create the method in the class to read an empty nbt tag compound (currently used for MAP_CHUNK because of null check)
|
||||
Class<?> generatedClass = ByteBuddyFactory.getInstance()
|
||||
.createSubclass(MinecraftReflection.getPacketDataSerializerClass())
|
||||
.name(MinecraftMethods.class.getPackage().getName() + ".ProtocolLibTricksNmsDataSerializer")
|
||||
.method(ElementMatchers.returns(MinecraftReflection.getNBTCompoundClass())
|
||||
.and(ElementMatchers.takesArguments(MinecraftReflection.getNBTReadLimiterClass())))
|
||||
.intercept(FixedValue.value(compound))
|
||||
.make()
|
||||
.load(ByteBuddyFactory.getInstance().getClassLoader(), ClassLoadingStrategy.Default.INJECTION)
|
||||
.getLoaded();
|
||||
TRICKED_DATA_SERIALIZER = Accessors.getConstructorAccessor(generatedClass, ByteBuf.class);
|
||||
} catch (Exception ignored) {
|
||||
// can happen if unsupported
|
||||
}
|
||||
}
|
||||
return TRICKED_DATA_SERIALIZER;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@ package com.comphenix.protocol.metrics;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.tuple.Pair;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.plugin.RegisteredServiceProvider;
|
||||
|
||||
@ -24,7 +24,6 @@ import com.comphenix.protocol.events.PacketListener;
|
||||
import com.comphenix.protocol.utility.Util;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
||||
@ -17,6 +17,11 @@
|
||||
|
||||
package com.comphenix.protocol.reflect.instances;
|
||||
|
||||
import com.comphenix.protocol.ProtocolLogger;
|
||||
import com.comphenix.protocol.reflect.accessors.MethodAccessor;
|
||||
import com.comphenix.protocol.utility.MinecraftReflection;
|
||||
import com.comphenix.protocol.wrappers.BukkitConverters;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -27,23 +32,27 @@ import java.util.logging.Level;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import com.comphenix.protocol.ProtocolLogger;
|
||||
import com.google.common.base.Objects;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
import net.minecraft.core.NonNullList;
|
||||
import net.minecraft.network.PacketDataSerializer;
|
||||
import net.minecraft.world.entity.EntityTypes;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
/**
|
||||
* Used to construct default instances of any type.
|
||||
* @author Kristian
|
||||
*
|
||||
*/
|
||||
public class DefaultInstances implements InstanceProvider {
|
||||
// system unique id representation
|
||||
private static final UUID SYS_UUID = new UUID(0L, 0L);
|
||||
|
||||
// minecraft default types
|
||||
private static final Object AIR_ITEM_STACK = BukkitConverters.getItemStackConverter().getGeneric(
|
||||
new ItemStack(Material.AIR));
|
||||
private static Object DEFAULT_ENTITY_TYPES; // modern servers only (older servers will use an entity type id)
|
||||
// minecraft method accessors
|
||||
private static final MethodAccessor NON_NULL_LIST_CREATE = MinecraftReflection.getNonNullListCreateAccessor();
|
||||
// fast util mappings for paper relocation
|
||||
private static final Map<Class<?>, Constructor<?>> FAST_MAP_CONSTRUCTORS = new ConcurrentHashMap<>();
|
||||
|
||||
public static final InstanceProvider MINECRAFT_GENERATOR = type -> {
|
||||
@ -52,10 +61,18 @@ public class DefaultInstances implements InstanceProvider {
|
||||
return SYS_UUID;
|
||||
} else if (type.isEnum()) {
|
||||
return type.getEnumConstants()[0];
|
||||
} else if (type == ItemStack.class) {
|
||||
return ItemStack.b;
|
||||
} else if (type == EntityTypes.class) {
|
||||
return EntityTypes.b;
|
||||
} else if (type == MinecraftReflection.getItemStackClass()) {
|
||||
return AIR_ITEM_STACK;
|
||||
} else if (type == MinecraftReflection.getEntityTypes()) {
|
||||
if (DEFAULT_ENTITY_TYPES == null) {
|
||||
// try to initialize now
|
||||
try {
|
||||
DEFAULT_ENTITY_TYPES = BukkitConverters.getEntityTypeConverter().getGeneric(EntityType.AREA_EFFECT_CLOUD);
|
||||
} catch (Exception ignored) {
|
||||
// not available in this version of minecraft
|
||||
}
|
||||
}
|
||||
return DEFAULT_ENTITY_TYPES;
|
||||
} else if (type.isAssignableFrom(Map.class)) {
|
||||
Constructor<?> ctor = FAST_MAP_CONSTRUCTORS.computeIfAbsent(type, __ -> {
|
||||
try {
|
||||
@ -71,8 +88,8 @@ public class DefaultInstances implements InstanceProvider {
|
||||
return ctor.newInstance();
|
||||
} catch (ReflectiveOperationException ignored) {}
|
||||
}
|
||||
} else if (type == NonNullList.class) {
|
||||
return NonNullList.a();
|
||||
} else if (NON_NULL_LIST_CREATE != null && type == MinecraftReflection.getNonNullListClass()) {
|
||||
return NON_NULL_LIST_CREATE.invoke(null);
|
||||
}
|
||||
}
|
||||
|
||||
@ -232,7 +249,7 @@ public class DefaultInstances implements InstanceProvider {
|
||||
// Note that we don't allow recursive types - that is, types that
|
||||
// require itself in the constructor.
|
||||
if (types.length < lastCount) {
|
||||
if (!contains(types, type) && !contains(types, PacketDataSerializer.class)) {
|
||||
if (!contains(types, type) && !contains(types, MinecraftReflection.getPacketDataSerializerClass())) {
|
||||
if (nonNull) {
|
||||
// Make sure all of these types are non-null
|
||||
if (isAnyNull(types, providers, recursionLevel)) {
|
||||
|
||||
@ -1890,6 +1890,19 @@ public class MinecraftReflection {
|
||||
return getMinecraftClass("core.NonNullList", "NonNullList");
|
||||
}
|
||||
|
||||
public static MethodAccessor getNonNullListCreateAccessor() {
|
||||
try {
|
||||
Class<?> nonNullListType = MinecraftReflection.getNonNullListClass();
|
||||
return Accessors.getMethodAccessor(FuzzyReflection.fromClass(nonNullListType).getMethod(
|
||||
FuzzyMethodContract.newBuilder()
|
||||
.returnTypeExact(nonNullListType)
|
||||
.requireModifier(Modifier.STATIC)
|
||||
.build()));
|
||||
} catch (Exception ex) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static Class<?> getCraftSoundClass() {
|
||||
return getCraftBukkitClass("CraftSound");
|
||||
}
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
package com.comphenix.protocol.utility;
|
||||
|
||||
import net.minecraft.nbt.NBTReadLimiter;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.PacketDataSerializer;
|
||||
|
||||
/**
|
||||
* Tricks NMS into letting us create empty packets.
|
||||
* This is currently only used for MAP_CHUNK, but should be replaced with ByteBuddy or similar.
|
||||
*/
|
||||
public class ZeroPacketDataSerializer extends PacketDataSerializer {
|
||||
public ZeroPacketDataSerializer() {
|
||||
super(new ZeroBuffer());
|
||||
}
|
||||
|
||||
public NBTTagCompound a(NBTReadLimiter lim) {
|
||||
return new NBTTagCompound();
|
||||
}
|
||||
}
|
||||
@ -17,9 +17,20 @@
|
||||
package com.comphenix.protocol.wrappers;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.lang.reflect.*;
|
||||
import java.util.*;
|
||||
import java.lang.reflect.Array;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Collectors;
|
||||
@ -47,18 +58,18 @@ import com.comphenix.protocol.wrappers.EnumWrappers.Dimension;
|
||||
import com.comphenix.protocol.wrappers.EnumWrappers.FauxEnumConverter;
|
||||
import com.comphenix.protocol.wrappers.nbt.NbtBase;
|
||||
import com.comphenix.protocol.wrappers.nbt.NbtFactory;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import com.mojang.serialization.DataResult;
|
||||
import net.minecraft.nbt.DynamicOpsNBT;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.level.dimension.DimensionManager;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.WorldType;
|
||||
import org.bukkit.advancement.Advancement;
|
||||
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
@ -1298,18 +1309,20 @@ public class BukkitConverters {
|
||||
}
|
||||
|
||||
private static FieldAccessor dimensionKey;
|
||||
private static MethodAccessor worldHandleAccessor;
|
||||
private static MethodAccessor worldHandleDimensionManagerAccessor;
|
||||
|
||||
public static EquivalentConverter<World> getDimensionConverter() {
|
||||
return ignoreNull(new EquivalentConverter<World>() {
|
||||
@Override
|
||||
public Object getGeneric(World specific) {
|
||||
return ((CraftWorld) specific).getHandle().getDimensionManager();
|
||||
return getWorldHandleDimensionManagerAccessor().invoke(getWorldHandleAccessor().invoke(specific));
|
||||
}
|
||||
|
||||
@Override
|
||||
public World getSpecific(Object generic) {
|
||||
for (World world : Bukkit.getWorlds()) {
|
||||
if (((CraftWorld) world).getHandle().getDimensionManager() == generic) {
|
||||
if (getGeneric(world) == generic) {
|
||||
return world;
|
||||
}
|
||||
}
|
||||
@ -1323,6 +1336,29 @@ public class BukkitConverters {
|
||||
});
|
||||
}
|
||||
|
||||
private static MethodAccessor getWorldHandleAccessor() {
|
||||
if (worldHandleAccessor == null) {
|
||||
Method handleMethod = FuzzyReflection.fromClass(MinecraftReflection.getCraftWorldClass())
|
||||
.getMethod(FuzzyMethodContract.newBuilder()
|
||||
.nameExact("getHandle") // i guess this will never change
|
||||
.returnTypeExact(MinecraftReflection.getWorldServerClass())
|
||||
.build());
|
||||
worldHandleAccessor = Accessors.getMethodAccessor(handleMethod);
|
||||
}
|
||||
return worldHandleAccessor;
|
||||
}
|
||||
|
||||
private static MethodAccessor getWorldHandleDimensionManagerAccessor() {
|
||||
if (worldHandleDimensionManagerAccessor == null) {
|
||||
Method dimensionGetter = FuzzyReflection.fromClass(MinecraftReflection.getWorldServerClass())
|
||||
.getMethod(FuzzyMethodContract.newBuilder()
|
||||
.returnTypeExact(MinecraftReflection.getDimensionManager())
|
||||
.build());
|
||||
worldHandleDimensionManagerAccessor = Accessors.getMethodAccessor(dimensionGetter);
|
||||
}
|
||||
return worldHandleDimensionManagerAccessor;
|
||||
}
|
||||
|
||||
public static EquivalentConverter<Integer> getDimensionIDConverter() {
|
||||
return ignoreNull(new EquivalentConverter<Integer>() {
|
||||
@Override
|
||||
@ -1352,7 +1388,11 @@ public class BukkitConverters {
|
||||
}
|
||||
|
||||
if (world != null) {
|
||||
return ((CraftWorld) world).getHandle().getDimensionManager();
|
||||
try {
|
||||
return getWorldHandleDimensionManagerAccessor().invoke(getWorldHandleAccessor().invoke(world));
|
||||
} catch (Exception ignored) {
|
||||
// method not available, fall through
|
||||
}
|
||||
}
|
||||
|
||||
throw new IllegalArgumentException();
|
||||
|
||||
@ -632,6 +632,14 @@ public class PacketContainerTest {
|
||||
assertEquals(position, clone.getPosition());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMapChunk() {
|
||||
// this is a special case as we are generating a data serializer class (we only need to construct the packet)
|
||||
PacketContainer container = new PacketContainer(PacketType.Play.Server.MAP_CHUNK);
|
||||
// check if we can read an nbt compound from the class
|
||||
assertTrue(container.getNbtModifier().optionRead(0).isPresent());
|
||||
}
|
||||
|
||||
/**
|
||||
* Actions from the outbound Boss packet. Used for testing generic enums.
|
||||
* @author dmulloy2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user