add translation key to tracks, and add the now playing ui

Author: xFN10x

src/client/java/fn10/musicexpansion/MusicExpandedClient.java

@@ -24,7 +24,7 @@
 public class MusicExpandedClient implements ClientModInitializer {
 
 	public static HashMap<Integer, SoundInstance> TRACK_INSTANCES = new HashMap<>();
-	
+
 	@Override
 	public void onInitializeClient() {
 		ClientPlayNetworking.registerGlobalReceiver(ClientBoundCDTrackPlayPayload.ID, (payload, contxt) -> {
@@ -33,7 +33,9 @@ public void onInitializeClient() {
 			SoundEvent event = optionalEvent.orElseThrow();
 			SoundInstance instance = SimpleSoundInstance.forJukeboxSong(event, payload.pos().getCenter());
 			client.getSoundManager().play(instance);
-			client.gui.setNowPlaying(Component.translatable("text.compactdiscs.now-playing"));
+
+			client.gui.setNowPlaying(Component.translatable("text.compactdiscs.now-playing").append(" ")
+					.append(Component.translatable(payload.translationKey())));
 
 			TRACK_INSTANCES.put(payload.id(), instance);
 		});

src/client/java/fn10/musicexpansion/providers/MusicExpandedTranslationProviderENG.java

@@ -21,12 +21,20 @@ public void generateTranslations(Provider registryLookup, TranslationBuilder tra
         translationBuilder.add(MusicExpandedItems.CD, "Compact-Disc");
         translationBuilder.add(MusicExpandedBlocks.DISC_BURNER_BLOCK, "Disc Burner");
         translationBuilder.add(MusicExpandedBlocks.STEREO_BLOCK, "Stereo");
+
         translationBuilder.add("menu.container.disc_burner", "Disc Burner");
         translationBuilder.add("menu.container.stereo", "Stereo");
+
         translationBuilder.add("itemGroup.compactdiscs", "Compact Discs");
+        
         translationBuilder.add("text.cd.tooltip.nosongs", "No Songs");
         translationBuilder.add("text.cd.tooltip.cdrw", "CD-RW");
+
         translationBuilder.add("subtitle.compactdiscs.block.discburner", "Disc Burner Starts...");
+
+        translationBuilder.add("song.compactdiscs.c418.cat", "C418 - Cat");
+        translationBuilder.add("song.compactdiscs.c418.13", "C418 - 13");
+        translationBuilder.add("song.compactdiscs.c418.11", "C418 - 11");
     }
 
 }

src/main/java/fn10/musicexpansion/items/CompactDiscItem.java

@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import fn10.musicexpansion.music.CDTrack;
+import fn10.musicexpansion.music.CDTracks;
 import fn10.musicexpansion.reg.MusicExpandedItemComponents;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -50,9 +52,9 @@ public static List<Component> getTooltip(TooltipContext context, ItemStack stack
         if (stack.has(MusicExpandedItemComponents.CD_SONGS)) {
             list.add(Component.translatable("text.cd.tooltip.cdrw").withColor(0xAAAAAA));
             for (String song : stack.get(MusicExpandedItemComponents.CD_SONGS)) {
-                list.add(addToFront("- ", Component.translatable("cd.song." + song)).withColor(0xAAAAAA));
+                CDTrack track = CDTracks.getTrackFromId(song);
+                list.add(addToFront("- ", track.getTranslation()).withColor(0xAAAAAA));
             }
-            //list.set(0, ((MutableComponent)list.get(0)).withColor(0xff58ff));
         } else {
             list.add(Component.translatable("text.cd.tooltip.nosongs").withColor(0xAAAAAA));
         }

src/main/java/fn10/musicexpansion/music/CDTrack.java

@@ -4,6 +4,7 @@
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvent;
@@ -12,9 +13,11 @@
 public class CDTrack {
 
     private final SoundEvent event;
+    private final String translation;
 
-    public CDTrack(SoundEvent sound) {
+    public CDTrack(SoundEvent sound, String translationString) {
         this.event = sound;
+        this.translation = translationString;
     }
 
     /**
@@ -33,7 +36,7 @@ public Integer play(Level level, BlockPos pos) {
             Integer id = CDTracks.createNewCDTrackId();
             for (ServerPlayer plr : ((ServerLevel) level).players()) {
                 ClientBoundCDTrackPlayPayload payload = new ClientBoundCDTrackPlayPayload(pos, Holder.direct(event),
-                        id);
+                        id, translation);
                 ServerPlayNetworking.send(plr, payload);
             }
             CDTracks.ACTIVE_CD_TRACK_IDS.add(id);
@@ -44,6 +47,10 @@ public Integer play(Level level, BlockPos pos) {
         }
     }
 
+    public Component getTranslation() {
+        return Component.translatable(translation);
+    }
+
     public boolean equals(CDTrack other) {
         return event.location().toString().equals(other.event.location().toString());
     }

src/main/java/fn10/musicexpansion/music/CDTracks.java

@@ -10,9 +10,9 @@
 
 public class CDTracks {
 
-    public static final CDTrack C418_CAT = new CDTrack(SoundEvents.MUSIC_DISC_CAT.value());
-    public static final CDTrack C418_13 = new CDTrack(SoundEvents.MUSIC_DISC_13.value());
-    public static final CDTrack C418_11 = new CDTrack(SoundEvents.MUSIC_DISC_11.value());
+    public static final CDTrack C418_CAT = new CDTrack(SoundEvents.MUSIC_DISC_CAT.value(), "song.compactdiscs.c418.cat");
+    public static final CDTrack C418_13 = new CDTrack(SoundEvents.MUSIC_DISC_13.value(), "song.compactdiscs.c418.13");
+    public static final CDTrack C418_11 = new CDTrack(SoundEvents.MUSIC_DISC_11.value(), "song.compactdiscs.c418.11");
 
     private static final Map<String, CDTrack> TRACK_IDS = Map.of(
             "cat", C418_CAT,

src/main/java/fn10/musicexpansion/music/network/ClientBoundCDTrackPlayPayload.java

@@ -10,14 +10,17 @@
 import net.minecraft.resources.Identifier;
 import net.minecraft.sounds.SoundEvent;
 
-public record ClientBoundCDTrackPlayPayload(BlockPos pos, Holder<SoundEvent> event, Integer id) implements CustomPacketPayload {
+public record ClientBoundCDTrackPlayPayload(BlockPos pos, Holder<SoundEvent> event, Integer id, String translationKey)
+		implements CustomPacketPayload {
 	public static final Identifier CDTRACK_PLAY_PAYLOAD_ID = Identifier.fromNamespaceAndPath(MusicExpanded.MOD_ID,
 			"play_cd_track");
 	public static final CustomPacketPayload.Type<ClientBoundCDTrackPlayPayload> ID = new CustomPacketPayload.Type<>(
 			CDTRACK_PLAY_PAYLOAD_ID);
 	public static final StreamCodec<RegistryFriendlyByteBuf, ClientBoundCDTrackPlayPayload> CODEC = StreamCodec
 			.composite(BlockPos.STREAM_CODEC, ClientBoundCDTrackPlayPayload::pos, SoundEvent.STREAM_CODEC,
-					ClientBoundCDTrackPlayPayload::event, ByteBufCodecs.INT, ClientBoundCDTrackPlayPayload::id,  ClientBoundCDTrackPlayPayload::new);
+					ClientBoundCDTrackPlayPayload::event, ByteBufCodecs.INT, ClientBoundCDTrackPlayPayload::id,
+					ByteBufCodecs.STRING_UTF8, ClientBoundCDTrackPlayPayload::translationKey,
+					ClientBoundCDTrackPlayPayload::new);
 
 	@Override
 	public Type<? extends CustomPacketPayload> type() {