feat(i18n): localize default journal title and extract from hardcoded values

common/src/main/java/com/evandev/fieldguide/client/progress/ProgressManager.java

@@ -56,7 +56,7 @@ public class ProgressManager {
     private final List<JournalPage> journalPages = new ArrayList<>();
     private String lastUnlockedVariant = null;
 
-    private String journalTitle = "My Field Guide";
+    private String journalTitle = null;
 
     private long lastUnlockTime = 0;
     private Object lastUnlockedEntry = null;
@@ -172,7 +172,13 @@ public void applyServerUpdate(ProgressUpdatePacket packet) {
             entryTriggers.putAll(packet.getEntryTriggers());
         }
 
-        packet.getJournalTitle().ifPresent(title -> journalTitle = title);
+        packet.getJournalTitle().ifPresent(title -> {
+            if (title != null && !title.isEmpty()) {
+                journalTitle = title;
+            } else {
+                journalTitle = null;
+            }
+        });
         packet.getJournalPages().ifPresent(pages -> {
             journalPages.clear();
             for (PlayerFieldGuideProgress.JournalPageData page : pages) {
@@ -371,11 +377,18 @@ public boolean hasTrigger(ResourceLocation entryId, String triggerName) {
     }
 
     public String getJournalTitle() {
-        return journalTitle;
+        if (journalTitle != null && !journalTitle.isEmpty()) {
+            return journalTitle;
+        }
+        return I18n.get("fieldguide.journal.default.title");
     }
 
     public void setJournalTitle(String title) {
-        this.journalTitle = title;
+        if (title == null || title.trim().isEmpty()) {
+            this.journalTitle = null;
+        } else {
+            this.journalTitle = title;
+        }
         sendJournalUpdate();
     }
 
@@ -398,7 +411,7 @@ private void sendJournalUpdate() {
             JournalPage page = journalPages.get(i);
             pageData.add(new PlayerFieldGuideProgress.JournalPageData(page.title, page.content, page.timestamp));
         }
-        Services.NETWORK.sendToServer(new UpdateJournalPacket(journalTitle, pageData));
+        Services.NETWORK.sendToServer(new UpdateJournalPacket(journalTitle != null ? journalTitle : "", pageData));
     }
 
     public void onWorldLoad() {
@@ -412,7 +425,7 @@ public void onWorldLoad() {
         selectedVariants.clear();
         entryTriggers.clear();
         journalPages.clear();
-        journalTitle = "My Field Guide";
+        journalTitle = null;
         lastUnlockTime = 0;
         lastUnlockedEntry = null;
         lastUnlockedVariant = null;
@@ -429,7 +442,7 @@ public void onWorldUnload() {
         selectedVariants.clear();
         entryTriggers.clear();
         journalPages.clear();
-        journalTitle = "My Field Guide";
+        journalTitle = null;
         lastUnlockTime = 0;
         lastUnlockedEntry = null;
         lastUnlockedVariant = null;

common/src/main/java/com/evandev/fieldguide/server/progress/PlayerFieldGuideProgress.java

@@ -41,7 +41,7 @@ public class PlayerFieldGuideProgress {
     private final Set<String> pendingEntryResync = new LinkedHashSet<>();
     private boolean pendingFullSync = false;
 
-    private String journalTitle = "My Field Guide";
+    private String journalTitle = null;
     private boolean dirty = false;
 
     public PlayerFieldGuideProgress(UUID playerUUID, Path progressDir) {
@@ -297,7 +297,11 @@ public Set<String> getUnlockedEntries() {
     }
 
     public void setJournalTitle(String title) {
-        this.journalTitle = title != null ? title : "My Field Guide";
+        if (title == null || title.trim().isEmpty()) {
+            this.journalTitle = null;
+        } else {
+            this.journalTitle = title;
+        }
         dirty = true;
     }
 
@@ -410,13 +414,12 @@ private void sendFullSync(ServerPlayer player) {
         }
 
         Services.NETWORK.sendToPlayer(
-                new ProgressUpdatePacket.Builder()
-                        .silent(true)
-                        .journalTitle(journalTitle)
-                        .journalPages(new ArrayList<>(journalPages))
-                        .build(),
-                player
-        );
+            new ProgressUpdatePacket.Builder()
+                .silent(true)
+                .journalTitle(journalTitle != null ? journalTitle : "")
+                .journalPages(new ArrayList<>(journalPages))
+                .build(),
+            player);
     }
 
     private void sendDelta(ServerPlayer player) {
@@ -514,7 +517,13 @@ public void load() {
                 );
             }
             if (json.has("journalTitle")) {
-                journalTitle = json.get("journalTitle").getAsString();
+                String loaded = json.get("journalTitle").getAsString();
+                // Migrate old default title to null if it's still present in the save file
+                if (!loaded.isEmpty() && !loaded.equals("My Field Guide")) {
+                    journalTitle = loaded;
+                } else {
+                    journalTitle = null;
+                }
             }
             if (json.has("journalPages")) {
                 journalPages.clear();
@@ -573,7 +582,9 @@ public void save() {
             selectedVariants.forEach(variantsObj::addProperty);
             json.add("selectedVariants", variantsObj);
 
-            json.addProperty("journalTitle", journalTitle);
+            if (journalTitle != null) {
+                json.addProperty("journalTitle", journalTitle);
+            }
 
             JsonArray jpArr = new JsonArray();
             for (JournalPageData jp : journalPages) {

common/src/main/resources/assets/fieldguide/lang/en_us.json

@@ -385,5 +385,6 @@
   "advancements.fieldguide.quick_review.title": "I Don't Want to Play with You",
   "advancements.fieldguide.quick_review.description": "Scan a mob and then immediately kill it",
 
+  "fieldguide.journal.default.title": "My Field Guide",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/es_ar.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "Champiñón Rojo Gigante",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Hongo Carmesí Gigante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Hongo Distorsionado Gigante",
+  "fieldguide.journal.default.title": "Mi Guía de Campo",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/es_cl.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "Champiñón Rojo Gigante",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Hongo Carmesí Gigante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Hongo Distorsionado Gigante",
+  "fieldguide.journal.default.title": "Mi Guía de Campo",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/es_ec.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "Champiñón Rojo Gigante",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Hongo Carmesí Gigante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Hongo Distorsionado Gigante",
+  "fieldguide.journal.default.title": "Mi Guía de Campo",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/es_es.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "Champiñón Rojo Gigante",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Hongo Carmesí Gigante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Hongo Distorsionado Gigante",
+  "fieldguide.journal.default.title": "Mi Guía de Campo",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/es_mx.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "Champiñón Rojo Gigante",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Hongo Carmesí Gigante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Hongo Distorsionado Gigante",
+  "fieldguide.journal.default.title": "Mi Guía de Campo",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/es_uy.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "Champiñón Rojo Gigante",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Hongo Carmesí Gigante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Hongo Distorsionado Gigante",
+  "fieldguide.journal.default.title": "Mi Guía de Campo",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/es_ve.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "Champiñón Rojo Gigante",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Hongo Carmesí Gigante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Hongo Distorsionado Gigante",
+  "fieldguide.journal.default.title": "Mi Guía de Campo",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/fr_fr.json

@@ -214,5 +214,6 @@
   "fieldguide.name.fieldguide.huge_crimson_fungus": "Verrue Carmine Géante",
   "fieldguide.name.fieldguide.huge_warped_fungus": "Verrue Biscornue Géante",
 
+  "fieldguide.journal.default.title": "Mon Guide",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/ru_ru.json

@@ -385,5 +385,6 @@
   "advancements.fieldguide.quick_review.title": "Я больше не хочу с тобой играть",
   "advancements.fieldguide.quick_review.description": "Изучи существо, а затем тут же отправь его в мир иной",
 
+  "fieldguide.journal.default.title": "Мой дневник",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/zh_cn.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "红色巨型蘑菇",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "巨型绯红菌",
   "fieldguide.name.fieldguide.huge_warped_fungus": "巨型诡异菌",
+  "fieldguide.journal.default.title": "我的生物百科图鉴",
   "fieldguide.journal.default": ""
 }

common/src/main/resources/assets/fieldguide/lang/zh_tw.json

@@ -157,5 +157,6 @@
   "fieldguide.name.fieldguide.huge_red_mushroom": "巨大紅色蘑菇",
   "fieldguide.name.fieldguide.huge_crimson_fungus": "巨大緋紅蕈",
   "fieldguide.name.fieldguide.huge_warped_fungus": "巨大扭曲蕈",
+  "fieldguide.journal.default.title": "我的生物百科圖鑑",
   "fieldguide.journal.default": ""
 }