keep track of playing tracks

Author: xFN10x

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

@@ -1,6 +1,6 @@
 package fn10.musicexpansion;
 
-import java.nio.channels.Channel;
+import java.util.HashMap;
 import java.util.Optional;
 
 import fn10.musicexpansion.items.CompactDiscItem;
@@ -18,19 +18,22 @@
 import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.client.resources.sounds.SoundInstance;
-import net.minecraft.client.sounds.SoundEngine.PlayResult;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.phys.Vec3;
 
 public class MusicExpandedClient implements ClientModInitializer {
+
+	public static HashMap<Integer, SoundInstance> TRACK_INSTANCES = new HashMap<>();
+	
 	@Override
 	public void onInitializeClient() {
 		ClientPlayNetworking.registerGlobalReceiver(ClientBoundCDTrackPlayPayload.ID, (payload, contxt) -> {
 			Minecraft client = contxt.client();
 			Optional<SoundEvent> optionalEvent = payload.event().unwrap().right();
 			SoundEvent event = optionalEvent.orElseThrow();
 			SoundInstance instance = SimpleSoundInstance.forJukeboxSong(event, payload.pos().getCenter());
-			PlayResult play = client.getSoundManager().play(instance);
+			client.getSoundManager().play(instance);
+
+			TRACK_INSTANCES.put(payload.id(), instance);
 		});
 		ItemTooltipCallback.EVENT.register((stack, context, tooltipType, lines) -> {
 			if (stack.is(MusicExpandedItems.CD)) {

src/main/java/fn10/musicexpansion/blocks/entity/StereoBlockEntity.java

@@ -1,5 +1,6 @@
 package fn10.musicexpansion.blocks.entity;
 
+import java.util.Iterator;
 import java.util.List;
 
 import fn10.musicexpansion.blocks.DiscBurnerBlock;
@@ -14,16 +15,21 @@
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.ContainerHelper;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
+import net.minecraft.world.level.storage.ValueOutput.TypedOutputList;
 
 public class StereoBlockEntity extends BaseContainerBlockEntity {
     public NonNullList<ItemStack> inventory;
     public boolean playing = false;
+    private Integer currentlyPlayingId = -1;
 
     public StereoBlockEntity(BlockPos blockPos, BlockState blockState) {
         super(MusicExpandedBlockEntitys.STEREO_BENTITY, blockPos, blockState);
@@ -37,9 +43,10 @@ public void putInCD(ItemStack stack) {
     }
 
     public void play(int tracki) {
+        if (currentlyPlayingId != -1) return;
         List<String> songList = inventory.get(0).get(MusicExpandedItemComponents.CD_SONGS);
         CDTrack track = CDTracks.getTrackFromId(songList.get(tracki));
-        track.play(level, worldPosition);
+        currentlyPlayingId = track.play(level, worldPosition);
     }
 
     @Override
@@ -68,6 +75,24 @@ protected void setItems(NonNullList<ItemStack> nonNullList) {
         inventory = nonNullList;
     }
 
+    @Override
+    protected void saveAdditional(ValueOutput output) {
+        output.putBoolean("playing", playing);
+        output.putInt("currentlyPlayingId", currentlyPlayingId);
+        ContainerHelper.saveAllItems(output, inventory);
+
+        super.saveAdditional(output);
+    }
+
+    @Override
+    protected void loadAdditional(ValueInput input) {
+        super.loadAdditional(input);
+
+        playing = input.getBooleanOr("playing", false);
+        currentlyPlayingId = input.getIntOr("currentlyPlayingId", -1);
+        ContainerHelper.loadAllItems(input, inventory);
+    }
+
     @Override
     public CompoundTag getUpdateTag(HolderLookup.Provider registryLookup) {
         return saveWithoutMetadata(registryLookup);

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

@@ -18,12 +18,31 @@ public CDTrack(SoundEvent sound) {
         this.event = sound;
     }
 
-    public void play(Level level, BlockPos pos) {
-        if (level instanceof ServerLevel)
+    /**
+     * Plays this track in the given level and pos. This then sends packets to all
+     * clients.
+     * 
+     * @param level The level this is happening in.
+     * @param pos   The position this track should play
+     * @return The id of the playing track. This is how we keep track of the playing
+     *         tracks. This value is -1 if this function fails
+     */
+    public Integer play(Level level, BlockPos pos) {
+        try {
+            if (!(level instanceof ServerLevel))
+                return -1;
+            Integer id = CDTracks.createNewCDTrackId();
             for (ServerPlayer plr : ((ServerLevel) level).players()) {
-                ClientBoundCDTrackPlayPayload payload = new ClientBoundCDTrackPlayPayload(pos, Holder.direct(event));
+                ClientBoundCDTrackPlayPayload payload = new ClientBoundCDTrackPlayPayload(pos, Holder.direct(event),
+                        id);
                 ServerPlayNetworking.send(plr, payload);
             }
+            CDTracks.ACTIVE_CD_TRACK_IDS.add(id);
+            return id;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
     }
 
     public boolean equals(CDTrack other) {

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

@@ -1,10 +1,14 @@
 package fn10.musicexpansion.music;
 
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
 import java.util.Map.Entry;
+import java.util.random.RandomGenerator;
 
+import net.minecraft.core.NonNullList;
 import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
 
 public class CDTracks {
 
@@ -13,17 +17,26 @@ public class CDTracks {
     public static final CDTrack C418_11 = new CDTrack(SoundEvents.MUSIC_DISC_11.value());
 
     private static final Map<String, CDTrack> TRACK_IDS = Map.of(
-        "cat", C418_CAT,
-        "13", C418_13,
-        "11", C418_11
-    );
+            "cat", C418_CAT,
+            "13", C418_13,
+            "11", C418_11);
+
+    protected static final NonNullList<Integer> ACTIVE_CD_TRACK_IDS = NonNullList.create();
+
+    public static Integer createNewCDTrackId() {
+        Integer canadite = Random.from(RandomGenerator.getDefault()).nextInt(0, Integer.MAX_VALUE);
+        if (ACTIVE_CD_TRACK_IDS.contains(canadite))
+            return createNewCDTrackId();
+        else
+            return createNewCDTrackId();
+    }
 
     public static CDTrack getTrackFromId(String id) {
         return TRACK_IDS.get(id);
     }
 
     public static String getIdFromTrack(CDTrack track) {
-        for (Entry<String,CDTrack> set : TRACK_IDS.entrySet()) {
+        for (Entry<String, CDTrack> set : TRACK_IDS.entrySet()) {
             if (set.getValue().equals(track)) {
                 return set.getKey();
             }

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

@@ -4,19 +4,20 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.Identifier;
 import net.minecraft.sounds.SoundEvent;
 
-public record ClientBoundCDTrackPlayPayload(BlockPos pos, Holder<SoundEvent> event) implements CustomPacketPayload {
+public record ClientBoundCDTrackPlayPayload(BlockPos pos, Holder<SoundEvent> event, Integer id) 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, ClientBoundCDTrackPlayPayload::new);
+					ClientBoundCDTrackPlayPayload::event, ByteBufCodecs.INT, ClientBoundCDTrackPlayPayload::id,  ClientBoundCDTrackPlayPayload::new);
 
 	@Override
 	public Type<? extends CustomPacketPayload> type() {