upstream/AllMusic
2
0 Fork 0
mirror of https://github.com/Coloryr/AllMusic.git synced 2026-11-08 18:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug

Browse Source 
fixed #126 #123
This commit is contained in:
Color_yr committed 2026-07-24 20:05:24 +08:00
1 parent 33bcc7f49b
commit 90cc858ca2
21 files changed
+20 -101
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.gradle.kts
+1 -1
View File
@@ -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
client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -36,9 +36,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "resume", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -30,9 +30,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -30,9 +30,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -35,9 +35,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -30,9 +30,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -30,9 +30,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -32,9 +32,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -32,9 +32,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -35,9 +35,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/mixins/SoundEvent.java
-5
View File
@@ -35,9 +35,4 @@ public class SoundEvent {
}
}
}
@Inject(method = "reload", at = @At("RETURN"))
public void reload(CallbackInfo info) {
AllMusicCore.reload();
}
}
client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class AllMusicClient implements AllMusicBridge {
}
@Override
public TextFrameBuffer makeTextRender(String name) {
public TextFrameBuffer<?> makeTextRender(String name) {
return new CoreRenderTarget(name);
}
client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
-5
View File
@@ -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;
client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
+1 -6
View File
@@ -50,11 +50,6 @@ public class AllMusicClient implements IPayloadHandler<MusicCodec>, 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<MusicCodec>, AllMusicBrid
}
@Override
public TextFrameBuffer makeTextRender(String name) {
public TextFrameBuffer<?> makeTextRender(String name) {
return new CoreRenderTarget(name);
}
client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
-5
View File
@@ -49,11 +49,6 @@ public class AllMusicClient implements IPayloadHandler<MusicCodec>, 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);
client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
-5
View File
@@ -49,11 +49,6 @@ public class AllMusicClient implements IPayloadHandler<MusicCodec>, 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);
client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
-5
View File
@@ -49,11 +49,6 @@ public class AllMusicClient implements AllMusicBridge, IPayloadHandler<MusicCode
event.enqueueWork(AllMusicCore::renderInit);
}
@SubscribeEvent
public static void onLoad(final SoundEngineLoadEvent e) {
AllMusicCore.reload();
}
@SubscribeEvent
public static void onSound(final PlaySoundSourceEvent e) {
if (!AllMusicCore.isPlay()) return;
client/neoforge_26_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
-5
View File
@@ -79,11 +79,6 @@ public class AllMusicClient implements IPayloadHandler<MusicCodec>, 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)) {
client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java
-5
View File
@@ -79,11 +79,6 @@ public class AllMusicClient implements IPayloadHandler<MusicCodec>, 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)) {
client/src/main/java/com/coloryr/allmusic/client/core/AllMusicPlayer.java
+4
View File
@@ -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) {
settings.gradle.kts
+13 -13
View File
@@ -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 {