diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java index 6e23cb6b9..d04f64581 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientGunImageTooltip.java @@ -255,10 +255,8 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { var ammoItem = perkInstance.perk().getItem().get(); guiGraphics.renderItem(ammoItem.getDefaultInstance(), x, y + 4 + yOffset); - var ids = perkInstance.perk().descriptionId.split(":"); - if (ids.length <= 1) continue; + var id = perkInstance.perk().descriptionId; - String id = ids[1]; var component = Component.translatable("item.superbwarfare." + id).withStyle(type.getColor()) .append(Component.literal(" ").withStyle(ChatFormatting.RESET)) .append(Component.literal(" Lvl. " + perkInstance.level()).withStyle(ChatFormatting.WHITE)); @@ -294,10 +292,8 @@ public class ClientGunImageTooltip implements ClientTooltipComponent { var perkInstance = data.perk.getInstance(type); if (perkInstance == null) continue; - var ids = perkInstance.perk().descriptionId.split(":"); - if (ids.length <= 1) continue; + var id = perkInstance.perk().descriptionId; - String id = ids[1]; var ammoDesComponent = Component.translatable("des.superbwarfare." + id).withStyle(ChatFormatting.GRAY); width = Math.max(width, font.width(ammoDesComponent)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java index 300d43b2f..149fe9b31 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/data/subdata/Perks.java @@ -24,7 +24,7 @@ public final class Perks { } public boolean has(Perk.Type type) { - return perks.contains(type.getName()); + return perks.contains(type.getName()) && !perks.getCompound(type.getName()).getString("Name").isEmpty(); } public void set(PerkInstance instance) {