From bf6979e45b1f0499255ddbe2aaddd975b59b453e Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sat, 7 Oct 2023 18:44:33 -0400
Subject: [PATCH] Cleanup dynamic sounds patch, bump eviction time to 5 minutes

---
 .../dynamic_sounds/SoundBufferLibraryMixin.java     | 13 ++++++-------
 .../dynamicresources/DynamicSoundHelpers.java       |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_sounds/SoundBufferLibraryMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_sounds/SoundBufferLibraryMixin.java
index 695065bc..607657d5 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_sounds/SoundBufferLibraryMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_sounds/SoundBufferLibraryMixin.java
@@ -24,13 +24,12 @@ public abstract class SoundBufferLibraryMixin {
     private static final boolean debugDynamicSoundLoading = Boolean.getBoolean("modernfix.debugDynamicSoundLoading");
 
     @Shadow @Final @Mutable
-    private Map<ResourceLocation, CompletableFuture<SoundBuffer>> cache =
-    CacheBuilder.newBuilder()
-    .expireAfterAccess(DynamicSoundHelpers.MAX_SOUND_LIFETIME_SECS, TimeUnit.SECONDS)
-    // Excessive use of type hinting due to it assuming Object as the broadest correct type
-    .<ResourceLocation, CompletableFuture<SoundBuffer>>removalListener(this::onSoundRemoval)
-    .<ResourceLocation, CompletableFuture<SoundBuffer>>build()
-    .asMap();
+    private Map<ResourceLocation, CompletableFuture<SoundBuffer>> cache = CacheBuilder.newBuilder()
+        .expireAfterAccess(DynamicSoundHelpers.MAX_SOUND_LIFETIME_SECS, TimeUnit.SECONDS)
+        // Excessive use of type hinting due to it assuming Object as the broadest correct type
+        .<ResourceLocation, CompletableFuture<SoundBuffer>>removalListener(this::onSoundRemoval)
+        .build()
+        .asMap();
 
     private <K extends ResourceLocation, V extends CompletableFuture<SoundBuffer>> void onSoundRemoval(RemovalNotification<K, V> notification) {
         notification.getValue().thenAccept(SoundBuffer::discardAlBuffer);
diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java
index fba50c80..876fd47d 100644
--- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java
+++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java
@@ -4,5 +4,5 @@ public class DynamicSoundHelpers {
 	/**
 	 * The duration until a sound is eligible for eviction if unused.
 	 */
-	public static final int MAX_SOUND_LIFETIME_SECS = 120;
+	public static final int MAX_SOUND_LIFETIME_SECS = 300;
 }