Skip to content

Commit

Permalink
Merge pull request #253 from shaijana/main
Browse files Browse the repository at this point in the history 
1.21.3 support
  • Loading branch information
@d0by1
d0by1 authored Nov 9, 2024
2 parents 4b5af19 + 2e19771 commit 3d48f46
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 14 deletions.
69 changes: 55 additions & 14 deletions src/main/java/eu/decentsoftware/holograms/api/nms/versions/NMS_1_17.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
import org.bukkit.inventory.ItemStack;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicInteger;
Expand All @@ -32,12 +34,16 @@ public class NMS_1_17 extends NMS {
private static final Class<?> ENUM_ITEM_SLOT_CLASS;
private static final Class<?> ENTITY_TYPES_CLASS;
private static final Class<?> VEC_3D_CLASS;
private static final Class<?> POSITION_MOVE_ROTATION_CLASS;
private static final ReflectField<?> ENTITY_TYPES_REGISTRY_FIELD;
private static final ReflectMethod REGISTRY_BLOCKS_FROM_ID_METHOD;
private static final ReflectMethod ENUM_ITEM_SLOT_FROM_NAME_METHOD;
private static final ReflectMethod CRAFT_ITEM_NMS_COPY_METHOD;
private static final ReflectMethod CRAFT_CHAT_MESSAGE_FROM_STRING_METHOD;
private static final ReflectMethod PAIR_OF_METHOD;
private static final ReflectConstructor POSITION_MOVE_ROTATION_CONSTRUCTOR;
private static final ReflectConstructor VEC_3D_CONSTRUCTOR;

// MATH HELPER
private static final Class<?> MATH_HELPER_CLASS;
private static final ReflectMethod MATH_HELPER_A_METHOD;
Expand Down Expand Up @@ -90,9 +96,17 @@ public class NMS_1_17 extends NMS {
ENUM_ITEM_SLOT_CLASS = ReflectionUtil.getNMClass("world.entity.EnumItemSlot");
ENTITY_TYPES_CLASS = ReflectionUtil.getNMClass("world.entity.EntityTypes");
VEC_3D_CLASS = ReflectionUtil.getNMClass("world.phys.Vec3D");
if (Version.afterOrEqual(Version.v1_21_R2)) {
POSITION_MOVE_ROTATION_CLASS = ReflectionUtil.getNMClass("world.entity.PositionMoveRotation");
} else {
POSITION_MOVE_ROTATION_CLASS = null;
}
CRAFT_ITEM_NMS_COPY_METHOD = new ReflectMethod(ReflectionUtil.getObcClass("inventory.CraftItemStack"), "asNMSCopy", ItemStack.class);
CRAFT_CHAT_MESSAGE_FROM_STRING_METHOD = new ReflectMethod(ReflectionUtil.getObcClass("util.CraftChatMessage"), "fromStringOrNull", String.class);
PAIR_OF_METHOD = new ReflectMethod(ReflectionUtil.getClass("com.mojang.datafixers.util.Pair"), "of", Object.class, Object.class);
POSITION_MOVE_ROTATION_CONSTRUCTOR = new ReflectConstructor(POSITION_MOVE_ROTATION_CLASS, VEC_3D_CLASS, VEC_3D_CLASS, float.class, float.class);
VEC_3D_CONSTRUCTOR = new ReflectConstructor(VEC_3D_CLASS, double.class, double.class, double.class);

// DATA WATCHER
DATA_WATCHER_ITEM_CONSTRUCTOR = new ReflectConstructor(DWI_CLASS, DWO_CLASS, Object.class);
if (Version.afterOrEqual(18)) {
Expand Down Expand Up @@ -144,8 +158,13 @@ public class NMS_1_17 extends NMS {
PACKET_SPAWN_ENTITY_CONSTRUCTOR = new ReflectConstructor(ReflectionUtil.getNMClass("network.protocol.game.PacketPlayOutSpawnEntity"),
int.class, UUID.class, double.class, double.class, double.class, float.class, float.class, ENTITY_TYPES_CLASS, int.class, VEC_3D_CLASS, double.class);
}
PACKET_ENTITY_TELEPORT_CONSTRUCTOR = new ReflectConstructor(ReflectionUtil.getNMClass("network.protocol.game.PacketPlayOutEntityTeleport"),
PACKET_DATA_SERIALIZER_CLASS);
if (Version.afterOrEqual(Version.v1_21_R2)) {
PACKET_ENTITY_TELEPORT_CONSTRUCTOR = new ReflectConstructor(ReflectionUtil.getNMClass("network.protocol.game.PacketPlayOutEntityTeleport"),
int.class, POSITION_MOVE_ROTATION_CLASS, Set.class, boolean.class);
} else {
PACKET_ENTITY_TELEPORT_CONSTRUCTOR = new ReflectConstructor(ReflectionUtil.getNMClass("network.protocol.game.PacketPlayOutEntityTeleport"),
PACKET_DATA_SERIALIZER_CLASS);
}
PACKET_MOUNT_CONSTRUCTOR = new ReflectConstructor(ReflectionUtil.getNMClass("network.protocol.game.PacketPlayOutMount"),
PACKET_DATA_SERIALIZER_CLASS);
PACKET_ENTITY_EQUIPMENT_CONSTRUCTOR = new ReflectConstructor(ReflectionUtil.getNMClass("network.protocol.game.PacketPlayOutEntityEquipment"),
Expand All @@ -162,7 +181,12 @@ public class NMS_1_17 extends NMS {
}
// DATA WATCHER OBJECT
if (Version.afterOrEqual(18)) {
if (Version.afterOrEqual(Version.v1_21_R1)) {
if (Version.afterOrEqual(Version.v1_21_R2)) {
DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "am").getValue(null);
DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aO").getValue(null);
DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aP").getValue(null);
DWO_ARMOR_STAND_DATA = new ReflectField<>(ENTITY_ARMOR_STAND_CLASS, "bJ").getValue(null);
} else if (Version.afterOrEqual(Version.v1_21_R1)) {
DWO_ENTITY_DATA = new ReflectField<>(ENTITY_CLASS, "ap").getValue(null);
DWO_CUSTOM_NAME = new ReflectField<>(ENTITY_CLASS, "aQ").getValue(null);
DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aR").getValue(null);
Expand Down Expand Up @@ -204,7 +228,9 @@ public class NMS_1_17 extends NMS {
DWO_CUSTOM_NAME_VISIBLE = new ReflectField<>(ENTITY_CLASS, "aK").getValue(null);
DWO_ARMOR_STAND_DATA = new ReflectField<>(ENTITY_ARMOR_STAND_CLASS, "bG").getValue(null);
}
if (Version.afterOrEqual(Version.v1_20_R4)) {
if (Version.afterOrEqual(Version.v1_21_R2)) {
DWO_ITEM = new ReflectField<>(ENTITY_ITEM_CLASS, "c").getValue(null);
} else if (Version.afterOrEqual(Version.v1_20_R4)) {
DWO_ITEM = new ReflectField<>(ENTITY_ITEM_CLASS, "d").getValue(null);
} else {
DWO_ITEM = new ReflectField<>(ENTITY_ITEM_CLASS, "c").getValue(null);
Expand All @@ -230,7 +256,13 @@ public class NMS_1_17 extends NMS {
} else {
ENTITY_COUNTER_FIELD = new ReflectField<>(ENTITY_CLASS, "b");
}
VEC_3D_A = new ReflectField<>(VEC_3D_CLASS, Version.afterOrEqual(19) ? "b" : "a").getValue(null);
if (Version.afterOrEqual(Version.v1_21_R2)) {
VEC_3D_A = new ReflectField<>(VEC_3D_CLASS, "c").getValue(null);
} else if (Version.afterOrEqual(19)) {
VEC_3D_A = new ReflectField<>(VEC_3D_CLASS, "b").getValue(null);
} else {
VEC_3D_A = new ReflectField<>(VEC_3D_CLASS, "a").getValue(null);
}
}

@Override
Expand Down Expand Up @@ -494,15 +526,24 @@ public void teleportFakeEntity(Player player, Location location, int entityId) {
Validate.notNull(player);
Validate.notNull(location);

Object packetDataSerializer = PACKET_DATA_SERIALIZER_CONSTRUCTOR.newInstance(Unpooled.buffer());
PACKET_DATA_SERIALIZER_WRITE_INT_METHOD.invoke(packetDataSerializer, entityId);
PACKET_DATA_SERIALIZER_WRITE_DOUBLE_METHOD.invoke(packetDataSerializer, location.getX());
PACKET_DATA_SERIALIZER_WRITE_DOUBLE_METHOD.invoke(packetDataSerializer, location.getY());
PACKET_DATA_SERIALIZER_WRITE_DOUBLE_METHOD.invoke(packetDataSerializer, location.getZ());
PACKET_DATA_SERIALIZER_WRITE_BYTE_METHOD.invoke(packetDataSerializer, (byte) ((int) (location.getYaw() * 256.0F / 360.0F)));
PACKET_DATA_SERIALIZER_WRITE_BYTE_METHOD.invoke(packetDataSerializer, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
PACKET_DATA_SERIALIZER_WRITE_BOOLEAN_METHOD.invoke(packetDataSerializer, false);
sendPacket(player, PACKET_ENTITY_TELEPORT_CONSTRUCTOR.newInstance(packetDataSerializer));
Object entityTeleportPacket;
if (Version.afterOrEqual(Version.v1_21_R2)) {
Object locationVec3d = VEC_3D_CONSTRUCTOR.newInstance(location.getX(), location.getY(), location.getZ());
Object zeroVec3d = VEC_3D_CONSTRUCTOR.newInstance(0.0, 0.0, 0.0);
Object positionMoveRotation = POSITION_MOVE_ROTATION_CONSTRUCTOR.newInstance(locationVec3d, zeroVec3d, location.getYaw(), location.getPitch() );
entityTeleportPacket = PACKET_ENTITY_TELEPORT_CONSTRUCTOR.newInstance(entityId, positionMoveRotation, new HashSet<>(), false);
} else {
Object packetDataSerializer = PACKET_DATA_SERIALIZER_CONSTRUCTOR.newInstance(Unpooled.buffer());
PACKET_DATA_SERIALIZER_WRITE_INT_METHOD.invoke(packetDataSerializer, entityId);
PACKET_DATA_SERIALIZER_WRITE_DOUBLE_METHOD.invoke(packetDataSerializer, location.getX());
PACKET_DATA_SERIALIZER_WRITE_DOUBLE_METHOD.invoke(packetDataSerializer, location.getY());
PACKET_DATA_SERIALIZER_WRITE_DOUBLE_METHOD.invoke(packetDataSerializer, location.getZ());
PACKET_DATA_SERIALIZER_WRITE_BYTE_METHOD.invoke(packetDataSerializer, (byte) ((int) (location.getYaw() * 256.0F / 360.0F)));
PACKET_DATA_SERIALIZER_WRITE_BYTE_METHOD.invoke(packetDataSerializer, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
PACKET_DATA_SERIALIZER_WRITE_BOOLEAN_METHOD.invoke(packetDataSerializer, false);
entityTeleportPacket = PACKET_ENTITY_TELEPORT_CONSTRUCTOR.newInstance(packetDataSerializer);
}
sendPacket(player, entityTeleportPacket);
}

@Override
Expand Down
1 change: 1 addition & 0 deletions src/main/java/eu/decentsoftware/holograms/api/utils/reflect/Version.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public enum Version {
v1_20_R3(20, "1.20.3", "1.20.4"),
v1_20_R4(20, "1.20.5", "1.20.6"),
v1_21_R1(21, "1.21", "1.21.1"),
v1_21_R2(21, "1.21.2", "1.21.3"),
;

/*
Expand Down

0 comments on commit 3d48f46

Please sign in to comment.