kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复狗牌名称显示配置处理问题

Browse source
This commit is contained in:
Light_Quanta 2025-05-24 01:14:26 +08:00
parent 60a7dbc11c
commit db692df419
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/atsuishio/superbwarfare/client/overlay/KillMessageOverlay.java
View file

@ -37,7 +37,6 @@ import org.jetbrains.annotations.Nullable;
import top.theillusivec4.curios.api.CuriosApi; import top.theillusivec4.curios.api.CuriosApi;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import java.util.concurrent.atomic.AtomicReference;
import static com.atsuishio.superbwarfare.client.RenderHelper.preciseBlit; import static com.atsuishio.superbwarfare.client.RenderHelper.preciseBlit;
@ -368,13 +367,18 @@ public class KillMessageOverlay implements LayeredDraw.Layer {
} }
public static String getEntityName(Entity entity) { public static String getEntityName(Entity entity) {
AtomicReference<String> targetName = new AtomicReference<>(entity.getDisplayName().getString()); if (entity.getDisplayName() == null) return "";
var name = entity.getDisplayName().getString();
if (!DisplayConfig.DOG_TAG_NAME_VISIBLE.get()) return name;
if (entity instanceof Player targetPlayer) { if (entity instanceof Player targetPlayer) {
CuriosApi.getCuriosInventory(targetPlayer) return CuriosApi.getCuriosInventory(targetPlayer)
.flatMap(c -> c.findFirstCurio(ModItems.DOG_TAG.get())) .flatMap(c -> c.findFirstCurio(ModItems.DOG_TAG.get()))
.ifPresent(s -> targetName.set(s.stack().getHoverName().getString())); .map(s -> s.stack().getHoverName().getString())
.orElse(name);
} }
return targetName.get(); return name;
} }
@Nullable @Nullable