From d748592b45df86b197aeeaa5d0b2f2bb68de29a8 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 21 May 2024 15:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=B9=B3=E6=9D=96?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/screens/KillMessageOverlay.java | 20 ++++++++++++++++-- .../gun_icon/compat/world_peace_staff.png | Bin 0 -> 7410 bytes 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/target/textures/gun_icon/compat/world_peace_staff.png diff --git a/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java b/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java index 4efffbf7f..0f5e06b8e 100644 --- a/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java +++ b/src/main/java/net/mcreator/target/client/screens/KillMessageOverlay.java @@ -26,6 +26,8 @@ public class KillMessageOverlay { private static final ResourceLocation CLAYMORE = new ResourceLocation(TargetMod.MODID, "textures/screens/damage_types/claymore.png"); private static final ResourceLocation GENERIC = new ResourceLocation(TargetMod.MODID, "textures/screens/damage_types/generic.png"); + private static final ResourceLocation WORLD_PEACE_STAFF = new ResourceLocation(TargetMod.MODID, "textures/gun_icon/compat/world_peace_staff.png"); + @SubscribeEvent(priority = EventPriority.NORMAL) public static void eventHandler(RenderGuiEvent.Pre event) { Player player = Minecraft.getInstance().player; @@ -86,14 +88,15 @@ public class KillMessageOverlay { } boolean renderItem = false; + int itemIconW = damageTypeIcon != null ? w - targetNameWidth - 64 : w - targetNameWidth - 46; // 如果是枪械击杀，则渲染枪械图标 if (record.stack.getItem() instanceof GunItem gunItem) { renderItem = true; ResourceLocation resourceLocation = gunItem.getGunIcon(); - int gunIconW = damageTypeIcon != null ? w - targetNameWidth - 64 : w - targetNameWidth - 46; + event.getGuiGraphics().blit(resourceLocation, - gunIconW, + itemIconW, h, 0, 0, @@ -105,7 +108,20 @@ public class KillMessageOverlay { } // TODO 如果是特殊武器击杀，则渲染对应图标 + if (record.stack.getItem().getDescriptionId().equals("item.dreamaticvoyage.world_peace_staff")) { + renderItem = true; + event.getGuiGraphics().blit(WORLD_PEACE_STAFF, + itemIconW, + h, + 0, + 0, + 32, + 8, + 32, + 8 + ); + } // 渲染击杀者名称 String attackerName = record.attacker.getDisplayName().getString(); diff --git a/src/main/resources/assets/target/textures/gun_icon/compat/world_peace_staff.png b/src/main/resources/assets/target/textures/gun_icon/compat/world_peace_staff.png new file mode 100644 index 0000000000000000000000000000000000000000..488bd18833e599786c088583c88a4bba49b6e1c4 GIT binary patch literal 7410 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