From 90cc858ca27d1e89dd7a3708404ab1ff9df219b2 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 24 Jul 2026 20:05:24 +0800 Subject: [PATCH] bug fixed #126 #123 --- build.gradle.kts | 2 +- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/mixins/SoundEvent.java | 5 ---- .../allmusic/client/AllMusicClient.java | 2 +- .../allmusic/client/AllMusicClient.java | 5 ---- .../allmusic/client/AllMusicClient.java | 7 +---- .../allmusic/client/AllMusicClient.java | 5 ---- .../allmusic/client/AllMusicClient.java | 5 ---- .../allmusic/client/AllMusicClient.java | 5 ---- .../allmusic/client/AllMusicClient.java | 5 ---- .../allmusic/client/AllMusicClient.java | 5 ---- .../allmusic/client/core/AllMusicPlayer.java | 4 +++ settings.gradle.kts | 26 +++++++++---------- 21 files changed, 20 insertions(+), 101 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d2c823db..4c0fba8c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ allprojects { apply(plugin = "com.gradleup.shadow") group = "com.coloryr" - version = "4.1.5" + version = "4.1.6" // 设置项目JDK版本 java.sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index 37aca7ce..7ef8441b 100644 --- a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -36,9 +36,4 @@ public class SoundEvent { } } } - - @Inject(method = "resume", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } \ No newline at end of file diff --git a/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index 35ac6f07..976549da 100644 --- a/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -30,9 +30,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index 35ac6f07..976549da 100644 --- a/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -30,9 +30,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index 61357802..24ee4a4f 100644 --- a/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -35,9 +35,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index 35ac6f07..976549da 100644 --- a/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -30,9 +30,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index 35ac6f07..976549da 100644 --- a/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -30,9 +30,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index fad60d82..0b9f1d3a 100644 --- a/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -32,9 +32,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index fad60d82..0b9f1d3a 100644 --- a/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -32,9 +32,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index ce02c756..5bd2ce83 100644 --- a/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -35,9 +35,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java b/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java index ce02c756..5bd2ce83 100644 --- a/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java +++ b/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java @@ -35,9 +35,4 @@ public class SoundEvent { } } } - - @Inject(method = "reload", at = @At("RETURN")) - public void reload(CallbackInfo info) { - AllMusicCore.reload(); - } } diff --git a/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 0f5c7fc9..40277a7a 100644 --- a/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -149,7 +149,7 @@ public class AllMusicClient implements AllMusicBridge { } @Override - public TextFrameBuffer makeTextRender(String name) { + public TextFrameBuffer makeTextRender(String name) { return new CoreRenderTarget(name); } diff --git a/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index aed652f6..100500c7 100644 --- a/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -46,7 +46,6 @@ public class AllMusicClient implements AllMusicBridge { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); modEventBus.addListener(this::setup); - modEventBus.addListener(this::onLoad); MinecraftForge.EVENT_BUS.register(this); } @@ -104,10 +103,6 @@ public class AllMusicClient implements AllMusicBridge { return Minecraft.getInstance().font.lineHeight; } - public void onLoad(final SoundEngineLoadEvent e) { - AllMusicCore.reload(); - } - @SubscribeEvent public void onSound(final SoundEvent.SoundSourceEvent e) { if (!AllMusicCore.isPlay()) return; diff --git a/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 0716ce7d..bff92c27 100644 --- a/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -50,11 +50,6 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid event.enqueueWork(AllMusicCore::renderInit); } - @SubscribeEvent - public static void onLoad(final SoundEngineLoadEvent e) { - AllMusicCore.reload(); - } - public void sendMessage(String data) { data = "[AllMusic Client]" + data; LOGGER.warn(data); @@ -102,7 +97,7 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid } @Override - public TextFrameBuffer makeTextRender(String name) { + public TextFrameBuffer makeTextRender(String name) { return new CoreRenderTarget(name); } diff --git a/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 1a61ff23..e9e710f7 100644 --- a/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -49,11 +49,6 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid event.enqueueWork(AllMusicCore::renderInit); } - @SubscribeEvent - public static void onLoad(final SoundEngineLoadEvent e) { - AllMusicCore.reload(); - } - public void sendMessage(String data) { data = "[AllMusic Client]" + data; LOGGER.warn(data); diff --git a/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 1a61ff23..e9e710f7 100644 --- a/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -49,11 +49,6 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid event.enqueueWork(AllMusicCore::renderInit); } - @SubscribeEvent - public static void onLoad(final SoundEngineLoadEvent e) { - AllMusicCore.reload(); - } - public void sendMessage(String data) { data = "[AllMusic Client]" + data; LOGGER.warn(data); diff --git a/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 443f400f..d1d79080 100644 --- a/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -49,11 +49,6 @@ public class AllMusicClient implements AllMusicBridge, IPayloadHandler, AllMusicBrid AllMusicCore.onServerQuit(); } - @SubscribeEvent - public static void onLoad(final SoundEngineLoadEvent e) { - AllMusicCore.reload(); - } - @SubscribeEvent public static void onRenderOverlay(RenderGuiLayerEvent.Post e) { if (e.getName().equals(VanillaGuiLayers.CAMERA_OVERLAYS)) { diff --git a/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 3ac78cae..c2eed088 100644 --- a/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -79,11 +79,6 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid AllMusicCore.onServerQuit(); } - @SubscribeEvent - public static void onLoad(final SoundEngineLoadEvent e) { - AllMusicCore.reload(); - } - @SubscribeEvent public static void onRenderOverlay(RenderGuiLayerEvent.Post e) { if (e.getName().equals(VanillaGuiLayers.CAMERA_OVERLAYS)) { diff --git a/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicPlayer.java b/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicPlayer.java index 4a37cc12..31c8c113 100644 --- a/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicPlayer.java +++ b/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicPlayer.java @@ -224,6 +224,10 @@ public class AllMusicPlayer extends InputStream { if (isClose) { break; } + if (!AL10.alIsSource(index)) { + setReload(); + break; + } try { while (AL10.alGetSourcei(index, AL10.AL_BUFFERS_QUEUED) < AllMusicCore.config.queueSize) { if (!isRun) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 93d8e9f7..27136c01 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -55,19 +55,19 @@ include(":server:folia") include(":server:paper") include(":server:velocity") -//include(":onejar") -// -//include(":onejar:fabric_1_16_5") -//include(":onejar:fabric_1_20_1") -//include(":onejar:fabric_1_21") -//include(":onejar:fabric_1_21_6") -//include(":onejar:fabric_1_21_11") -//include(":onejar:fabric_26_1") -//include(":onejar:fabric_26_2") -//include(":onejar:neoforge_1_21") -//include(":onejar:neoforge_1_21_6") -//include(":onejar:neoforge_1_21_11") -//include(":onejar:neoforge_26_1") +include(":onejar") + +include(":onejar:fabric_1_16_5") +include(":onejar:fabric_1_20_1") +include(":onejar:fabric_1_21") +include(":onejar:fabric_1_21_6") +include(":onejar:fabric_1_21_11") +include(":onejar:fabric_26_1") +include(":onejar:fabric_26_2") +include(":onejar:neoforge_1_21") +include(":onejar:neoforge_1_21_6") +include(":onejar:neoforge_1_21_11") +include(":onejar:neoforge_26_1") pluginManagement { repositories {