Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-19 15:09:15 +00:00
Code Issues Releases Activity

调换处理顺序

Browse Source
This commit is contained in:
XiaoMoMi
2025-12-06 01:08:06 +08:00
parent 465eebe15a
commit bd02b9d46e
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/handler/CommonItemPacketHandler.java
View File

@@ -60,8 +60,19 @@ public class CommonItemPacketHandler implements EntityPacketHandler {
continue;
}
// 处理 drop-display 物品设置
ItemStack itemStack = FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(nmsItemStack);
// 转换为客户端侧物品
Optional<ItemStack> optional = BukkitItemManager.instance().s2c(itemStack, user);
if (optional.isPresent()) {
changed = true;
itemStack = optional.get();
Object serializer = FastNMS.INSTANCE.field$SynchedEntityData$DataValue$serializer(packedItem);
packedItems.set(i, FastNMS.INSTANCE.constructor$SynchedEntityData$DataValue(entityDataId, serializer, FastNMS.INSTANCE.method$CraftItemStack$asNMSCopy(itemStack)));
}
// 处理 drop-display 物品设置
// 一定要处理经历过客户端侧组件修改的物品
Item<ItemStack> wrappedItem = BukkitItemManager.instance().wrap(itemStack);
Optional<CustomItem<ItemStack>> optionalCustomItem = wrappedItem.getCustomItem();
String showName = null;
@@ -78,12 +89,7 @@ public class CommonItemPacketHandler implements EntityPacketHandler {
Optional<Component> optionalHoverComponent = wrappedItem.hoverNameComponent();
Component hoverComponent;
if (optionalHoverComponent.isPresent()) {
Map<String, ComponentProvider> tokens = CraftEngine.instance().fontManager().matchTags(AdventureHelper.componentToNbt(optionalHoverComponent.get()));
if (tokens.isEmpty()) {
hoverComponent = optionalHoverComponent.get();
} else {
hoverComponent = AdventureHelper.replaceText(optionalHoverComponent.get(), tokens, context);
}
hoverComponent = optionalHoverComponent.get();
} else {
hoverComponent = Component.translatable(itemStack.translationKey());
}
@@ -100,15 +106,6 @@ public class CommonItemPacketHandler implements EntityPacketHandler {
}
}
// 转换为客户端侧物品
Optional<ItemStack> optional = BukkitItemManager.instance().s2c(itemStack, user);
if (optional.isEmpty()) {
break;
}
changed = true;
itemStack = optional.get();
Object serializer = FastNMS.INSTANCE.field$SynchedEntityData$DataValue$serializer(packedItem);
packedItems.set(i, FastNMS.INSTANCE.constructor$SynchedEntityData$DataValue(entityDataId, serializer, FastNMS.INSTANCE.method$CraftItemStack$asNMSCopy(itemStack)));
break;
}
// 添加自定义显示名