Fix clearing resource when packs were reloaded

Author: lonefelidae16

logics/src/main/java/dev/stashy/extrasounds/logics/SoundManager.java

@@ -296,13 +296,13 @@ public void stopSound(VersionedSoundEventWrapper e, SoundType type) {
     }
 
     public VersionedSoundEventWrapper getSoundByItem(ItemStack item, SoundType type) {
-        final var itemCompoId = ExtraSounds.getClickId(ExtraSounds.MAIN.getItemIdWithComponents(item), type);
+        final var itemModelId = ExtraSounds.getClickId(ExtraSounds.MAIN.getItemIdWithComponents(item), type);
         final var itemId = ExtraSounds.getClickId(ExtraSounds.MAIN.getItemId(item.getItem()), type);
-        final var sound = SoundPackLoader.getSoundEventById(itemCompoId, itemId);
+        final var sound = SoundPackLoader.getSoundEventById(itemModelId, itemId);
         if (sound.isEmpty()) {
             logMissingSoundId(itemId);
-            if (!itemCompoId.equals(itemId)) {
-                logMissingSoundId(itemCompoId);
+            if (!itemModelId.equals(itemId)) {
+                logMissingSoundId(itemModelId);
             }
             return FALLBACK_SOUND_EVENT;
         } else {

logics/src/main/java/dev/stashy/extrasounds/logics/entry/SoundPackLoader.java

@@ -39,8 +39,9 @@ public final class SoundPackLoader {
     private static final String CACHE_FNAME = ExtraSounds.MODID + ".cache";
     private static final Path CACHE_PATH = Path.of(System.getProperty("java.io.tmpdir"), ".minecraft_fabric", CACHE_FNAME);
 
-    private static final Map<Identifier, VersionedSoundEventWrapper> BUILT_IN_SOUND_EVENT = new HashMap<>();
+    private static final Map<Identifier, VersionedSoundEventWrapper> AUTO_GEN_SOUND_EVENT = new HashMap<>();
     private static final Map<Identifier, VersionedSoundEventWrapper> EXTERNAL_SOUND_EVENT = new HashMap<>();
+    private static final Map<Identifier, VersionedSoundEventWrapper> CUSTOM_SOUND_EVENT = new HashMap<>();
     public static final VersionedClientResource EXTRA_SOUNDS_RESOURCE = Objects.requireNonNull(
             VersionedClientResource.newInstance(ExtraSounds.MODID, "%s Runtime Resources".formatted(ExtraSounds.class.getSimpleName()))
     );
@@ -141,7 +142,7 @@ public static void init() {
         } else if (DebugUtils.DEBUG) {
             LOGGER.info("init finished; took {}ms.", tookMillis);
         }
-        LOGGER.info("Built-in sound pack successfully loaded; {} entries.", BUILT_IN_SOUND_EVENT.size());
+        LOGGER.info("Generated sound pack successfully loaded; {} entries.", AUTO_GEN_SOUND_EVENT.size());
     }
 
     /**
@@ -220,29 +221,33 @@ private static void generateSoundEntry(Identifier clickId, SoundEventRegistratio
      * @param clickId Target id.
      */
     private static void putSoundEvent(Identifier clickId) {
-        BUILT_IN_SOUND_EVENT.put(clickId, ExtraSounds.createEvent(clickId));
+        AUTO_GEN_SOUND_EVENT.put(clickId, ExtraSounds.createEvent(clickId));
     }
 
     private static void putExternalSoundEvent(Identifier identifier) {
         EXTERNAL_SOUND_EVENT.put(identifier, ExtraSounds.createEvent(identifier));
     }
 
     public static Optional<VersionedSoundEventWrapper> getSoundEventById(Identifier... ids) {
+        if (ids == null) {
+            return Optional.empty();
+        }
+
         for (Identifier target : ids) {
-            if (EXTERNAL_SOUND_EVENT.containsKey(target)) {
-                return Optional.of(EXTERNAL_SOUND_EVENT.get(target));
-            }
-            if (BUILT_IN_SOUND_EVENT.containsKey(target)) {
-                return Optional.of(BUILT_IN_SOUND_EVENT.get(target));
+            if (CUSTOM_SOUND_EVENT.containsKey(target)) {
+                return Optional.of(CUSTOM_SOUND_EVENT.get(target));
             }
         }
         return Optional.empty();
     }
 
     public static void reloadExternalSoundEvent() {
+        EXTERNAL_SOUND_EVENT.clear();
+        CUSTOM_SOUND_EVENT.clear();
+
         for (var pack : Minecraft.getInstance().getResourceManager().getResourceStack(SOUNDS_JSON_ID)) {
             if (pack.sourcePackId().equals(ExtraSounds.MODID)) {
-                // Avoid built-in resource via SoundPackLoader.
+                // Avoid auto-gen resource via SoundPackLoader.
                 continue;
             }
             try (InputStream stream = pack.open()) {
@@ -254,8 +259,11 @@ public static void reloadExternalSoundEvent() {
             } catch (Exception ignored) {
             }
         }
+
+        CUSTOM_SOUND_EVENT.putAll(AUTO_GEN_SOUND_EVENT);
         if (!EXTERNAL_SOUND_EVENT.isEmpty()) {
             LOGGER.info("External sound pack was found; {} entries.", EXTERNAL_SOUND_EVENT.size());
+            CUSTOM_SOUND_EVENT.putAll(EXTERNAL_SOUND_EVENT);
         }
     }
 

versioned/es26.1/src/main/java/dev/stashy/extrasounds/mc26_1/mixin/resource/ReloadableResourceManagerMixin.java

@@ -35,7 +35,7 @@ public abstract class ReloadableResourceManagerMixin {
     }
 
     @Inject(method = "createReload", at = @At("RETURN"))
-    private void injected(CallbackInfoReturnable<ReloadInstance> cir) {
+    private void extrasounds$afterReload(CallbackInfoReturnable<ReloadInstance> cir) {
         SoundPackLoader.reloadExternalSoundEvent();
     }
 }