1.21.4 v2.3.0 (#63)

* Remove soundtrack key from musics.json

* Fix album name not showing

* Draw scrollable text for title & author

* Update test packs

* Bump version 2.3.0

CHANGELOG.md

@@ -21,6 +21,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [2.3.0] - 2025-12-15
+
+- Key 'soundtrack' in musics.json is no longer supported
+
+### Fixed
+
+- Long title, author and album name where cut in the toast
+- Wrong version pack format
+
 ## [2.2.2] - 2024-12-01
 
 - Support for 1.21.4

common/src/main/java/net/kosmo/music/impl/MusicManager.java

@@ -118,10 +118,6 @@ public static Music parseJsonObject(Map.Entry<String, JsonElement> json) throws
             String title = GsonHelper.getAsString(jsonObject, "title");
             String author = GsonHelper.getAsString(jsonObject, "author");
             String album = GsonHelper.getAsString(jsonObject, "album", null);
-            if (album == null) {
-                album = GsonHelper.getAsString(jsonObject, "soundtrack");
-                ClientMusic.LOGGER.error("Key 'soundtrack' of '{}' is deprecated, use 'album' instead", title);
-            }
             AlbumCover cover = AlbumCover.parseAlbumCover(GsonHelper.getAsString(jsonObject, "cover", null));
             boolean isRandom = GsonHelper.getAsBoolean(jsonObject, "isRandom", false);
 

common/src/main/java/net/kosmo/music/impl/RenderHelper.java

@@ -27,7 +27,7 @@ public static void drawScrollableText(GuiGraphics context, Font textRenderer, Co
             double g = Mth.lerp(f, 0.0, (double) l);
 
             context.enableScissor(clipAreaX1, clipAreaY1, clipAreaX2, clipAreaY2);
-//            context.fill(clipAreaX1,clipAreaY1,clipAreaX2,clipAreaY2, Colors.RED);
+//            context.fill(clipAreaX1,clipAreaY1,clipAreaX2,clipAreaY2, CommonColors.RED);
             context.drawString(textRenderer, text.getVisualOrderText(), startX - (int) g, j, color, shadow);
             context.disableScissor();
         } else {

common/src/main/java/net/kosmo/music/impl/toast/MusicToast.java

@@ -83,14 +83,13 @@ public void render(GuiGraphics guiGraphics, Font font, long startTime) {
         this.albumCover.drawAlbumCover(guiGraphics, 6, 6);
         guiGraphics.pose().popPose();
 
-        guiGraphics.drawString(font, this.title, 30, 7, ClientMusic.isDarkModeEnabled ? 0xff75ff : -11534256, false);
+        RenderHelper.drawScrollableText(guiGraphics, font, this.title, 30, 30, 7, this.width() - 4, 7 + font.lineHeight, ClientMusic.isDarkModeEnabled ? 0xff75ff : -11534256, false, 30, 0, this.width() + 4, this.height());
 
         if (ClientMusic.config.SHOW_AUTHOR) {
-            guiGraphics.drawString(font, this.author, 30, 18, ClientMusic.isDarkModeEnabled ? -3355444 : CommonColors.BLACK, false);
+            RenderHelper.drawScrollableText(guiGraphics, font, this.author, 30, 30, 18, this.width() - 4, 18 + font.lineHeight, ClientMusic.isDarkModeEnabled ? -3355444 : CommonColors.BLACK, false, 30, 0, this.width() + 4, this.height());
         }
         if (ClientMusic.config.SHOW_ALBUM_NAME) {
-            // TODO: Make the mask follow the X of the toast
-            RenderHelper.drawScrollableText(guiGraphics, font, this.albumName, 30, 30, 29, this.width() - 4, 29 + font.lineHeight, ClientMusic.isDarkModeEnabled ? -3355444 : CommonColors.BLACK, false, guiGraphics.guiWidth() - 160 + 30, 0, guiGraphics.guiWidth() - 4, 44);
+            RenderHelper.drawScrollableText(guiGraphics, font, this.albumName, 30, 30, 29, this.width() - 4, 29 + font.lineHeight, ClientMusic.isDarkModeEnabled ? -3355444 : CommonColors.BLACK, false, 30, 0, this.width() + 4, this.height());
         }
     }
 

common/src/main/resources/resourcepacks/dark_mode/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 34,
+    "pack_format": 46,
     "description": [{"translate": "text.musicnotification.resourcepack.dark_mode.description", "fallback": "Turn Music Notification UI to dark mode."}]
   }
 }

gradle.properties

@@ -1,7 +1,7 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
 
-version=2.2.2
+version=2.3.0
 group=net.kosmo
 
 enabledPlatforms=fabric,neoforge

test/custom_musics.json/assets/musicnotification/musics.json

@@ -2,12 +2,12 @@
   "morediscs:music_disc_omen_sound": {
     "title": "Omen",
     "author": "Naps the Block",
-    "soundtrack": "More discs"
+    "album": "More discs"
   },
   "morediscs:records/music_disc_omen_sound": {
     "title": "Omen Record",
     "author": "Naps the Block",
-    "soundtrack": "More discs"
+    "album": "More discs"
   },
   "morediscs:music_disc_silence_sound": {
     "title": "Silence",

test/custom_musics.json/pack.mcmeta

@@ -1,6 +1,7 @@
 {
   "pack": {
     "pack_format": 4,
-    "description": "Custom musics.json"
+    "description": "Custom musics.json",
+    "supported_formats": [4, 2147483647]
   }
 }

test/datapack_custom_disc/data/custom_disc/function/musics.mcfunction

@@ -3,10 +3,10 @@ tellraw @a ["",{"text":"\n\n####","bold":true},{"text":" List Of Musics ","bold"
 
 
 # Aria Math
-tellraw @a ["",{"text":"Disc 1 → ","bold":true},{"text":"Aria Math","bold":false,"italic":true,"color":"light_purple","clickEvent":{"action":"run_command","value":"/give @s minecraft:music_disc_11[minecraft:jukebox_playable={song:\"custom_disc:aria_math\"},minecraft:custom_model_data=1]"}}]
+tellraw @a ["",{"text":"Disc 1 → ","bold":true},{"text":"Aria Math","bold":false,"italic":true,"color":"light_purple","clickEvent":{"action":"run_command","value":"/give @s minecraft:music_disc_11[custom_name='{\"text\":\"Aria Math\"}',minecraft:jukebox_playable={song:\"custom_disc:aria_math\"},minecraft:custom_model_data={strings:[\"aria_math\"]}]"}}]
 
 # Seismic Stratigraphy
-tellraw @a ["",{"text":"Disc 2 → ","bold":true},{"text":"Sweden","bold":false,"italic":true,"color":"aqua","clickEvent":{"action":"run_command","value":"/give @s minecraft:music_disc_11[minecraft:jukebox_playable={song:\"custom_disc:seismic_stratigraphy\"},minecraft:custom_model_data=2]"}}]
+tellraw @a ["",{"text":"Disc 2 → ","bold":true},{"text":"Sweden","bold":false,"italic":true,"color":"aqua","clickEvent":{"action":"run_command","value":"/give @s minecraft:music_disc_11[custom_name='{\"text\":\"Seismic stratigraphy\"}',minecraft:jukebox_playable={song:\"custom_disc:seismic_stratigraphy\"},minecraft:custom_model_data={strings:[\"seismic_stratigraphy\"]}]"}}]
 
 # Droopy Remembers
-tellraw @a ["",{"text":"Disc 3 → ","bold":true},{"text":"Droopy Remembers","bold":false,"italic":true,"color":"aqua","clickEvent":{"action":"run_command","value":"/give @s minecraft:music_disc_11[minecraft:jukebox_playable={song:\"custom_disc:droopy_remembers\"},minecraft:custom_model_data=3]"}}]
+tellraw @a ["",{"text":"Disc 3 → ","bold":true},{"text":"Droopy Remembers","bold":false,"italic":true,"color":"aqua","clickEvent":{"action":"run_command","value":"/give @s minecraft:music_disc_11[custom_name='{\"text\":\"Droopy Remembers\"}',minecraft:jukebox_playable={song:\"custom_disc:droopy_remembers\"},minecraft:custom_model_data={strings:[\"droopy_remembers\"]}]"}}]

test/resource_pack_custom_disc/assets/minecraft/items/music_disc_11.json

@@ -0,0 +1,29 @@
+{
+  "model": {
+    "type": "select",
+    "property": "custom_model_data",
+    "cases": [
+      {
+        "when": "aria_math",
+        "model": {
+          "type": "model",
+          "model": "item/music_disc_aria_math"
+        }
+      },
+      {
+        "when": "seismic_stratigraphy",
+        "model": {
+          "type": "model",
+          "model": "item/music_disc_seismic_stratigraphy"
+        }
+      },
+      {
+        "when": "droopy_remembers",
+        "model": {
+          "type": "model",
+          "model": "item/music_disc_droopy_remembers"
+        }
+      }
+    ]
+  }
+}

test/resource_pack_custom_disc/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 34,
+    "pack_format": 46,
     "description": "Custom disc test"
   }
 }