From 0fa9b84a22b3af79ed948ef49664ecc5f338d659 Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Sat, 10 May 2025 07:04:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor(bukkit):=20=E5=AE=9E=E7=8E=B0=E5=A4=A7?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复addEnchantment - 差一个移动路径补偿 - 求求你们不要喷我频繁提交了，除了这次最多还会有一个实现移动路径补偿的提交，如果你不想收到提交消息可以到我这个pr去取消通知 --- .../factory/ComponentItemFactory1_20_5.java | 4 +- .../item/factory/UniversalItemFactory.java | 8 +-- .../plugin/network/PacketConsumers.java | 8 ++- .../plugin/user/BukkitServerPlayer.java | 6 +++ .../bukkit/util/CustomTridentUtils.java | 51 ++++++++++++++----- .../craftengine/bukkit/util/Reflections.java | 30 ++++++++++- .../core/plugin/network/NetWorkUser.java | 2 + 7 files changed, 83 insertions(+), 26 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java index 08cc98ec3..f7b5e76ff 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java @@ -309,7 +309,7 @@ public class ComponentItemFactory1_20_5 extends BukkitItemFactory map = EnchantmentUtils.toMap(enchant); - map.put(enchantment.toString(), enchantment.level()); + map.put(enchantment.id().toString(), enchantment.level()); item.setJavaComponent(ComponentTypes.ENCHANTMENTS, map); } catch (ReflectiveOperationException e) { plugin.logger().warn("Failed to add enchantment", e); @@ -321,7 +321,7 @@ public class ComponentItemFactory1_20_5 extends BukkitItemFactory map = EnchantmentUtils.toMap(enchant); - map.put(enchantment.toString(), enchantment.level()); + map.put(enchantment.id().toString(), enchantment.level()); item.setJavaComponent(ComponentTypes.STORED_ENCHANTMENTS, map); } catch (ReflectiveOperationException e) { plugin.logger().warn("Failed to add stored enchantment", e); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/UniversalItemFactory.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/UniversalItemFactory.java index 787dba986..3dd72fe51 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/UniversalItemFactory.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/UniversalItemFactory.java @@ -198,9 +198,9 @@ public class UniversalItemFactory extends BukkitItemFactory { return; } } - item.add(Map.of("id", enchantment.toString(), "lvl", (short) enchantment.level()), "Enchantments"); + item.add(Map.of("id", enchantment.id().toString(), "lvl", (short) enchantment.level()), "Enchantments"); } else { - item.set(List.of(Map.of("id", enchantment.toString(), "lvl", (short) enchantment.level())), "Enchantments"); + item.set(List.of(Map.of("id", enchantment.id().toString(), "lvl", (short) enchantment.level())), "Enchantments"); } } @@ -214,9 +214,9 @@ public class UniversalItemFactory extends BukkitItemFactory { return; } } - item.add(Map.of("id", enchantment.toString(), "lvl", (short) enchantment.level()), "StoredEnchantments"); + item.add(Map.of("id", enchantment.id().toString(), "lvl", (short) enchantment.level()), "StoredEnchantments"); } else { - item.set(List.of(Map.of("id", enchantment.toString(), "lvl", (short) enchantment.level())), "StoredEnchantments"); + item.set(List.of(Map.of("id", enchantment.id().toString(), "lvl", (short) enchantment.level())), "StoredEnchantments"); } } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java index 1e36bba6a..1d4d4a8b6 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java @@ -1620,7 +1620,7 @@ public class PacketConsumers { try { int entityId = FastNMS.INSTANCE.method$ClientboundEntityPositionSyncPacket$id(packet); if (user.tridentView().containsKey(entityId)) { - CustomTridentUtils.modifyCustomTridentPositionSync(event, packet, entityId); + CustomTridentUtils.modifyCustomTridentPositionSync(user, event, packet, entityId); return; } if (BukkitFurnitureManager.instance().isFurnitureRealEntity(entityId)) { @@ -2329,9 +2329,7 @@ public class PacketConsumers { public static final TriConsumer SET_ENTITY_DATA = (user, event, packet) -> { try { int entityId = Reflections.field$clazz$ClientboundSetEntityDataPacket$id.getInt(packet); - if (user.tridentView().containsKey(entityId)) { - CustomTridentUtils.modifyCustomTridentSetEntityData(user, event, entityId); - } + CustomTridentUtils.modifyCustomTridentSetEntityData(user, event, entityId); } catch (Exception e) { CraftEngine.instance().logger().warn("Failed to handle ClientboundSetEntityDataPacket", e); } @@ -2341,7 +2339,7 @@ public class PacketConsumers { try { int entityId = BukkitInjector.internalFieldAccessor().field$ClientboundMoveEntityPacket$entityId(packet); if (user.tridentView().containsKey(entityId)) { - CustomTridentUtils.modifyCustomTridentMove(packet); + CustomTridentUtils.modifyCustomTridentMove(packet, user); } } catch (Exception e) { CraftEngine.instance().logger().warn("Failed to handle ClientboundMoveEntityPacket$PosRot", e); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java index 102c2cdaa..38122b1a0 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java @@ -94,6 +94,7 @@ public class BukkitServerPlayer extends Player { private final Map> furnitureView = new ConcurrentHashMap<>(); private final Map entityTypeView = new ConcurrentHashMap<>(); private final Map> tridentView = new ConcurrentHashMap<>(); + private final Map addTridentPacketView = new ConcurrentHashMap<>(); public BukkitServerPlayer(BukkitCraftEngine plugin, Channel channel) { this.channel = channel; @@ -743,6 +744,11 @@ public class BukkitServerPlayer extends Player { return this.tridentView; } + @Override + public Map addTridentPacketView() { + return this.addTridentPacketView; + } + public void setResendSound() { resentSoundTick = gameTicks(); } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/CustomTridentUtils.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/CustomTridentUtils.java index aeb96c865..2e35b45a4 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/CustomTridentUtils.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/CustomTridentUtils.java @@ -4,12 +4,14 @@ import net.momirealms.craftengine.bukkit.entity.data.ItemDisplayEntityData; import net.momirealms.craftengine.bukkit.item.BukkitItemManager; import net.momirealms.craftengine.bukkit.nms.FastNMS; import net.momirealms.craftengine.bukkit.plugin.network.NMSPacketEvent; +import net.momirealms.craftengine.core.item.Enchantment; import net.momirealms.craftengine.core.item.Item; import net.momirealms.craftengine.core.plugin.network.NetWorkUser; import net.momirealms.craftengine.core.util.Key; import net.momirealms.craftengine.core.util.MCUtils; import net.momirealms.craftengine.core.util.VersionHelper; import org.bukkit.NamespacedKey; +import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.entity.Trident; import org.bukkit.inventory.ItemStack; @@ -33,25 +35,30 @@ public class CustomTridentUtils { public static void handleCustomTrident(NetWorkUser user, NMSPacketEvent event, Object packet) throws IllegalAccessException { int entityId = FastNMS.INSTANCE.field$ClientboundAddEntityPacket$entityId(packet); Trident trident = getTridentById(user, entityId); - if (!isCustomTrident(trident)) return; + if (notCustomTrident(trident)) return; user.tridentView().put(entityId, List.of()); modifyCustomTridentPacket(packet); + user.addTridentPacketView().put(entityId, packet); List itemDisplayValues = buildEntityDataValues(trident); user.tridentView().put(entityId, itemDisplayValues); - event.addDelayedTask(() -> user.sendPacket(FastNMS.INSTANCE.constructor$ClientboundSetEntityDataPacket(entityId, itemDisplayValues), true)); + user.sendPacket(packet, true); + user.sendPacket(FastNMS.INSTANCE.constructor$ClientboundSetEntityDataPacket(entityId, itemDisplayValues), true); + event.setCancelled(true); } @Nullable public static Trident getTridentById(NetWorkUser user, int entityId) { Player player = (Player) user.platformPlayer(); - return (Trident) FastNMS.INSTANCE.getBukkitEntityById(player.getWorld(), entityId); + Entity entity = FastNMS.INSTANCE.getBukkitEntityById(player.getWorld(), entityId); + if (entity instanceof Trident trident) return trident; + return null; } - public static boolean isCustomTrident(Trident trident) { - if (trident == null) return false; + public static boolean notCustomTrident(Trident trident) { + if (trident == null) return true; PersistentDataContainer container = trident.getItemStack().getItemMeta().getPersistentDataContainer(); String customTrident = container.get(customTridentKey, PersistentDataType.STRING); - return customTrident != null; + return customTrident == null; } public static void modifyCustomTridentPacket(Object packet) throws IllegalAccessException { @@ -64,9 +71,11 @@ public class CustomTridentUtils { public static List buildEntityDataValues(Trident trident) { List itemDisplayValues = new ArrayList<>(); - PersistentDataContainer container = trident.getItemStack().getItemMeta().getPersistentDataContainer(); + ItemStack itemStack = trident.getItemStack(); + PersistentDataContainer container = itemStack.getItemMeta().getPersistentDataContainer(); String customTrident = container.get(customTridentKey, PersistentDataType.STRING); Item item = BukkitItemManager.instance().createWrappedItem(Key.of(customTrident), null); + itemStack.getEnchantments().forEach((enchantment, level) -> item.addEnchantment(new Enchantment(Key.of(enchantment.getKey().toString()), level))); Integer interpolationDelay = container.get(interpolationDelayKey, PersistentDataType.INTEGER); Integer transformationInterpolationDuration = container.get(transformationInterpolationDurationaKey, PersistentDataType.INTEGER); Integer positionRotationInterpolationDuration = container.get(positionRotationInterpolationDurationKey, PersistentDataType.INTEGER); @@ -85,7 +94,7 @@ public class CustomTridentUtils { } // 这里需要补 ClientboundMoveEntityPacket 包 1.21.2+ - public static void modifyCustomTridentPositionSync(NMSPacketEvent event, Object packet, int entityId) throws IllegalAccessException, InvocationTargetException, InstantiationException { + public static void modifyCustomTridentPositionSync(NetWorkUser user, NMSPacketEvent event, Object packet, int entityId) throws IllegalAccessException, InvocationTargetException, InstantiationException { Object positionMoveRotation = Reflections.field$ClientboundEntityPositionSyncPacket$values.get(packet); boolean onGround = Reflections.field$ClientboundEntityPositionSyncPacket$onGround.getBoolean(packet); Object position = Reflections.field$PositionMoveRotation$position.get(positionMoveRotation); @@ -94,11 +103,18 @@ public class CustomTridentUtils { float xRot = Reflections.field$PositionMoveRotation$xRot.getFloat(positionMoveRotation); Object newPositionMoveRotation = Reflections.constructor$PositionMoveRotation.newInstance(position, deltaMovement, -yRot, Math.clamp(-xRot, -90.0F, 90.0F)); event.replacePacket(Reflections.constructor$ClientboundEntityPositionSyncPacket.newInstance(entityId, newPositionMoveRotation, onGround)); + // List path = SmoothMovementPathUtils.calculatePath(start, move, yRot, xRot); + // ((Player)user.platformPlayer()).sendMessage("entityId: " + entityId + " position: " + position + " deltaMovement: " + deltaMovement + " xRot: " + xRot + " yRot: " + yRot); } - public static void modifyCustomTridentMove(Object packet) throws IllegalAccessException { + public static void modifyCustomTridentMove(Object packet, NetWorkUser user) throws IllegalAccessException { + // int entityId = BukkitInjector.internalFieldAccessor().field$ClientboundMoveEntityPacket$entityId(packet); + // double xa = Reflections.field$ClientboundMoveEntityPacket$xa.getShort(packet); + // double ya = Reflections.field$ClientboundMoveEntityPacket$ya.getShort(packet); + // double za = Reflections.field$ClientboundMoveEntityPacket$za.getShort(packet); float xRot = MCUtils.unpackDegrees(Reflections.field$ClientboundMoveEntityPacket$xRot.getByte(packet)); float yRot = MCUtils.unpackDegrees(Reflections.field$ClientboundMoveEntityPacket$yRot.getByte(packet)); + // ((Player)user.platformPlayer()).sendMessage("entityId: " + entityId + " xa: " + xa + " ya: " + ya + " za: " + za + " xRot: " + xRot + " yRot: " + yRot); Reflections.field$ClientboundMoveEntityPacket$xRot.setByte(packet, MCUtils.packDegrees(Math.clamp(-xRot, -90.0F, 90.0F))); Reflections.field$ClientboundMoveEntityPacket$yRot.setByte(packet, MCUtils.packDegrees(-yRot)); } @@ -107,7 +123,7 @@ public class CustomTridentUtils { List newData = user.tridentView().getOrDefault(entityId, List.of()); if (newData.isEmpty()) { Trident trident = getTridentById(user, entityId); - if (!isCustomTrident(trident)) return null; + if (notCustomTrident(trident)) return null; newData = buildEntityDataValues(trident); user.tridentView().put(entityId, newData); } @@ -115,8 +131,17 @@ public class CustomTridentUtils { } public static void modifyCustomTridentSetEntityData(NetWorkUser user, NMSPacketEvent event, int entityId) { - Object packet = buildCustomTridentSetEntityDataPacket(user, entityId); - if (packet == null) return; - event.replacePacket(packet); + if (user.tridentView().containsKey(entityId)) { + Object packet = buildCustomTridentSetEntityDataPacket(user, entityId); + if (packet == null) return; + event.replacePacket(packet); + } else { + Trident trident = getTridentById(user, entityId); + if (trident == null) return; + if (notCustomTrident(trident)) return; + Object packet = buildCustomTridentSetEntityDataPacket(user, entityId); + if (packet == null) return; + event.replacePacket(packet); + } } } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java index 735382427..485df7122 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java @@ -6103,6 +6103,10 @@ public class Reflections { ) ); + public static final Constructor constructor$ClientboundMoveEntityPacket$PosRot = requireNonNull( + ReflectionUtils.getTheOnlyConstructor(clazz$ClientboundMoveEntityPacket$PosRot) + ); + public static final Class clazz$ClientboundRotateHeadPacket = requireNonNull( BukkitReflectionUtils.findReobfOrMojmapClass( "network.protocol.game.PacketPlayOutEntityHeadRotation", @@ -6400,14 +6404,18 @@ public class Reflections { ); public static final int instance$EntityType$BLOCK_DISPLAY$registryId; + public static final int instance$EntityType$ITEM_DISPLAY$registryId; public static final int instance$EntityType$TEXT_DISPLAY$registryId; public static final int instance$EntityType$FALLING_BLOCK$registryId; + public static final int instance$EntityType$TRIDENT$registryId; static { try { instance$EntityType$BLOCK_DISPLAY$registryId = (int) Reflections.method$Registry$getId.invoke(Reflections.instance$BuiltInRegistries$ENTITY_TYPE, instance$EntityType$BLOCK_DISPLAY); + instance$EntityType$ITEM_DISPLAY$registryId = (int) Reflections.method$Registry$getId.invoke(Reflections.instance$BuiltInRegistries$ENTITY_TYPE, instance$EntityType$ITEM_DISPLAY); instance$EntityType$TEXT_DISPLAY$registryId = (int) Reflections.method$Registry$getId.invoke(Reflections.instance$BuiltInRegistries$ENTITY_TYPE, instance$EntityType$TEXT_DISPLAY); instance$EntityType$FALLING_BLOCK$registryId = (int) Reflections.method$Registry$getId.invoke(Reflections.instance$BuiltInRegistries$ENTITY_TYPE, instance$EntityType$FALLING_BLOCK); + instance$EntityType$TRIDENT$registryId = (int) Reflections.method$Registry$getId.invoke(Reflections.instance$BuiltInRegistries$ENTITY_TYPE, instance$EntityType$TRIDENT); } catch (Exception e) { throw new RuntimeException(e); } @@ -6636,7 +6644,7 @@ public class Reflections { ); public static final Constructor constructor$PositionMoveRotation = Optional.ofNullable(clazz$PositionMoveRotation) - .map(it -> ReflectionUtils.getTheOnlyConstructor(it)) + .map(ReflectionUtils::getTheOnlyConstructor) .orElse(null); public static final Field field$ClientboundEntityPositionSyncPacket$values = Optional.ofNullable(clazz$ClientboundEntityPositionSyncPacket) @@ -6664,7 +6672,7 @@ public class Reflections { .orElse(null); public static final Constructor constructor$ClientboundEntityPositionSyncPacket = Optional.ofNullable(clazz$ClientboundEntityPositionSyncPacket) - .map(it -> ReflectionUtils.getTheOnlyConstructor(it)) + .map(ReflectionUtils::getTheOnlyConstructor) .orElse(null); public static final Field field$ClientboundAddEntityPacket$xRot = requireNonNull( @@ -6690,4 +6698,22 @@ public class Reflections { clazz$ClientboundMoveEntityPacket, byte.class, 0 ) ); + + public static final Field field$ClientboundMoveEntityPacket$xa = requireNonNull( + ReflectionUtils.getDeclaredField( + clazz$ClientboundMoveEntityPacket, short.class, 0 + ) + ); + + public static final Field field$ClientboundMoveEntityPacket$ya = requireNonNull( + ReflectionUtils.getDeclaredField( + clazz$ClientboundMoveEntityPacket, short.class, 1 + ) + ); + + public static final Field field$ClientboundMoveEntityPacket$za = requireNonNull( + ReflectionUtils.getDeclaredField( + clazz$ClientboundMoveEntityPacket, short.class, 2 + ) + ); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java index b1952a648..b74842ee1 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java @@ -48,6 +48,8 @@ public interface NetWorkUser { Map> tridentView(); + Map addTridentPacketView(); + boolean clientModEnabled(); void setClientModState(boolean enable);