diff --git a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 7bceadd5..ac4484a2 100644 --- a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -285,7 +285,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (TextItem item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index e15cba38..0786081f 100644 --- a/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -283,7 +283,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 0870f31f..4b023132 100644 --- a/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -195,7 +195,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 563a6578..8e1e4e19 100644 --- a/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -202,7 +202,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index e581abd1..c10462d4 100644 --- a/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -196,7 +196,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index e83c32a9..82abcc99 100644 --- a/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -204,7 +204,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index a6a72871..1d46bc95 100644 --- a/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -191,7 +191,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index e89cd641..5059a568 100644 --- a/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -190,7 +190,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (TextItem item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 7bceadd5..ac4484a2 100644 --- a/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/forge_1_16_5/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -285,7 +285,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (TextItem item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index e15cba38..0786081f 100644 --- a/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/forge_1_20_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -283,7 +283,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 820b2b01..8821702b 100644 --- a/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/neoforge_1_21/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -282,7 +282,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index cd69a78e..556267e9 100644 --- a/client/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -203,7 +203,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 6db810dd..de4a760b 100644 --- a/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -196,7 +196,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/neoforge_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/neoforge_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index cbe9e341..45b3fe31 100644 --- a/client/neoforge_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/neoforge_26_1/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -204,7 +204,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 01d0588f..6f37fa73 100644 --- a/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/neoforge_26_2/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -192,7 +192,7 @@ public class CoreRenderTarget extends TextFrameBuffer { for (var item : texts) { Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, offsetX % item.textWidth, item.scale); + drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); } } diff --git a/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicHud.java b/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicHud.java index 013cd5e2..766fc151 100644 --- a/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicHud.java +++ b/client/src/main/java/com/coloryr/allmusic/client/core/AllMusicHud.java @@ -76,6 +76,7 @@ public class AllMusicHud { private HudPosObj save; private float lyricState = 0.0f; private long lyricTime = -1; + private int lyricWidth; private int pgOffset; private float picScale; private BufferedImage bg2; @@ -235,6 +236,24 @@ public class AllMusicHud { if (save == null || ktv == null || lyricTime == -1) return; lyricTime += 10; kUpdate(); + updateKtvOffset(); + } + + private void updateKtvOffset() { + if (ktv == null || save == null || lyricWidth <= 0) { + lyricRender.clearKtvOffset(); + lyricKtvRender.clearKtvOffset(); + return; + } + + float offset = 0; + int maxWidth = save.lyric.maxWidth; + if (maxWidth > 0 && lyricWidth > maxWidth) { + offset = (lyricWidth - maxWidth) * lyricState; + } + + lyricRender.setKtvOffset(offset); + lyricKtvRender.setKtvOffset(offset); } private void loopTick() { @@ -508,6 +527,8 @@ public class AllMusicHud { allWidth = Math.max(allWidth, AllMusicCore.bridge.getTextWidth(item)); } + lyricWidth = allWidth; + lyricKtvRender.resize(allWidth, allHeight); lyricKtvRender.use(); for (String item : temp) { @@ -519,6 +540,7 @@ public class AllMusicHud { } lyricKtvRender.unUse(); } else { + lyricWidth = 0; lyricKtvRender.clear(); } @@ -612,6 +634,10 @@ public class AllMusicHud { public void setKtv(long time, KtvLyricObj pack2) { ktv = pack2; lyricTime = time; + if (pack2 == null) { + lyricRender.clearKtvOffset(); + lyricKtvRender.clearKtvOffset(); + } } public void setTime(long time, long now) { diff --git a/client/src/main/java/com/coloryr/allmusic/client/core/render/TextFrameBuffer.java b/client/src/main/java/com/coloryr/allmusic/client/core/render/TextFrameBuffer.java index fb19f5a7..445b1aff 100644 --- a/client/src/main/java/com/coloryr/allmusic/client/core/render/TextFrameBuffer.java +++ b/client/src/main/java/com/coloryr/allmusic/client/core/render/TextFrameBuffer.java @@ -11,6 +11,10 @@ public abstract class TextFrameBuffer { protected int nowWidth, nowHeight; protected long offsetX; protected boolean isDraw; + /** + * KTV模式下的强制滚动偏移,>=0 时优先使用 + */ + protected float ktvOffset = -1; // 最大公约数(GCD) public static long gcd(long a, long b) { @@ -59,6 +63,30 @@ public abstract class TextFrameBuffer { } } + /** + * 设置KTV模式下的强制滚动偏移 + */ + public void setKtvOffset(float offset) { + this.ktvOffset = offset; + } + + /** + * 清除KTV模式下的强制滚动偏移,恢复默认滚动 + */ + public void clearKtvOffset() { + this.ktvOffset = -1; + } + + /** + * 获取当前应使用的水平滚动偏移 + */ + protected float getOffset(TextItem item) { + if (ktvOffset >= 0) { + return ktvOffset; + } + return offsetX % item.textWidth; + } + public static class TextItem { public final float renderWidth; public final float renderHeight;