Improved strings

TeamLapen · Jul 14, 2024 · 675cff1 · 675cff1
1 parent 43800ad
commit 675cff1
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 156 deletions.
diff --git a/src/api/java/de/teamlapen/vampirism/api/items/IFactionExclusiveItem.java b/src/api/java/de/teamlapen/vampirism/api/items/IFactionExclusiveItem.java
@@ -23,16 +23,15 @@ public interface IFactionExclusiveItem extends ItemLike {
 
     default void addFactionToolTips(@NotNull ItemStack stack, @Nullable Item.TooltipContext context, @NotNull List<Component> tooltip, TooltipFlag flagIn, @Nullable Player player) {
         addOilDescTooltip(stack, context, tooltip, flagIn, player);
-        tooltip.add(Component.empty());
-        tooltip.add(Component.translatable("text.vampirism.faction_specifics").withStyle(ChatFormatting.GRAY));
         ChatFormatting color = ChatFormatting.GRAY;
         IFaction<?> faction = getExclusiveFaction(stack);
 
         if (faction != null) {
             if (player != null) {
                 color = VampirismAPI.factionRegistry().getFaction(player) == faction ? ChatFormatting.DARK_GREEN : ChatFormatting.DARK_RED;
             }
-            tooltip.add(Component.literal(" ").append(faction.getName()).append(Component.translatable("text.vampirism.faction_only")).withStyle(color));
+            tooltip.add(Component.empty());
+            tooltip.add(Component.translatable("text.vampirism.faction_exclusive", faction.getName().copy().withStyle(color)));
         }
     }
 

diff --git a/src/main/java/de/teamlapen/vampirism/client/core/ClientEventHandler.java b/src/main/java/de/teamlapen/vampirism/client/core/ClientEventHandler.java
@@ -180,8 +180,7 @@ public void onItemToolTip(@NotNull ItemTooltipEvent event) {
             }
             List<Component> factionToolTips = new ArrayList<>();
             factionToolTips.add(Component.empty());
-            factionToolTips.add(Component.translatable("text.vampirism.faction_specifics").withStyle(ChatFormatting.GRAY));
-            factionToolTips.add(Component.literal(" ").append(VReference.HUNTER_FACTION.getName()).append(Component.translatable("text.vampirism.faction_only")).withStyle(Minecraft.getInstance().player != null ? Helper.isHunter(Minecraft.getInstance().player) ? ChatFormatting.DARK_GREEN : ChatFormatting.DARK_RED : ChatFormatting.GRAY));
+            factionToolTips.add(Component.translatable("text.vampirism.faction_exclusive", VReference.HUNTER_FACTION.getName().copy().withStyle(Minecraft.getInstance().player != null ? Helper.isHunter(Minecraft.getInstance().player) ? ChatFormatting.DARK_GREEN : ChatFormatting.DARK_RED : ChatFormatting.GRAY)));
             toolTips.addAll(Math.min(event.getToolTip().size(), position), factionToolTips);
         });
     }