allow customizing name of dynamic book

wisp-forest · Apr 2, 2024 · ae99d0d · ae99d0d
1 parent 70cbbd9
commit ae99d0d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.15.9
 
 # Mod Properties
-	mod_version = 0.1.4
+	mod_version = 0.1.5
 	maven_group = io.wispforest
 	archives_base_name = lavender
 

diff --git a/src/main/java/io/wispforest/lavender/book/Book.java b/src/main/java/io/wispforest/lavender/book/Book.java
@@ -14,6 +14,7 @@
 import net.minecraft.nbt.NbtHelper;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -32,6 +33,7 @@ public final class Book {
     private final Identifier id;
     private final @Nullable Identifier texture;
     private final @Nullable Identifier dynamicBookModel;
+    private final @Nullable Text dynamicBookName;
     private final SoundEvent openSound, flippingSound;
     private final @Nullable Identifier introEntry;
     private final boolean displayUnreadEntryNotifications;
@@ -61,6 +63,7 @@ public Book(
             @Nullable Identifier extend,
             @Nullable Identifier texture,
             @Nullable Identifier dynamicBookModel,
+            @Nullable Text dynamicBookName,
             @Nullable SoundEvent openSound,
             @Nullable SoundEvent flippingSound,
             @Nullable Identifier introEntry,
@@ -72,6 +75,7 @@ public Book(
         this.extend = extend;
         this.texture = texture;
         this.dynamicBookModel = dynamicBookModel;
+        this.dynamicBookName = dynamicBookName;
         this.openSound = openSound != null ? openSound : Lavender.ITEM_BOOK_OPEN;
         this.flippingSound = flippingSound != null ? flippingSound : SoundEvents.ITEM_BOOK_PAGE_TURN;
         this.introEntry = introEntry;
@@ -225,6 +229,10 @@ public boolean shouldDisplayUnreadNotification(Category category, ClientPlayerEn
         return this.dynamicBookModel;
     }
 
+    public @Nullable Text dynamicBookName() {
+        return this.dynamicBookName;
+    }
+
     public SoundEvent openSound() {
         return this.openSound;
     }

diff --git a/src/main/java/io/wispforest/lavender/book/BookLoader.java b/src/main/java/io/wispforest/lavender/book/BookLoader.java
@@ -12,6 +12,7 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.resource.ResourceFinder;
 import net.minecraft.resource.ResourceManager;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.JsonHelper;
 import org.jetbrains.annotations.Nullable;
@@ -72,6 +73,11 @@ public static void reload(ResourceManager manager) {
             var extendId = tryGetId(bookObject, "extend");
             var dynamicBookModelId = tryGetId(bookObject, "dynamic_book_model");
 
+            Text dynamicBookName = null;
+            if (bookObject.has("dynamic_book_name")) {
+                dynamicBookName = Text.Serializer.fromJson(bookObject.get("dynamic_book_name"));
+            }
+
             var openSoundId = tryGetId(bookObject, "open_sound");
             var openSoundEvent = openSoundId != null ? Registries.SOUND_EVENT.get(openSoundId) : null;
             var flippingSoundId = tryGetId(bookObject, "flipping_sound");
@@ -83,7 +89,7 @@ public static void reload(ResourceManager manager) {
             var displayUnreadEntryNotifications = JsonHelper.getBoolean(bookObject, "display_unread_entry_notifications", true);
             var macros = GSON.fromJson(JsonHelper.getObject(bookObject, "macros", new JsonObject()), MACROS_TOKEN);
 
-            var book = new Book(resourceId, extendId, textureId, dynamicBookModelId, openSoundEvent, flippingSoundEvent, introEntryId, displayUnreadEntryNotifications, displayCompletion, macros);
+            var book = new Book(resourceId, extendId, textureId, dynamicBookModelId, dynamicBookName, openSoundEvent, flippingSoundEvent, introEntryId, displayUnreadEntryNotifications, displayCompletion, macros);
             LOADED_BOOKS.put(resourceId, book);
             if (extendId == null) VISIBLE_BOOKS.put(resourceId, book);
         });

diff --git a/src/main/java/io/wispforest/lavender/book/LavenderBookItem.java b/src/main/java/io/wispforest/lavender/book/LavenderBookItem.java
@@ -110,6 +110,16 @@ public static ItemStack itemOf(Book book) {
         }
     }
 
+    @Override
+    public Text getName(ItemStack stack) {
+        if (this.bookId != null) return super.getName(stack);
+
+        var book = bookOf(stack);
+        if (book == null || book.dynamicBookName() == null) return super.getName(stack);
+
+        return book.dynamicBookName();
+    }
+
     /**
      * @return A dynamic book with the correct NBT to represent the given book
      */