feat: use lore translation

GuizhanCraft · Dec 28, 2023 · aa01895 · aa01895
1 parent 9812417
commit aa01895
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/main/java/net/guizhanss/slimefuntranslation/core/services/TranslationService.java b/src/main/java/net/guizhanss/slimefuntranslation/core/services/TranslationService.java
@@ -139,9 +139,6 @@ private boolean translateItem(User user, ItemStack item, SlimefunItem sfItem) {
     public String translateLore(User user, String id) {
         var transl = TranslationUtils.findTranslation(
             SlimefunTranslation.getRegistry().getLoreTranslations(), user, id);
-        if (transl.isEmpty()) {
-            return "";
-        }
-        return transl.get();
+        return transl.orElse("");
     }
 }
diff --git a/...va/net/guizhanss/slimefuntranslation/integrations/placeholders/SlimefunLoreExpansion.java b/...va/net/guizhanss/slimefuntranslation/integrations/placeholders/SlimefunLoreExpansion.java
@@ -55,10 +55,7 @@ public String onPlaceholderRequest(Player p, String identifier) {
         } else {
             args = Arrays.copyOfRange(s, 1, s.length);
         }
-        var transl = TranslationUtils.findTranslation(
-            SlimefunTranslation.getRegistry().getLoreTranslations(), user, id);
-        return transl.map(translation ->
-            ColorUtils.color(MessageFormat.format(translation, (Object[]) args))
-        ).orElse(null);
+        var translation = SlimefunTranslation.getTranslationService().translateLore(user, id);
+        return ColorUtils.color(MessageFormat.format(translation, (Object[]) args));
     }
 }