From f607dcde6301cd0aaee6e19d0ca9a3c7f3cc5714 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sat, 11 Jul 2026 18:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B8=B2=E6=9F=93=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../allmusic/client/AllMusicClient.java | 2 - .../allmusic/client/CoreRenderTarget.java | 8 +- .../coloryr/allmusic/client/PicRender.java | 3 +- .../coloryr/allmusic/client/TexRender.java | 12 +- .../src/main/resources/fabric.mod.json | 2 +- .../allmusic/client/AllMusicClient.java | 8 +- .../allmusic/client/CoreRenderTarget.java | 382 ++++-------- .../src/main/resources/fabric.mod.json | 5 +- .../allmusic/client/AllMusicClient.java | 10 +- .../allmusic/client/CoreRenderTarget.java | 294 ++++----- .../src/main/resources/fabric.mod.json | 3 +- .../allmusic/client/CoreRenderTarget.java | 552 ++++------------- .../src/main/resources/fabric.mod.json | 3 +- .../allmusic/client/CoreRenderTarget.java | 4 +- .../src/main/resources/fabric.mod.json | 1 - .../allmusic/client/CoreRenderTarget.java | 5 +- .../src/main/resources/fabric.mod.json | 1 - .../allmusic/client/CoreRenderTarget.java | 540 ++++------------- .../src/main/resources/fabric.mod.json | 3 +- .../allmusic/client/CoreRenderTarget.java | 540 ++++------------- .../src/main/resources/fabric.mod.json | 3 +- .../allmusic/client/CoreRenderTarget.java | 559 ++++-------------- .../src/main/resources/fabric.mod.json | 3 +- .../allmusic/client/CoreRenderTarget.java | 461 ++++----------- .../src/main/resources/fabric.mod.json | 1 - .../allmusic/client/AllMusicClient.java | 2 +- .../allmusic/client/CoreRenderTarget.java | 398 +++++-------- .../allmusic/client/AllMusicClient.java | 10 +- .../allmusic/client/CoreRenderTarget.java | 395 +++++-------- .../allmusic/client/AllMusicClient.java | 6 +- .../allmusic/client/CoreRenderTarget.java | 381 ++++-------- .../com/coloryr/allmusic/client/AllMusic.java | 2 +- .../allmusic/client/CoreRenderTarget.java | 394 +++++------- .../allmusic/client/AllMusicClient.java | 6 +- .../allmusic/client/CoreRenderTarget.java | 380 ++++-------- .../allmusic/client/CoreRenderTarget.java | 553 ++++------------- .../allmusic/client/CoreRenderTarget.java | 4 +- .../allmusic/client/CoreRenderTarget.java | 5 +- .../allmusic/client/CoreRenderTarget.java | 540 ++++------------- .../allmusic/client/CoreRenderTarget.java | 558 ++++------------- .../allmusic/client/CoreRenderTarget.java | 461 ++++----------- onejar/fabric_1_20_1/build.gradle.kts | 59 ++ .../main/resources/assets/allmusic/icon.png | Bin 0 -> 32781 bytes .../src/main/resources/fabric.mod.json | 35 ++ .../src/main/resources/fabric.mod.json | 2 +- .../src/main/resources/fabric.mod.json | 5 +- .../src/main/resources/fabric.mod.json | 3 +- .../src/main/resources/fabric.mod.json | 3 +- .../src/main/resources/fabric.mod.json | 3 +- .../src/main/resources/fabric.mod.json | 3 +- .../src/main/resources/fabric.mod.json | 1 - settings.gradle.kts | 1 + 52 files changed, 2094 insertions(+), 5521 deletions(-) create mode 100644 onejar/fabric_1_20_1/build.gradle.kts create mode 100644 onejar/fabric_1_20_1/src/main/resources/assets/allmusic/icon.png create mode 100644 onejar/fabric_1_20_1/src/main/resources/fabric.mod.json diff --git a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 7487575c..51db1a46 100644 --- a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -31,10 +31,8 @@ public class AllMusicClient implements ClientModInitializer, AllMusicBridge { public static final Logger LOGGER = LogManager.getLogger("AllMusic Client"); - /** 当前帧的 PoseStack，由 GuiShow mixin 注入 */ public static PoseStack context; - /** 由 HUD 渲染 mixin 调用，缓存当前帧的 PoseStack */ public static void update(PoseStack matrices) { context = matrices; } 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 75a27682..79e8192a 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 @@ -113,9 +113,10 @@ public class CoreRenderTarget extends TextFrameBuffer { if (texts.isEmpty()) { return; } - if (line >= texts.size() || line >= entries.size()) { + if (line >= texts.size()) { return; } + if (line >= entries.size()) return; PoseStack matrices = AllMusicClient.context; if (matrices == null) return; Font font = Minecraft.getInstance().font; @@ -153,11 +154,12 @@ public class CoreRenderTarget extends TextFrameBuffer { if (maxWidth != -1 && entry.width > maxWidth) { float maxOffset = entry.width - maxWidth; - int texOffset = (int) (maxOffset * state); + float texOffset = maxOffset * state; int revealWidth = (int) (maxWidth * state); + enableScissor(drawX, drawY, maxWidth, entry.height); enableScissor(drawX, drawY, revealWidth, entry.height); - drawString(font, matrices, entry, drawX - texOffset, drawY, finalColor); + drawString(font, matrices, entry, drawX - (int) texOffset, drawY, finalColor); disableScissor(); } else { int revealWidth = (int) (entry.width * state); diff --git a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/PicRender.java b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/PicRender.java index 799ba0ae..1fc20769 100644 --- a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/PicRender.java +++ b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/PicRender.java @@ -48,8 +48,7 @@ public class PicRender extends PictureFrameBuffer { public void draw(boolean rotate, int size, float x, float y, int ang, HudPosType dir, float alpha) { Point2f point = AllMusicHud.getPos(size, size, x, y, dir); - RenderSystem.setShaderTexture(0, rotate ? rotateTexture.getId() : sourceTexture.getId()); - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); + RenderSystem.bindTexture(rotate ? rotateTexture.getId() : sourceTexture.getId()); RenderSystem.depthMask(false); RenderSystem.enableBlend(); RenderSystem.depthFunc(GL30.GL_ALWAYS); diff --git a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/TexRender.java b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/TexRender.java index ad798b68..74522ea3 100644 --- a/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/TexRender.java +++ b/client/fabric_1_16_5/src/main/java/com/coloryr/allmusic/client/TexRender.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.resources.metadata.texture.TextureMetadataSection; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; +import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL30; import java.io.IOException; @@ -42,8 +43,7 @@ public class TexRender extends TextureRender { @Override public void drawPic(float x, float y, float alpha) { - RenderSystem.setShaderTexture(0, sourceTexture.getId()); - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); + RenderSystem.bindTexture(sourceTexture.getId()); RenderSystem.depthMask(false); RenderSystem.enableBlend(); RenderSystem.depthFunc(GL30.GL_ALWAYS); @@ -64,7 +64,7 @@ public class TexRender extends TextureRender { float v1 = 1; BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); - bufferBuilder.begin(7, DefaultVertexFormat.POSITION_COLOR_TEX); + bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormat.POSITION_COLOR_TEX); bufferBuilder.vertex(matrix, x0, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u0, v1).endVertex(); bufferBuilder.vertex(matrix, x1, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v1).endVertex(); bufferBuilder.vertex(matrix, x1, y0, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v0).endVertex(); @@ -78,8 +78,7 @@ public class TexRender extends TextureRender { @Override public void drawPic(float x, float y, float width, float alpha) { - RenderSystem.setShaderTexture(0, sourceTexture.getId()); - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); + RenderSystem.bindTexture(sourceTexture.getId()); RenderSystem.depthMask(false); RenderSystem.enableBlend(); RenderSystem.depthFunc(GL30.GL_ALWAYS); @@ -117,8 +116,7 @@ public class TexRender extends TextureRender { public void drawPic(float x, float y, float width, float height, HudPosType dir, float alpha) { Point2f point = AllMusicHud.getPos(width, height, x, y, dir); - RenderSystem.setShaderTexture(0, sourceTexture.getId()); - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); + RenderSystem.bindTexture(sourceTexture.getId()); RenderSystem.depthMask(false); RenderSystem.enableBlend(); RenderSystem.depthFunc(GL30.GL_ALWAYS); diff --git a/client/fabric_1_16_5/src/main/resources/fabric.mod.json b/client/fabric_1_16_5/src/main/resources/fabric.mod.json index 2a2837a3..f7bff6d6 100644 --- a/client/fabric_1_16_5/src/main/resources/fabric.mod.json +++ b/client/fabric_1_16_5/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "allmusic_client.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.19.3", "fabric": "*", "minecraft": ">=1.16" }, diff --git a/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index f53ea051..21bd7243 100644 --- a/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/fabric_1_20_1/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -26,10 +26,10 @@ public class AllMusicClient implements ClientModInitializer, AllMusicBridge { public static final ResourceLocation ID = new ResourceLocation("allmusic", "channel"); public static final Logger LOGGER = LogManager.getLogger("AllMusic Client"); - public static GuiGraphics graphics; + public static GuiGraphics context; - public static void update(GuiGraphics graphics) { - AllMusicClient.graphics = graphics; + public static void update(GuiGraphics context) { + AllMusicClient.context = context; AllMusicCore.hudUpdate(); } @@ -72,7 +72,7 @@ public class AllMusicClient implements ClientModInitializer, AllMusicBridge { @Override public TextFrameBuffer makeTextRender(String name) { - return new CoreRenderTarget(); + return new CoreRenderTarget(name); } @Override 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 a4f3f31b..450f1f7b 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 @@ -4,301 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.RenderBuffers; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; -import org.joml.Matrix4f; -import org.lwjgl.opengl.GL30; + +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private static final RenderBuffers renderBuffers = new RenderBuffers(); + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final RenderTarget target; - private Matrix4f matrix4f; + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } - public CoreRenderTarget() { - target = new TextureTarget(800, 200, false, false); - target.setClearColor(0.0f, 0.0f, 0.0f, 0.0f); + private final List entries = new ArrayList<>(); + + private final boolean isState; + + public CoreRenderTarget(String name) { + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = (int) (width * window.getGuiScale()); - nowHeight = (int) (height * window.getGuiScale()); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight, false); - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } else if (matrix4f == null) { - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - target.clear(false); - target.bindWrite(true); - - RenderSystem.backupProjectionMatrix(); - if (matrix4f != null) { - RenderSystem.setProjectionMatrix(matrix4f, VertexSorting.ORTHOGRAPHIC_Z); - } + entries.clear(); } @Override public void unUse() { isDraw = false; - - RenderSystem.restoreProjectionMatrix(); - - RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); - main.bindWrite(true); } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - - if (font.width(component) == 0) { + Font font = Minecraft.getInstance().font; + int width = font.width(component); + if (width == 0) { return; } - int width = font.drawInBatch(component, 0, y, color, shadow, new Matrix4f(), renderBuffers.bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880); - RenderSystem.disableDepthTest(); - renderBuffers.bufferSource().endBatch(); - RenderSystem.enableDepthTest(); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - RenderSystem.setShaderTexture(0, target.getColorTextureId()); - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); - - RenderSystem.depthMask(false); - RenderSystem.enableBlend(); - RenderSystem.depthFunc(GL30.GL_ALWAYS); - - float w = (width / 2); - float h = (height / 2); - - Matrix4f matrix = new Matrix4f().translation(x + w, y + h, 0); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - float z = 0; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); - bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX); - bufferBuilder.vertex(matrix, x0, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u0, v1).endVertex(); - bufferBuilder.vertex(matrix, x1, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v1).endVertex(); - bufferBuilder.vertex(matrix, x1, y0, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v0).endVertex(); - bufferBuilder.vertex(matrix, x0, y0, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u0, v0).endVertex(); - - BufferUploader.drawWithShader(bufferBuilder.end()); - - RenderSystem.disableBlend(); - RenderSystem.depthMask(true); - - target.unbindRead(); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, (int) (texWidth * percent), texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - int texOffset = (int) (maxOffset * percent); - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); - } - - /** - * 正向百分比显示（从左开始显示，右边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示前面40%的内容 - */ - public void drawByForwardPercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移为0（靠左显示） - int screenOffset = 0; - - // 贴图偏移为0（从左边开始） - int texOffset = 0; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); - } - - /** - * 反向百分比显示（从右开始显示，左边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示后面40%的内容 - */ - public void drawByReversePercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移（靠右显示） - int screenOffset = maxWidth - renderWidth; - - // 贴图偏移（显示后面部分） - int texOffset = texWidth - contentWidth; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -306,19 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } - - target.unbindRead(); + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } -} +} \ No newline at end of file diff --git a/client/fabric_1_20_1/src/main/resources/fabric.mod.json b/client/fabric_1_20_1/src/main/resources/fabric.mod.json index c2c860cb..33e4cc0f 100644 --- a/client/fabric_1_20_1/src/main/resources/fabric.mod.json +++ b/client/fabric_1_20_1/src/main/resources/fabric.mod.json @@ -23,10 +23,9 @@ "allmusic_client.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.19.3", "fabric-api": "*", - "minecraft": ">=1.20.1", - "java": ">=17" + "minecraft": ">=1.20.1" }, "suggests": { } diff --git a/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index cbc61ef6..8e87d66d 100644 --- a/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/fabric_1_21/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -27,7 +27,7 @@ public class AllMusicClient implements ClientModInitializer, AllMusicBridge { public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("allmusic", "channel"); public static final Logger LOGGER = LogManager.getLogger("AllMusic Client"); - private static GuiGraphics context; + public static GuiGraphics context; public static void update(GuiGraphics draw) { context = draw; @@ -50,12 +50,6 @@ public class AllMusicClient implements ClientModInitializer, AllMusicBridge { return Minecraft.getInstance().font.lineHeight; } - public void drawText(String item, int x, int y, int color, boolean shadow) { - var hud = Minecraft.getInstance().font; - Component component = MiniMessage.parse(item); - context.drawString(hud, component, x, y, color, shadow); - } - public void sendMessage(String data) { data = "[AllMusic Client]" + data; LOGGER.warn(data); @@ -79,7 +73,7 @@ public class AllMusicClient implements ClientModInitializer, AllMusicBridge { @Override public TextFrameBuffer makeTextRender(String name) { - return new CoreRenderTarget(); + return new CoreRenderTarget(name); } @Override 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 fa6eec91..450f1f7b 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 @@ -4,213 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.RenderBuffers; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; -import org.joml.Matrix4f; -import org.lwjgl.opengl.GL30; + +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private static final RenderBuffers renderBuffers = new RenderBuffers(Runtime.getRuntime().availableProcessors()); + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final RenderTarget target; - private Matrix4f matrix4f; + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } - public CoreRenderTarget() { - target = new TextureTarget(800, 200, false, false); - target.setClearColor(0.0f, 0.0f, 0.0f, 0.0f); + private final List entries = new ArrayList<>(); + + private final boolean isState; + + public CoreRenderTarget(String name) { + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = (int) (width * window.getGuiScale()); - nowHeight = (int) (height * window.getGuiScale()); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight, false); - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } else if (matrix4f == null) { - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - target.clear(false); - target.bindWrite(true); - - RenderSystem.backupProjectionMatrix(); - if (matrix4f != null) { - RenderSystem.setProjectionMatrix(matrix4f, VertexSorting.ORTHOGRAPHIC_Z); - } + entries.clear(); } @Override public void unUse() { isDraw = false; - - RenderSystem.restoreProjectionMatrix(); - - RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); - main.bindWrite(true); } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - - if (font.width(component) == 0) { + Font font = Minecraft.getInstance().font; + int width = font.width(component); + if (width == 0) { return; } - int width = font.drawInBatch(component, 0, y, color, shadow, new Matrix4f(), renderBuffers.bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880); - RenderSystem.disableDepthTest(); - renderBuffers.bufferSource().endBatch(); - RenderSystem.enableDepthTest(); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - RenderSystem.setShaderTexture(0, target.getColorTextureId()); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - - RenderSystem.depthMask(false); - RenderSystem.enableBlend(); - RenderSystem.depthFunc(GL30.GL_ALWAYS); - - float w = (width / 2); - float h = (height / 2); - - Matrix4f matrix = new Matrix4f().translation(x + w, y + h, 0); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - float z = 0; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - BufferBuilder bufferBuilder = Tesselator.getInstance().begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - bufferBuilder.addVertex(matrix, x0, y1, z).setUv(u0, v1).setColor(1.0f, 1.0f, 1.0f, alpha); - bufferBuilder.addVertex(matrix, x1, y1, z).setUv(u1, v1).setColor(1.0f, 1.0f, 1.0f, alpha); - bufferBuilder.addVertex(matrix, x1, y0, z).setUv(u1, v0).setColor(1.0f, 1.0f, 1.0f, alpha); - bufferBuilder.addVertex(matrix, x0, y0, z).setUv(u0, v0).setColor(1.0f, 1.0f, 1.0f, alpha); - - BufferUploader.drawWithShader(bufferBuilder.buildOrThrow()); - - RenderSystem.disableBlend(); - RenderSystem.depthMask(true); - - target.unbindRead(); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -218,19 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } - - target.unbindRead(); + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } -} +} \ No newline at end of file diff --git a/client/fabric_1_21/src/main/resources/fabric.mod.json b/client/fabric_1_21/src/main/resources/fabric.mod.json index 13ca553c..ba8bcbd4 100644 --- a/client/fabric_1_21/src/main/resources/fabric.mod.json +++ b/client/fabric_1_21/src/main/resources/fabric.mod.json @@ -26,9 +26,8 @@ "allmusic_client.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.19.3", "minecraft": ">=1.21", - "java": ">=21", "fabric-api": "*" }, "suggests": { 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 700736fd..450f1f7b 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 @@ -4,218 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.FilterMode; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.font.TextRenderable; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.gui.render.state.GlyphRenderState; -import net.minecraft.client.gui.render.state.GuiElementRenderState; -import net.minecraft.client.gui.render.state.GuiRenderState; -import net.minecraft.client.renderer.CachedOrthoProjectionMatrixBuffer; -import net.minecraft.client.renderer.MappableRingBuffer; -import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.client.renderer.fog.FogRenderer; import net.minecraft.network.chat.Component; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; -import org.jspecify.annotations.Nullable; -import org.lwjgl.system.MemoryUtil; -import java.nio.ByteBuffer; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final FogRenderer fogRenderer = new FogRenderer(); - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), 0); + entries.clear(); } @Override public void unUse() { - renderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE), this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - var minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - int i = (int) minecraft.mouseHandler.getScaledXPos(window); - int j = (int) minecraft.mouseHandler.getScaledYPos(window); - - GuiGraphics graphics = new GuiGraphics(Minecraft.getInstance(), renderState, i, j); - color = color | 0xFF000000; - graphics.drawString(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.guiRenderState.submitGuiElement(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView(), RenderSystem.getSamplerCache().getRepeat(FilterMode.NEAREST)), matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.scissorStack.peek())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -223,280 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst( - Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom) - .thenComparing(ScreenRectangle::left) - .thenComparing(ScreenRectangle::right) - ); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)) - .thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final List meshesToDraw = new ArrayList<>(); - private final ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(786432); - private final Map vertexBuffers = new Object2ObjectOpenHashMap<>(); - private final CachedOrthoProjectionMatrixBuffer guiProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("gui", 1000.0F, 11000.0F, true); - private final CachedOrthoProjectionMatrixBuffer itemsProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("items", -1000.0F, 1000.0F, true); - private @Nullable ScreenRectangle previousScissorArea = null; - private @Nullable RenderPipeline previousPipeline = null; - private @Nullable TextureSetup previousTextureSetup = null; - private @Nullable BufferBuilder bufferBuilder = null; - - public GuiRenderer(GuiRenderState state) { - this.renderState = state; - } - - public void render(GpuBufferSlice bufferSlice, CoreRenderTarget target) { - this.renderState.forEachText(state -> { - var matrix3x2fc = state.pose; - var screenrectangle = state.scissor; - state.ensurePrepared().visit(new Font.GlyphVisitor() { - @Override - public void acceptGlyph(TextRenderable.Styled styled) { - this.accept(styled); - } - - @Override - public void acceptEffect(TextRenderable textRenderable) { - this.accept(textRenderable); - } - - private void accept(TextRenderable textRenderable) { - renderState.submitGlyphToCurrentLayer(new GlyphRenderState(matrix3x2fc, textRenderable, screenrectangle)); - } - }); - }); - this.renderState.sortElements(ELEMENT_SORT_COMPARATOR); - - this.previousScissorArea = null; - this.previousPipeline = null; - this.previousTextureSetup = null; - this.bufferBuilder = null; - this.renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - - var map = new Object2IntOpenHashMap(); - - for (var draw : this.meshesToDraw) { - var state = draw.mesh.drawState(); - var vertexformat = state.format(); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - map.put(vertexformat, map.getInt(vertexformat) + state.vertexCount() * vertexformat.getVertexSize()); - } - - for (var entry : map.object2IntEntrySet()) { - var vertexformat = entry.getKey(); - int i = entry.getIntValue(); - var mappableringbuffer = this.vertexBuffers.get(vertexformat); - if (mappableringbuffer == null || mappableringbuffer.size() < i) { - if (mappableringbuffer != null) { - mappableringbuffer.close(); - } - - this.vertexBuffers.put(vertexformat, new MappableRingBuffer(() -> "GUI vertex buffer for " + vertexformat, 34, i)); - } - } - - var commandencoder = RenderSystem.getDevice().createCommandEncoder(); - map = new Object2IntOpenHashMap<>(); - - for (MeshToDraw draw : this.meshesToDraw) { - var meshdata = draw.mesh; - var state = meshdata.drawState(); - var vertexformat = state.format(); - var mappableringbuffer = this.vertexBuffers.get(vertexformat); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - ByteBuffer bytebuffer = meshdata.vertexBuffer(); - int i = bytebuffer.remaining(); - int j = map.getInt(vertexformat); - - try (GpuBuffer.MappedView view = commandencoder.mapBuffer(mappableringbuffer.currentBuffer().slice(j, i), false, true)) { - MemoryUtil.memCopy(bytebuffer, view.data()); - } - - map.put(vertexformat, j + i); - this.draws.add(new Draw(mappableringbuffer.currentBuffer(), j / vertexformat.getVertexSize(), state.mode(), - state.indexCount(), draw.pipeline, draw.textureSetup, draw.scissorArea)); - draw.close(); - } - - this.draw(bufferSlice, target); - - for (var mappableringbuffer : this.vertexBuffers.values()) { - mappableringbuffer.rotate(); - } - - this.draws.clear(); - this.meshesToDraw.clear(); - this.renderState.reset(); - if (SharedConstants.DEBUG_SHUFFLE_UI_RENDERING_ORDER) { - RenderPipeline.updateSortKeySeed(); - TextureSetup.updateSortKeySeed(); - } - } - - private void draw(GpuBufferSlice bufferSlice, CoreRenderTarget target) { - if (!this.draws.isEmpty()) { - var minecraft = Minecraft.getInstance(); - var window = minecraft.getWindow(); - RenderSystem.setProjectionMatrix( - this.guiProjectionMatrixBuffer.getBuffer((float) target.target.width / window.getGuiScale(), (float) target.target.height / window.getGuiScale()), - ProjectionType.ORTHOGRAPHIC - ); - var rendertarget = target.target; - int i = 0; - - for (var item : this.draws) { - if (item.indexCount > i) { - i = item.indexCount; - } - } - - var buffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); - var gpubuffer = buffer.getBuffer(i); - var indexType = buffer.type(); - var gpubufferslice = RenderSystem.getDynamicUniforms() - .writeTransform(new Matrix4f().setTranslation(0.0F, 0.0F, -11000.0F), new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f()); - if (!this.meshesToDraw.isEmpty()) { - this.executeDrawRange(() -> "GUI before blur", rendertarget, bufferSlice, gpubufferslice, gpubuffer, - indexType, Math.min(this.meshesToDraw.size(), this.draws.size())); - } - } - } - - private void executeDrawRange(Supplier name, RenderTarget target, GpuBufferSlice bufferSlice, GpuBufferSlice bufferSlice1, - GpuBuffer buffer, VertexFormat.IndexType indexType, int count) { - try (var renderpass = RenderSystem.getDevice() - .createCommandEncoder() - .createRenderPass(name, target.getColorTextureView(), OptionalInt.empty(), - target.useDepth ? target.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderpass); - renderpass.setUniform("Fog", bufferSlice); - renderpass.setUniform("DynamicTransforms", bufferSlice1); - - for (int i = 0; i < count; i++) { - Draw draw = this.draws.get(i); - this.executeDraw(draw, renderpass, buffer, indexType); - } - } - } - - private void addElementToMesh(GuiElementRenderState state) { - var pipeline = state.pipeline(); - var texturesetup = state.textureSetup(); - var screenrectangle = state.scissorArea(); - if (pipeline != this.previousPipeline - || this.scissorChanged(screenrectangle, this.previousScissorArea) - || !texturesetup.equals(this.previousTextureSetup)) { - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - - this.bufferBuilder = new BufferBuilder(this.byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); - this.previousPipeline = pipeline; - this.previousTextureSetup = texturesetup; - this.previousScissorArea = screenrectangle; - } - - state.buildVertices(this.bufferBuilder); - } - - private void recordMesh(BufferBuilder builder, RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle rectangle) { - var meshdata = builder.build(); - if (meshdata != null) { - this.meshesToDraw.add(new MeshToDraw(meshdata, pipeline, textureSetup, rectangle)); - } - } - - private void executeDraw(Draw draw, RenderPass pass, GpuBuffer buffer, VertexFormat.IndexType index) { - var renderpipeline = draw.pipeline(); - pass.setPipeline(renderpipeline); - pass.setVertexBuffer(0, draw.vertexBuffer); - var screenrectangle = draw.scissorArea(); - if (screenrectangle != null) { - Window window = Minecraft.getInstance().getWindow(); - int i = window.getHeight(); - int j = window.getGuiScale(); - double d0 = screenrectangle.left() * j; - double d1 = i - screenrectangle.bottom() * j; - double d2 = screenrectangle.width() * j; - double d3 = screenrectangle.height() * j; - pass.enableScissor((int) d0, (int) d1, Math.max(0, (int) d2), Math.max(0, (int) d3)); - } else { - pass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - pass.bindTexture("Sampler0", draw.textureSetup.texure0(), draw.textureSetup.sampler0()); - } - - if (draw.textureSetup.texure1() != null) { - pass.bindTexture("Sampler1", draw.textureSetup.texure1(), draw.textureSetup.sampler1()); - } - - if (draw.textureSetup.texure2() != null) { - pass.bindTexture("Sampler2", draw.textureSetup.texure2(), draw.textureSetup.sampler2()); - } - - pass.setIndexBuffer(buffer, index); - pass.drawIndexed(draw.baseVertex, 0, draw.indexCount, 1); - } - - private boolean scissorChanged(@Nullable ScreenRectangle rectangle, @Nullable ScreenRectangle rectangle1) { - if (rectangle == rectangle1) { - return false; - } else { - return rectangle != null ? !rectangle.equals(rectangle1) : true; - } - } - - @Override - public void close() { - this.byteBufferBuilder.close(); - this.guiProjectionMatrixBuffer.close(); - this.itemsProjectionMatrixBuffer.close(); - - for (MappableRingBuffer mappableringbuffer : this.vertexBuffers.values()) { - mappableringbuffer.close(); - } - } - - record Draw(GpuBuffer vertexBuffer, int baseVertex, VertexFormat.Mode mode, int indexCount, - RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle scissorArea) { - } - - record MeshToDraw(MeshData mesh, RenderPipeline pipeline, TextureSetup textureSetup, - @Nullable ScreenRectangle scissorArea) implements AutoCloseable { - @Override - public void close() { - this.mesh.close(); - } - } - } -} +} \ No newline at end of file diff --git a/client/fabric_1_21_11/src/main/resources/fabric.mod.json b/client/fabric_1_21_11/src/main/resources/fabric.mod.json index 50201477..1766ba56 100644 --- a/client/fabric_1_21_11/src/main/resources/fabric.mod.json +++ b/client/fabric_1_21_11/src/main/resources/fabric.mod.json @@ -29,9 +29,8 @@ } ], "depends": { - "fabricloader": ">=0.18.4", + "fabricloader": ">=0.19.3", "minecraft": ">=1.21.11", - "java": ">=21", "fabric-api": "*" }, "suggests": { diff --git a/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 02b4db80..450f1f7b 100644 --- a/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -170,7 +170,9 @@ public class CoreRenderTarget extends TextFrameBuffer { } private static int applyAlpha(int color, float alpha) { - int a = Math.clamp((int) (alpha * 255), 0, 255); + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; return (color & 0x00FFFFFF) | (a << 24); } } \ No newline at end of file diff --git a/client/fabric_1_21_3/src/main/resources/fabric.mod.json b/client/fabric_1_21_3/src/main/resources/fabric.mod.json index e773d87b..693c18e3 100644 --- a/client/fabric_1_21_3/src/main/resources/fabric.mod.json +++ b/client/fabric_1_21_3/src/main/resources/fabric.mod.json @@ -28,7 +28,6 @@ "depends": { "fabricloader": ">=0.19.3", "minecraft": ">=1.21.3", - "java": ">=21", "fabric-api": "*" }, "suggests": { diff --git a/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 43cbccde..450f1f7b 100644 --- a/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -63,7 +63,6 @@ public class CoreRenderTarget extends TextFrameBuffer { Component component = MiniMessage.parse(text); Font font = Minecraft.getInstance().font; int width = font.width(component); - if (width == 0) { return; } @@ -171,7 +170,9 @@ public class CoreRenderTarget extends TextFrameBuffer { } private static int applyAlpha(int color, float alpha) { - int a = Math.clamp((int) (alpha * 255), 0, 255); + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; return (color & 0x00FFFFFF) | (a << 24); } } \ No newline at end of file diff --git a/client/fabric_1_21_4/src/main/resources/fabric.mod.json b/client/fabric_1_21_4/src/main/resources/fabric.mod.json index cc59c6bb..0ff73eeb 100644 --- a/client/fabric_1_21_4/src/main/resources/fabric.mod.json +++ b/client/fabric_1_21_4/src/main/resources/fabric.mod.json @@ -28,7 +28,6 @@ "depends": { "fabricloader": ">=0.19.3", "minecraft": ">=1.21.4", - "java": ">=21", "fabric-api": "*" }, "suggests": { 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 df88968d..450f1f7b 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 @@ -4,212 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.font.glyphs.BakedGlyph; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.gui.render.state.GlyphEffectRenderState; -import net.minecraft.client.gui.render.state.GlyphRenderState; -import net.minecraft.client.gui.render.state.GuiElementRenderState; -import net.minecraft.client.gui.render.state.GuiRenderState; -import net.minecraft.client.renderer.CachedOrthoProjectionMatrixBuffer; -import net.minecraft.client.renderer.MappableRingBuffer; -import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.client.renderer.fog.FogRenderer; import net.minecraft.network.chat.Component; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; -import org.lwjgl.system.MemoryUtil; -import java.nio.ByteBuffer; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final FogRenderer fogRenderer = new FogRenderer(); - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), 0); + entries.clear(); } @Override public void unUse() { - renderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE), this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - GuiGraphics graphics = new GuiGraphics(Minecraft.getInstance(), renderState); - color = color | 0xFF000000; - graphics.drawString(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.guiRenderState.submitGuiElement(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView()), matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.scissorStack.peek())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -217,274 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst( - Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom) - .thenComparing(ScreenRectangle::left) - .thenComparing(ScreenRectangle::right) - ); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)) - .thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - private final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final List meshesToDraw = new ArrayList<>(); - private final ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(786432); - private final Map vertexBuffers = new Object2ObjectOpenHashMap<>(); - private final CachedOrthoProjectionMatrixBuffer guiProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("gui", 1000.0F, 11000.0F, true); - private ScreenRectangle previousScissorArea; - private RenderPipeline previousPipeline; - private TextureSetup previousTextureSetup; - private BufferBuilder bufferBuilder; - - public GuiRenderer(GuiRenderState state) { - renderState = state; - } - - public void render(GpuBufferSlice gpu, CoreRenderTarget target) { - renderState.forEachText(state -> { - var matrix3x2f = state.pose; - var screenrectangle = state.scissor; - state.ensurePrepared().visit(new Font.GlyphVisitor() { - @Override - public void acceptGlyph(BakedGlyph.GlyphInstance glyph) { - if (glyph.glyph().textureView() != null) { - renderState.submitGlyphToCurrentLayer(new GlyphRenderState(matrix3x2f, glyph, screenrectangle)); - } - } - - @Override - public void acceptEffect(BakedGlyph glyph, BakedGlyph.Effect effect) { - if (glyph.textureView() != null) { - renderState.submitGlyphToCurrentLayer(new GlyphEffectRenderState(matrix3x2f, glyph, effect, screenrectangle)); - } - } - }); - }); - - renderState.sortElements(ELEMENT_SORT_COMPARATOR); - - previousScissorArea = null; - previousPipeline = null; - previousTextureSetup = null; - bufferBuilder = null; - renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - if (bufferBuilder != null) { - recordMesh(bufferBuilder, previousPipeline, previousTextureSetup, previousScissorArea); - } - - recordDraws(); - - if (!draws.isEmpty()) { - Minecraft minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - RenderSystem.setProjectionMatrix( - guiProjectionMatrixBuffer.getBuffer((float) target.target.width / window.getGuiScale(), - (float) target.target.height / window.getGuiScale()), - ProjectionType.ORTHOGRAPHIC - ); - var rendertarget = target.target; - int i = 0; - - for (Draw guirenderer$draw : draws) { - if (guirenderer$draw.indexCount > i) { - i = guirenderer$draw.indexCount; - } - } - - var buffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); - var gpubuffer = buffer.getBuffer(i); - var index = buffer.type(); - var gpubufferslice = RenderSystem.getDynamicUniforms().writeTransform(new Matrix4f().setTranslation(0.0F, 0.0F, -11000.0F), - new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f(), 0.0F); - if (!meshesToDraw.isEmpty()) { - executeDrawRange(() -> "before blur", rendertarget, gpu, gpubufferslice, gpubuffer, - index, Math.min(meshesToDraw.size(), draws.size()), target); - } - } - - for (MappableRingBuffer mappableringbuffer : vertexBuffers.values()) { - mappableringbuffer.rotate(); - } - - draws.clear(); - meshesToDraw.clear(); - renderState.reset(); - } - - private void executeDrawRange(Supplier name, RenderTarget target, GpuBufferSlice buffer1, GpuBufferSlice buffer2, - GpuBuffer buffer3, VertexFormat.IndexType index, int count, CoreRenderTarget target1) { - try (RenderPass renderpass = RenderSystem.getDevice() - .createCommandEncoder() - .createRenderPass(name, target.getColorTextureView(), OptionalInt.empty(), - target.useDepth ? target.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderpass); - renderpass.setUniform("Fog", buffer1); - renderpass.setUniform("DynamicTransforms", buffer2); - - for (int i = 0; i < count; i++) { - var item = draws.get(i); - executeDraw(item, renderpass, target1, buffer3, index); - } - } - } - - private void addElementToMesh(GuiElementRenderState state, int range) { - var pipeline = state.pipeline(); - var setup = state.textureSetup(); - var screen = state.scissorArea(); - if (pipeline != previousPipeline || scissorChanged(screen, previousScissorArea) || !setup.equals(previousTextureSetup)) { - if (bufferBuilder != null) { - recordMesh(bufferBuilder, previousPipeline, previousTextureSetup, previousScissorArea); - } - - bufferBuilder = new BufferBuilder(byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); - previousPipeline = pipeline; - previousTextureSetup = setup; - previousScissorArea = screen; - } - - state.buildVertices(bufferBuilder, 0.0F + range * 0.01F); - } - - private void recordMesh(BufferBuilder builder, RenderPipeline pipeline, TextureSetup texture, ScreenRectangle rectangle) { - var meshdata = builder.buildOrThrow(); - meshesToDraw.add(new MeshToDraw(meshdata, pipeline, texture, rectangle)); - } - - private void recordDraws() { - var map = new Object2IntOpenHashMap(); - - for (MeshToDraw item : meshesToDraw) { - var state = item.mesh.drawState(); - var vertexformat = state.format(); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - map.put(vertexformat, map.getInt(vertexformat) + state.vertexCount() * vertexformat.getVertexSize()); - } - - for (var entry : map.object2IntEntrySet()) { - var vertexformat = entry.getKey(); - int i = entry.getIntValue(); - var buffer = vertexBuffers.get(vertexformat); - if (buffer == null || buffer.size() < i) { - if (buffer != null) { - buffer.close(); - } - - vertexBuffers.put(vertexformat, new MappableRingBuffer(() -> "vertex buffer for " + vertexformat, 34, i)); - } - } - - var commandencoder = RenderSystem.getDevice().createCommandEncoder(); - map = new Object2IntOpenHashMap<>(); - - for (MeshToDraw item : meshesToDraw) { - var meshdata = item.mesh; - var state = meshdata.drawState(); - var vertexformat = state.format(); - var mappableringbuffer = vertexBuffers.get(vertexformat); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - ByteBuffer bytebuffer = meshdata.vertexBuffer(); - int i = bytebuffer.remaining(); - int j = map.getInt(vertexformat); - - try (var item1 = commandencoder.mapBuffer(mappableringbuffer.currentBuffer().slice(j, i), false, true)) { - MemoryUtil.memCopy(bytebuffer, item1.data()); - } - - map.put(vertexformat, j + i); - draws.add(new Draw(mappableringbuffer.currentBuffer(), j / vertexformat.getVertexSize(), state.mode(), - state.indexCount(), item.pipeline, item.textureSetup, item.scissorArea)); - item.close(); - } - } - - private void executeDraw(Draw draw, RenderPass pass, CoreRenderTarget target, GpuBuffer buffer, VertexFormat.IndexType index) { - var renderpipeline = draw.pipeline(); - pass.setPipeline(renderpipeline); - pass.setVertexBuffer(0, draw.vertexBuffer); - var area = draw.scissorArea(); - if (area != null) { - Window window = Minecraft.getInstance().getWindow(); - - int i = target.target.height; - int j = window.getGuiScale(); - double d0 = area.left() * j; - double d1 = i - area.bottom() * j; - double d2 = area.width() * j; - double d3 = area.height() * j; - pass.enableScissor((int) d0, (int) d1, Math.max(0, (int) d2), Math.max(0, (int) d3)); - } else { - pass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - pass.bindSampler("Sampler0", draw.textureSetup.texure0()); - } - - if (draw.textureSetup.texure1() != null) { - pass.bindSampler("Sampler1", draw.textureSetup.texure1()); - } - - if (draw.textureSetup.texure2() != null) { - pass.bindSampler("Sampler2", draw.textureSetup.texure2()); - } - - pass.setIndexBuffer(buffer, index); - pass.drawIndexed(draw.baseVertex, 0, draw.indexCount, 1); - } - - private boolean scissorChanged(ScreenRectangle screen1, ScreenRectangle screen2) { - if (screen1 == screen2) { - return false; - } else { - return screen1 == null || !screen1.equals(screen2); - } - } - - @Override - public void close() { - byteBufferBuilder.close(); - - guiProjectionMatrixBuffer.close(); - - for (MappableRingBuffer mappableringbuffer : vertexBuffers.values()) { - mappableringbuffer.close(); - } - } - - record Draw(GpuBuffer vertexBuffer, int baseVertex, VertexFormat.Mode mode, int indexCount, - RenderPipeline pipeline, TextureSetup textureSetup, ScreenRectangle scissorArea) { - } - - record MeshToDraw(MeshData mesh, RenderPipeline pipeline, TextureSetup textureSetup, - ScreenRectangle scissorArea) implements AutoCloseable { - @Override - public void close() { - mesh.close(); - } - } - } -} +} \ No newline at end of file diff --git a/client/fabric_1_21_6/src/main/resources/fabric.mod.json b/client/fabric_1_21_6/src/main/resources/fabric.mod.json index a6a09df2..c4651986 100644 --- a/client/fabric_1_21_6/src/main/resources/fabric.mod.json +++ b/client/fabric_1_21_6/src/main/resources/fabric.mod.json @@ -29,9 +29,8 @@ } ], "depends": { - "fabricloader": ">=0.16.14", + "fabricloader": ">=0.19.3", "minecraft": ">=1.21.6", - "java": ">=21", "fabric-api": "*" }, "suggests": { diff --git a/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index df88968d..450f1f7b 100644 --- a/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/fabric_1_21_8/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -4,212 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.font.glyphs.BakedGlyph; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.gui.render.state.GlyphEffectRenderState; -import net.minecraft.client.gui.render.state.GlyphRenderState; -import net.minecraft.client.gui.render.state.GuiElementRenderState; -import net.minecraft.client.gui.render.state.GuiRenderState; -import net.minecraft.client.renderer.CachedOrthoProjectionMatrixBuffer; -import net.minecraft.client.renderer.MappableRingBuffer; -import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.client.renderer.fog.FogRenderer; import net.minecraft.network.chat.Component; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; -import org.lwjgl.system.MemoryUtil; -import java.nio.ByteBuffer; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final FogRenderer fogRenderer = new FogRenderer(); - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), 0); + entries.clear(); } @Override public void unUse() { - renderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE), this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - GuiGraphics graphics = new GuiGraphics(Minecraft.getInstance(), renderState); - color = color | 0xFF000000; - graphics.drawString(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.guiRenderState.submitGuiElement(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView()), matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.scissorStack.peek())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -217,274 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst( - Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom) - .thenComparing(ScreenRectangle::left) - .thenComparing(ScreenRectangle::right) - ); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)) - .thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - private final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final List meshesToDraw = new ArrayList<>(); - private final ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(786432); - private final Map vertexBuffers = new Object2ObjectOpenHashMap<>(); - private final CachedOrthoProjectionMatrixBuffer guiProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("gui", 1000.0F, 11000.0F, true); - private ScreenRectangle previousScissorArea; - private RenderPipeline previousPipeline; - private TextureSetup previousTextureSetup; - private BufferBuilder bufferBuilder; - - public GuiRenderer(GuiRenderState state) { - renderState = state; - } - - public void render(GpuBufferSlice gpu, CoreRenderTarget target) { - renderState.forEachText(state -> { - var matrix3x2f = state.pose; - var screenrectangle = state.scissor; - state.ensurePrepared().visit(new Font.GlyphVisitor() { - @Override - public void acceptGlyph(BakedGlyph.GlyphInstance glyph) { - if (glyph.glyph().textureView() != null) { - renderState.submitGlyphToCurrentLayer(new GlyphRenderState(matrix3x2f, glyph, screenrectangle)); - } - } - - @Override - public void acceptEffect(BakedGlyph glyph, BakedGlyph.Effect effect) { - if (glyph.textureView() != null) { - renderState.submitGlyphToCurrentLayer(new GlyphEffectRenderState(matrix3x2f, glyph, effect, screenrectangle)); - } - } - }); - }); - - renderState.sortElements(ELEMENT_SORT_COMPARATOR); - - previousScissorArea = null; - previousPipeline = null; - previousTextureSetup = null; - bufferBuilder = null; - renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - if (bufferBuilder != null) { - recordMesh(bufferBuilder, previousPipeline, previousTextureSetup, previousScissorArea); - } - - recordDraws(); - - if (!draws.isEmpty()) { - Minecraft minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - RenderSystem.setProjectionMatrix( - guiProjectionMatrixBuffer.getBuffer((float) target.target.width / window.getGuiScale(), - (float) target.target.height / window.getGuiScale()), - ProjectionType.ORTHOGRAPHIC - ); - var rendertarget = target.target; - int i = 0; - - for (Draw guirenderer$draw : draws) { - if (guirenderer$draw.indexCount > i) { - i = guirenderer$draw.indexCount; - } - } - - var buffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); - var gpubuffer = buffer.getBuffer(i); - var index = buffer.type(); - var gpubufferslice = RenderSystem.getDynamicUniforms().writeTransform(new Matrix4f().setTranslation(0.0F, 0.0F, -11000.0F), - new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f(), 0.0F); - if (!meshesToDraw.isEmpty()) { - executeDrawRange(() -> "before blur", rendertarget, gpu, gpubufferslice, gpubuffer, - index, Math.min(meshesToDraw.size(), draws.size()), target); - } - } - - for (MappableRingBuffer mappableringbuffer : vertexBuffers.values()) { - mappableringbuffer.rotate(); - } - - draws.clear(); - meshesToDraw.clear(); - renderState.reset(); - } - - private void executeDrawRange(Supplier name, RenderTarget target, GpuBufferSlice buffer1, GpuBufferSlice buffer2, - GpuBuffer buffer3, VertexFormat.IndexType index, int count, CoreRenderTarget target1) { - try (RenderPass renderpass = RenderSystem.getDevice() - .createCommandEncoder() - .createRenderPass(name, target.getColorTextureView(), OptionalInt.empty(), - target.useDepth ? target.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderpass); - renderpass.setUniform("Fog", buffer1); - renderpass.setUniform("DynamicTransforms", buffer2); - - for (int i = 0; i < count; i++) { - var item = draws.get(i); - executeDraw(item, renderpass, target1, buffer3, index); - } - } - } - - private void addElementToMesh(GuiElementRenderState state, int range) { - var pipeline = state.pipeline(); - var setup = state.textureSetup(); - var screen = state.scissorArea(); - if (pipeline != previousPipeline || scissorChanged(screen, previousScissorArea) || !setup.equals(previousTextureSetup)) { - if (bufferBuilder != null) { - recordMesh(bufferBuilder, previousPipeline, previousTextureSetup, previousScissorArea); - } - - bufferBuilder = new BufferBuilder(byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); - previousPipeline = pipeline; - previousTextureSetup = setup; - previousScissorArea = screen; - } - - state.buildVertices(bufferBuilder, 0.0F + range * 0.01F); - } - - private void recordMesh(BufferBuilder builder, RenderPipeline pipeline, TextureSetup texture, ScreenRectangle rectangle) { - var meshdata = builder.buildOrThrow(); - meshesToDraw.add(new MeshToDraw(meshdata, pipeline, texture, rectangle)); - } - - private void recordDraws() { - var map = new Object2IntOpenHashMap(); - - for (MeshToDraw item : meshesToDraw) { - var state = item.mesh.drawState(); - var vertexformat = state.format(); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - map.put(vertexformat, map.getInt(vertexformat) + state.vertexCount() * vertexformat.getVertexSize()); - } - - for (var entry : map.object2IntEntrySet()) { - var vertexformat = entry.getKey(); - int i = entry.getIntValue(); - var buffer = vertexBuffers.get(vertexformat); - if (buffer == null || buffer.size() < i) { - if (buffer != null) { - buffer.close(); - } - - vertexBuffers.put(vertexformat, new MappableRingBuffer(() -> "vertex buffer for " + vertexformat, 34, i)); - } - } - - var commandencoder = RenderSystem.getDevice().createCommandEncoder(); - map = new Object2IntOpenHashMap<>(); - - for (MeshToDraw item : meshesToDraw) { - var meshdata = item.mesh; - var state = meshdata.drawState(); - var vertexformat = state.format(); - var mappableringbuffer = vertexBuffers.get(vertexformat); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - ByteBuffer bytebuffer = meshdata.vertexBuffer(); - int i = bytebuffer.remaining(); - int j = map.getInt(vertexformat); - - try (var item1 = commandencoder.mapBuffer(mappableringbuffer.currentBuffer().slice(j, i), false, true)) { - MemoryUtil.memCopy(bytebuffer, item1.data()); - } - - map.put(vertexformat, j + i); - draws.add(new Draw(mappableringbuffer.currentBuffer(), j / vertexformat.getVertexSize(), state.mode(), - state.indexCount(), item.pipeline, item.textureSetup, item.scissorArea)); - item.close(); - } - } - - private void executeDraw(Draw draw, RenderPass pass, CoreRenderTarget target, GpuBuffer buffer, VertexFormat.IndexType index) { - var renderpipeline = draw.pipeline(); - pass.setPipeline(renderpipeline); - pass.setVertexBuffer(0, draw.vertexBuffer); - var area = draw.scissorArea(); - if (area != null) { - Window window = Minecraft.getInstance().getWindow(); - - int i = target.target.height; - int j = window.getGuiScale(); - double d0 = area.left() * j; - double d1 = i - area.bottom() * j; - double d2 = area.width() * j; - double d3 = area.height() * j; - pass.enableScissor((int) d0, (int) d1, Math.max(0, (int) d2), Math.max(0, (int) d3)); - } else { - pass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - pass.bindSampler("Sampler0", draw.textureSetup.texure0()); - } - - if (draw.textureSetup.texure1() != null) { - pass.bindSampler("Sampler1", draw.textureSetup.texure1()); - } - - if (draw.textureSetup.texure2() != null) { - pass.bindSampler("Sampler2", draw.textureSetup.texure2()); - } - - pass.setIndexBuffer(buffer, index); - pass.drawIndexed(draw.baseVertex, 0, draw.indexCount, 1); - } - - private boolean scissorChanged(ScreenRectangle screen1, ScreenRectangle screen2) { - if (screen1 == screen2) { - return false; - } else { - return screen1 == null || !screen1.equals(screen2); - } - } - - @Override - public void close() { - byteBufferBuilder.close(); - - guiProjectionMatrixBuffer.close(); - - for (MappableRingBuffer mappableringbuffer : vertexBuffers.values()) { - mappableringbuffer.close(); - } - } - - record Draw(GpuBuffer vertexBuffer, int baseVertex, VertexFormat.Mode mode, int indexCount, - RenderPipeline pipeline, TextureSetup textureSetup, ScreenRectangle scissorArea) { - } - - record MeshToDraw(MeshData mesh, RenderPipeline pipeline, TextureSetup textureSetup, - ScreenRectangle scissorArea) implements AutoCloseable { - @Override - public void close() { - mesh.close(); - } - } - } -} +} \ No newline at end of file diff --git a/client/fabric_1_21_8/src/main/resources/fabric.mod.json b/client/fabric_1_21_8/src/main/resources/fabric.mod.json index a6a09df2..c4651986 100644 --- a/client/fabric_1_21_8/src/main/resources/fabric.mod.json +++ b/client/fabric_1_21_8/src/main/resources/fabric.mod.json @@ -29,9 +29,8 @@ } ], "depends": { - "fabricloader": ">=0.16.14", + "fabricloader": ">=0.19.3", "minecraft": ">=1.21.6", - "java": ">=21", "fabric-api": "*" }, "suggests": { 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 b76b81e1..5f3122e6 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 @@ -3,221 +3,160 @@ package com.coloryr.allmusic.client; import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; -import com.coloryr.allmusic.client.others.ModernUI; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.FilterMode; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphicsExtractor; -import net.minecraft.client.gui.font.TextRenderable; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.fog.FogRenderer; -import net.minecraft.client.renderer.state.WindowRenderState; -import net.minecraft.client.renderer.state.gui.GlyphRenderState; -import net.minecraft.client.renderer.state.gui.GuiElementRenderState; -import net.minecraft.client.renderer.state.gui.GuiRenderState; import net.minecraft.network.chat.Component; -import net.minecraft.resources.Identifier; -import net.minecraft.util.profiling.Profiler; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; -import org.jspecify.annotations.Nullable; -import org.lwjgl.system.MemoryUtil; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final FogRenderer fogRenderer = new FogRenderer(); - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), 0); + entries.clear(); } @Override public void unUse() { - renderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE), this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - var minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - int i = (int) minecraft.mouseHandler.getScaledXPos(window); - int j = (int) minecraft.mouseHandler.getScaledYPos(window); - - GuiGraphicsExtractor graphics = new GuiGraphicsExtractor(Minecraft.getInstance(), renderState, i, j); - color = color | 0xFF000000; - graphics.text(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.guiRenderState.addGuiElement(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView(), RenderSystem.getSamplerCache().getRepeat(FilterMode.NEAREST)), - matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.scissorStack.peek())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.text(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.text(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -225,285 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom).thenComparing(ScreenRectangle::left).thenComparing(ScreenRectangle::right)); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)).thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - private final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final List meshesToDraw = new ArrayList<>(); - private final ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(786432); - private final Map vertexBuffers = new Object2ObjectOpenHashMap<>(); - private final Projection guiProjection = new Projection(); - private final ProjectionMatrixBuffer guiProjectionMatrixBuffer = new ProjectionMatrixBuffer("gui"); - private final CubeMap cubeMap = new CubeMap(Identifier.withDefaultNamespace("textures/gui/title/background/panorama")); - private ScreenRectangle previousScissorArea = null; - private RenderPipeline previousPipeline = null; - private TextureSetup previousTextureSetup = null; - private BufferBuilder bufferBuilder = null; - - public GuiRenderer(GuiRenderState renderState) { - this.renderState = renderState; - } - - public void render(GpuBufferSlice fogBuffer, CoreRenderTarget target) { - var profiler = Profiler.get(); - if (this.renderState.panoramaRenderState != null) { - this.cubeMap.render(10.0F, this.renderState.panoramaRenderState.spin()); - } - - profiler.push("allmusic text prepare"); - this.renderState.forEachText((text) -> { - var pose = text.pose; - var scissor = text.scissor; - Font.PreparedText preparedText = text.ensurePrepared(); - if (AllMusicClient.modui) { - ModernUI.text(preparedText, renderState, pose, scissor); - } else { - preparedText.visit(new Font.GlyphVisitor() { - @Override - public void acceptGlyph(TextRenderable.Styled glyph) { - renderState.addGlyphToCurrentLayer(new GlyphRenderState(pose, glyph, scissor)); - } - - @Override - public void acceptEffect(TextRenderable glyph) { - renderState.addGlyphToCurrentLayer(new GlyphRenderState(pose, glyph, scissor)); - } - }); - } - }); - this.renderState.sortElements(ELEMENT_SORT_COMPARATOR); - this.previousScissorArea = null; - this.previousPipeline = null; - this.previousTextureSetup = null; - this.bufferBuilder = null; - this.renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - this.ensureVertexBufferSizes(); - var commandEncoder = RenderSystem.getDevice().createCommandEncoder(); - var offsets = new Object2IntOpenHashMap(); - - for (var meshToDraw : this.meshesToDraw) { - var mesh = meshToDraw.mesh; - var drawState = mesh.drawState(); - var format = drawState.format(); - var vertexBuffer = this.vertexBuffers.get(format); - if (!offsets.containsKey(format)) { - offsets.put(format, 0); - } - - var meshVertexBuffer = mesh.vertexBuffer(); - int meshBufferSize = meshVertexBuffer.remaining(); - int offset = offsets.getInt(format); - - try (var mappedView = commandEncoder.mapBuffer(vertexBuffer.currentBuffer().slice(offset, meshBufferSize), false, true)) { - MemoryUtil.memCopy(meshVertexBuffer, mappedView.data()); - } - - offsets.put(format, offset + meshBufferSize); - this.draws.add(new Draw(vertexBuffer.currentBuffer(), offset / format.getVertexSize(), - drawState.mode(), drawState.indexCount(), meshToDraw.pipeline, meshToDraw.textureSetup, meshToDraw.scissorArea)); - meshToDraw.close(); - } - profiler.popPush("allmusic text draw"); - this.draw(fogBuffer, target); - profiler.popPush("allmusic text vertexBufferRotate"); - - for (MappableRingBuffer buffer : this.vertexBuffers.values()) { - buffer.rotate(); - } - - profiler.pop(); - this.draws.clear(); - this.meshesToDraw.clear(); - this.renderState.reset(); - if (SharedConstants.DEBUG_SHUFFLE_UI_RENDERING_ORDER) { - RenderPipeline.updateSortKeySeed(); - TextureSetup.updateSortKeySeed(); - } - } - - private void draw(GpuBufferSlice fogBuffer, CoreRenderTarget target) { - if (!this.draws.isEmpty()) { - var minecraft = Minecraft.getInstance(); - var windowState = minecraft.gameRenderer.getGameRenderState().windowRenderState; - this.guiProjection.setupOrtho(1000.0F, 11000.0F, (float) target.target.width / (float) windowState.guiScale, - (float) target.target.height / (float) windowState.guiScale, true); - RenderSystem.setProjectionMatrix(this.guiProjectionMatrixBuffer.getBuffer(this.guiProjection), ProjectionType.ORTHOGRAPHIC); - var mainRenderTarget = target.target; - int maxIndexCount = 0; - - for (var draw : this.draws) { - if (draw.indexCount > maxIndexCount) { - maxIndexCount = draw.indexCount; - } - } - - var autoIndices = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); - var indexBuffer = autoIndices.getBuffer(maxIndexCount); - var indexType = autoIndices.type(); - var dynamicTransforms = RenderSystem.getDynamicUniforms().writeTransform((new Matrix4f()).setTranslation(0.0F, 0.0F, -11000.0F), - new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f()); - this.executeDrawRange(() -> "GUI before blur", mainRenderTarget, fogBuffer, dynamicTransforms, - indexBuffer, indexType, Math.min(this.meshesToDraw.size(), this.draws.size())); - } - } - - private void executeDrawRange(Supplier label, RenderTarget mainRenderTarget, GpuBufferSlice fogBuffer, - GpuBufferSlice dynamicTransforms, GpuBuffer indexBuffer, VertexFormat.IndexType indexType, int endIndex) { - try (var renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(label, mainRenderTarget.getColorTextureView(), - OptionalInt.empty(), mainRenderTarget.useDepth ? mainRenderTarget.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderPass); - renderPass.setUniform("Fog", fogBuffer); - renderPass.setUniform("DynamicTransforms", dynamicTransforms); - - for (int i = 0; i < endIndex; ++i) { - Draw draw = this.draws.get(i); - this.executeDraw(draw, renderPass, indexBuffer, indexType); - } - } - } - - private void addElementToMesh(GuiElementRenderState elementState) { - var pipeline = elementState.pipeline(); - var textureSetup = elementState.textureSetup(); - var scissorArea = elementState.scissorArea(); - if (pipeline != this.previousPipeline || this.scissorChanged(scissorArea, this.previousScissorArea) || !textureSetup.equals(this.previousTextureSetup)) { - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - - this.bufferBuilder = new BufferBuilder(this.byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); - this.previousPipeline = pipeline; - this.previousTextureSetup = textureSetup; - this.previousScissorArea = scissorArea; - } - - elementState.buildVertices(this.bufferBuilder); - } - - private void recordMesh(BufferBuilder bufferBuilder, RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle scissorArea) { - var mesh = bufferBuilder.build(); - if (mesh != null) { - this.meshesToDraw.add(new MeshToDraw(mesh, pipeline, textureSetup, scissorArea)); - } - - } - - private void ensureVertexBufferSizes() { - var requiredSizes = new Object2IntOpenHashMap(); - - for (var meshToDraw : this.meshesToDraw) { - var drawState = meshToDraw.mesh.drawState(); - var format = drawState.format(); - if (!requiredSizes.containsKey(format)) { - requiredSizes.put(format, 0); - } - - requiredSizes.put(format, requiredSizes.getInt(format) + drawState.vertexCount() * format.getVertexSize()); - } - - for (var entry : requiredSizes.object2IntEntrySet()) { - var vertexFormat = entry.getKey(); - int requiredSize = entry.getIntValue(); - var vertexBuffer = this.vertexBuffers.get(vertexFormat); - if (vertexBuffer == null || vertexBuffer.size() < requiredSize) { - if (vertexBuffer != null) { - vertexBuffer.close(); - } - - this.vertexBuffers.put(vertexFormat, new MappableRingBuffer(() -> "GUI vertex buffer for " + vertexFormat, 34, requiredSize)); - } - } - } - - private void executeDraw(Draw draw, RenderPass renderPass, GpuBuffer indexBuffer, VertexFormat.IndexType indexType) { - var pipeline = draw.pipeline(); - renderPass.setPipeline(pipeline); - renderPass.setVertexBuffer(0, draw.vertexBuffer); - var scissorArea = draw.scissorArea(); - if (scissorArea != null) { - this.enableScissor(scissorArea, renderPass); - } else { - renderPass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - renderPass.bindTexture("Sampler0", draw.textureSetup.texure0(), draw.textureSetup.sampler0()); - } - - if (draw.textureSetup.texure1() != null) { - renderPass.bindTexture("Sampler1", draw.textureSetup.texure1(), draw.textureSetup.sampler1()); - } - - if (draw.textureSetup.texure2() != null) { - renderPass.bindTexture("Sampler2", draw.textureSetup.texure2(), draw.textureSetup.sampler2()); - } - - renderPass.setIndexBuffer(indexBuffer, indexType); - renderPass.drawIndexed(draw.baseVertex, 0, draw.indexCount, 1); - } - - private boolean scissorChanged(@Nullable ScreenRectangle newScissor, @Nullable ScreenRectangle oldScissor) { - if (newScissor == oldScissor) { - return false; - } else if (newScissor != null) { - return !newScissor.equals(oldScissor); - } else { - return true; - } - } - - private void enableScissor(ScreenRectangle rectangle, RenderPass renderPass) { - WindowRenderState windowState = Minecraft.getInstance().gameRenderer.getGameRenderState().windowRenderState; - int windowHeight = windowState.height; - int guiScale = windowState.guiScale; - double left = rectangle.left() * guiScale; - double bottom = windowHeight - rectangle.bottom() * guiScale; - double width = rectangle.width() * guiScale; - double height = rectangle.height() * guiScale; - renderPass.enableScissor((int) left, (int) bottom, Math.max(0, (int) width), Math.max(0, (int) height)); - } - - public void close() { - this.byteBufferBuilder.close(); - this.guiProjectionMatrixBuffer.close(); - - for (MappableRingBuffer buffer : this.vertexBuffers.values()) { - buffer.close(); - } - - this.cubeMap.close(); - } - - private record Draw(GpuBuffer vertexBuffer, int baseVertex, VertexFormat.Mode mode, int indexCount, - RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle scissorArea) { - } - - private record MeshToDraw(MeshData mesh, RenderPipeline pipeline, TextureSetup textureSetup, - @Nullable ScreenRectangle scissorArea) implements AutoCloseable { - public void close() { - this.mesh.close(); - } - } - } -} +} \ No newline at end of file diff --git a/client/fabric_26_1/src/main/resources/fabric.mod.json b/client/fabric_26_1/src/main/resources/fabric.mod.json index ce840880..e2d6e371 100644 --- a/client/fabric_26_1/src/main/resources/fabric.mod.json +++ b/client/fabric_26_1/src/main/resources/fabric.mod.json @@ -32,9 +32,8 @@ } ], "depends": { - "fabricloader": ">=0.18.3", + "fabricloader": ">=0.19.3", "minecraft": ">=26.1", - "java": ">=25", "fabric-api": "*" }, "suggests": { 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 dec9853e..5f3122e6 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 @@ -4,207 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.GpuFormat; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.FilterMode; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphicsExtractor; -import net.minecraft.client.gui.font.TextRenderable; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.state.gui.*; import net.minecraft.network.chat.Component; -import net.minecraft.resources.Identifier; -import net.minecraft.util.profiling.Profiler; -import org.joml.*; -import org.jspecify.annotations.Nullable; -import java.lang.Math; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false, GpuFormat.RGBA8_UNORM); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), new Vector4f(0)); + entries.clear(); } @Override public void unUse() { - renderer.render(this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - var minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - int i = (int) minecraft.mouseHandler.getScaledXPos(window); - int j = (int) minecraft.mouseHandler.getScaledYPos(window); - - GuiGraphicsExtractor graphics = new GuiGraphicsExtractor(Minecraft.getInstance(), renderState, i, j); - color = color | 0xFF000000; - graphics.text(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.guiRenderState.addGuiElement(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView(), RenderSystem.getSamplerCache().getRepeat(FilterMode.NEAREST)), - matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.scissorStack.peek())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.text(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.text(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -212,200 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom).thenComparing(ScreenRectangle::left).thenComparing(ScreenRectangle::right)); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR; - private final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final StagedVertexBuffer vertexBuffer = new StagedVertexBuffer(() -> "GUI Vertex Buffer", 786432); - private final Projection guiProjection = new Projection(); - private final ProjectionMatrixBuffer guiProjectionMatrixBuffer = new ProjectionMatrixBuffer("gui"); - private final CubeMap cubeMap = new CubeMap(Identifier.withDefaultNamespace("textures/gui/title/background/panorama")); - private @Nullable ScreenRectangle previousScissorArea = null; - private @Nullable RenderPipeline previousPipeline = null; - private @Nullable TextureSetup previousTextureSetup = null; - private StagedVertexBuffer.@Nullable Draw previousDraw; - - public GuiRenderer(final GuiRenderState renderState) { - this.renderState = renderState; - } - - public void render(CoreRenderTarget target) { - var profiler = Profiler.get(); - if (this.renderState.panoramaRenderState != null) { - this.cubeMap.render(10.0F, this.renderState.panoramaRenderState.spin()); - } - - profiler.push("prepare"); - this.prepare(); - profiler.popPush("upload"); - this.vertexBuffer.upload(); - profiler.popPush("draw"); - this.draw(target); - profiler.popPush("endFrame"); - this.vertexBuffer.endDraw(); - this.vertexBuffer.endFrame(); - this.draws.clear(); - this.renderState.reset(); - if (SharedConstants.DEBUG_SHUFFLE_UI_RENDERING_ORDER) { - RenderPipeline.updateSortKeySeed(); - TextureSetup.updateSortKeySeed(); - } - - profiler.pop(); - } - - private void prepare() { - this.prepareText(); - this.renderState.sortElements(ELEMENT_SORT_COMPARATOR); - this.addElementsToMeshes(); - } - - private void addElementsToMeshes() { - this.previousScissorArea = null; - this.previousPipeline = null; - this.previousTextureSetup = null; - this.previousDraw = null; - this.renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - } - - private void draw(CoreRenderTarget target) { - if (!this.draws.isEmpty()) { - var minecraft = Minecraft.getInstance(); - var windowState = minecraft.gameRenderer.gameRenderState().windowRenderState; - this.guiProjection.setupOrtho(1000.0F, 11000.0F, (float) target.target.width / (float) windowState.guiScale, - (float) target.target.height / (float) windowState.guiScale, true); - RenderSystem.setProjectionMatrix(this.guiProjectionMatrixBuffer.getBuffer(this.guiProjection), ProjectionType.ORTHOGRAPHIC); - var mainRenderTarget = target.target; - var dynamicTransforms = RenderSystem.getDynamicUniforms().writeTransform((new Matrix4f()).setTranslation(0.0F, 0.0F, -11000.0F)); - if (!this.draws.isEmpty()) { - this.executeDrawRange(() -> "GUI before blur", mainRenderTarget, dynamicTransforms, this.draws.size()); - } - } - } - - private void executeDrawRange(Supplier label, RenderTarget mainRenderTarget, GpuBufferSlice dynamicTransforms, int endIndex) { - try (var renderPass = RenderSystem.getDevice().createCommandEncoder() - .createRenderPass(label, mainRenderTarget.getColorTextureView(), - Optional.empty(), mainRenderTarget.useDepth ? mainRenderTarget.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderPass); - renderPass.setUniform("DynamicTransforms", dynamicTransforms); - - for (int i = 0; i < endIndex; ++i) { - Draw draw = this.draws.get(i); - this.executeDraw(draw, renderPass); - } - } - } - - private void addElementToMesh(final GuiElementRenderState elementState) { - var pipeline = elementState.pipeline(); - var textureSetup = elementState.textureSetup(); - var scissorArea = elementState.scissorArea(); - if (this.previousDraw == null || pipeline != this.previousPipeline || this.scissorChanged(scissorArea, this.previousScissorArea) || !textureSetup.equals(this.previousTextureSetup)) { - this.previousPipeline = pipeline; - this.previousTextureSetup = textureSetup; - this.previousScissorArea = scissorArea; - this.previousDraw = this.vertexBuffer.appendDraw(pipeline.getVertexFormatBinding(0), pipeline.getPrimitiveTopology()); - this.draws.add(new Draw(this.previousDraw, pipeline, textureSetup, scissorArea)); - } - - elementState.buildVertices(this.vertexBuffer.getVertexBuilder(Objects.requireNonNull(this.previousDraw))); - } - - private void prepareText() { - this.renderState.forEachText((text) -> { - var pose = text.pose; - var scissor = text.scissor; - text.ensurePrepared().visit(new Font.GlyphVisitor() { - public void acceptRenderable(final TextRenderable renderable) { - renderState.addGlyphToCurrentLayer(new GlyphRenderState(pose, renderable, scissor)); - } - }); - }); - } - - private void executeDraw(final Draw draw, final RenderPass renderPass) { - var executeInfo = this.vertexBuffer.getExecuteInfo(draw.draw); - if (executeInfo != null) { - var pipeline = draw.pipeline(); - renderPass.setPipeline(pipeline); - renderPass.setVertexBuffer(0, executeInfo.vertexBuffer().slice()); - var scissorArea = draw.scissorArea(); - if (scissorArea != null) { - this.enableScissor(scissorArea, renderPass); - } else { - renderPass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - renderPass.bindTexture("Sampler0", draw.textureSetup.texure0(), draw.textureSetup.sampler0()); - } - - if (draw.textureSetup.texure1() != null) { - renderPass.bindTexture("Sampler1", draw.textureSetup.texure1(), draw.textureSetup.sampler1()); - } - - if (draw.textureSetup.texure2() != null) { - renderPass.bindTexture("Sampler2", draw.textureSetup.texure2(), draw.textureSetup.sampler2()); - } - - renderPass.setIndexBuffer(executeInfo.indexBuffer(), executeInfo.indexType()); - renderPass.drawIndexed(executeInfo.indexCount(), 1, executeInfo.firstIndex(), executeInfo.baseVertex(), 0); - } - } - - private boolean scissorChanged(final @Nullable ScreenRectangle newScissor, final @Nullable ScreenRectangle oldScissor) { - if (newScissor == oldScissor) { - return false; - } else if (newScissor != null) { - return !newScissor.equals(oldScissor); - } else { - return true; - } - } - - private void enableScissor(final ScreenRectangle rectangle, final RenderPass renderPass) { - var window = Minecraft.getInstance().gameRenderer.gameRenderState().windowRenderState; - int guiScale = window.guiScale; - double left = (rectangle.left() * guiScale); - double top = (rectangle.top() * guiScale); - double right = Math.min(rectangle.right() * guiScale, window.width); - double bottom = Math.min(rectangle.bottom() * guiScale, window.height); - renderPass.enableScissor((int) left, window.height - (int) bottom, Math.max(0, (int) (right - left)), Math.max(0, (int) (bottom - top))); - } - - public void close() { - this.vertexBuffer.close(); - this.guiProjectionMatrixBuffer.close(); - this.cubeMap.close(); - } - - static { - ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)) - .thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - } - - @Environment(EnvType.CLIENT) - private record Draw(StagedVertexBuffer.Draw draw, RenderPipeline pipeline, TextureSetup textureSetup, - @Nullable ScreenRectangle scissorArea) { - } - } -} +} \ No newline at end of file diff --git a/client/fabric_26_2/src/main/resources/fabric.mod.json b/client/fabric_26_2/src/main/resources/fabric.mod.json index 054f4e54..99bd6f13 100644 --- a/client/fabric_26_2/src/main/resources/fabric.mod.json +++ b/client/fabric_26_2/src/main/resources/fabric.mod.json @@ -34,7 +34,6 @@ "depends": { "fabricloader": ">=0.19.3", "minecraft": ">=26.2", - "java": ">=25", "fabric-api": "*" }, "suggests": { diff --git a/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java b/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java index 863ea33e..96a21281 100644 --- a/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java +++ b/client/forge_1_12_2/src/main/java/com/coloryr/allmusic/client/AllMusicClient.java @@ -130,7 +130,7 @@ public class AllMusicClient implements AllMusicBridge { @Override public TextFrameBuffer makeTextRender(String name) { - return new CoreRenderTarget(); + return new CoreRenderTarget(name); } @Override 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 709b3cf5..0dd2be81 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 @@ -6,288 +6,162 @@ import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.shader.Framebuffer; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL30; + +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final Framebuffer target; + private static class TextEntry { + final String text; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - public CoreRenderTarget() { - target = new Framebuffer(800, 200, false); - target.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f); + TextEntry(String text, int y, int color, boolean shadow, int width, int height) { + this.text = text; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; + + public CoreRenderTarget(String name) { + isState = name.equals("state"); } @Override public void resize(int width, int height) { - ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft()); - - nowWidth = (width * scaledresolution.getScaledWidth()); - nowHeight = (height * scaledresolution.getScaledHeight()); - - if (nowWidth > target.framebufferWidth || nowHeight > target.framebufferHeight) { - target.createFramebuffer(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - target.framebufferClear(); - target.bindFramebuffer(true); - -// GlStateManager.ortho(0.0F, target.framebufferWidth, target.framebufferHeight, 0.0F, 1000.0F, 3000.0D); + entries.clear(); } @Override public void unUse() { isDraw = false; - - Minecraft minecraft = Minecraft.getMinecraft(); - -// GlStateManager.ortho(0.0D, minecraft.displayWidth, minecraft.displayHeight, 0.0D, 1000.0D, 3000.0D); - - Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(true); } @Override public void drawText(String text, int y, int color, boolean shadow) { - Minecraft minecraft = Minecraft.getMinecraft(); - - ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft()); - - FontRenderer font = minecraft.fontRenderer; - - int width; - - if (shadow) { - width = font.drawStringWithShadow(text, 0, 0, color); - } else { - width = font.drawString(text, 0, 0, color); - } - - TextItem item = new TextItem(width, font.FONT_HEIGHT + (shadow ? 1 : 0), y, (float) scaledresolution.getScaledWidth()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - GlStateManager.bindTexture(target.framebufferTexture); - GlStateManager.depthMask(false); - GlStateManager.enableBlend(); - - float w = (width / 2); - float h = (height / 2); - - GL11.glPushMatrix(); - GL11.glTranslatef(x + w, y + h, 0.0f); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - float z = 0; - - // 计算贴图区域UV - float u0 = texX * scale / target.framebufferWidth; - float v0 = 1 - (texY * scale / target.framebufferHeight); - float u1 = (texX + width) * scale / target.framebufferWidth; - float v1 = 1 - ((texY + height) * scale / target.framebufferHeight); - - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferbuilder = tessellator.getBuffer(); - - bufferbuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - bufferbuilder.pos(x0, y1, z).tex(u0, v1).color(1.0f, 1.0f, 1.0f, alpha).endVertex(); - bufferbuilder.pos(x1, y1, z).tex(u1, v1).color(1.0f, 1.0f, 1.0f, alpha).endVertex(); - bufferbuilder.pos(x1, y0, z).tex(u1, v0).color(1.0f, 1.0f, 1.0f, alpha).endVertex(); - bufferbuilder.pos(x0, y0, z).tex(u0, v0).color(1.0f, 1.0f, 1.0f, alpha).endVertex(); - tessellator.draw(); - - GlStateManager.disableBlend(); - GlStateManager.depthMask(true); - - GL11.glPopMatrix(); - - target.unbindFramebufferTexture(); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); + color = (color & 0x00FFFFFF) | 0xFF000000; + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + int width = font.getStringWidth(text); + if (width == 0) { return; } - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); + int height = font.FONT_HEIGHT + (shadow ? 1 : 0); + if (isState) { + y = 0; } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, (int) (texWidth * percent), texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - int texOffset = (int) (maxOffset * percent); - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); - } - - /** - * 正向百分比显示（从左开始显示，右边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示前面40%的内容 - */ - public void drawByForwardPercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移为0（靠左显示） - int screenOffset = 0; - - // 贴图偏移为0（从左边开始） - int texOffset = 0; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); - } - - /** - * 反向百分比显示（从右开始显示，左边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示后面40%的内容 - */ - public void drawByReversePercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移（靠右显示） - int screenOffset = maxWidth - renderWidth; - - // 贴图偏移（显示后面部分） - int texOffset = texWidth - contentWidth; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); + entries.add(new TextEntry(text, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (TextItem item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + GlStateManager.pushMatrix(); + GlStateManager.translate(drawX, drawY, 0); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + enableScissor(drawX, drawY, maxWidth, entry.height); + drawString(font, entry, -scrollOffset, 0, finalColor); + if (scrollOffset > 0) { + drawString(font, entry, -scrollOffset + entry.width, 0, finalColor); + } + disableScissor(); + } else { + drawString(font, entry, 0, 0, finalColor); + } + + GlStateManager.popMatrix(); } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + TextEntry entry = entries.get(line); + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y + entry.y, 0); + drawString(font, entry, 0, 0, applyAlpha(entry.color, alpha)); + GlStateManager.popMatrix(); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + GlStateManager.pushMatrix(); + GlStateManager.translate(drawX, drawY, 0); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + enableScissor(drawX, drawY, maxWidth, entry.height); + enableScissor(drawX, drawY, revealWidth, entry.height); + drawString(font, entry, -(int) texOffset, 0, finalColor); + disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + enableScissor(drawX, drawY, revealWidth, entry.height); + drawString(font, entry, 0, 0, finalColor); + disableScissor(); + } + + GlStateManager.popMatrix(); + } } @Override @@ -295,17 +169,41 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (TextItem item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); + private static void drawString(FontRenderer font, TextEntry entry, int x, int y, int color) { + if (entry.shadow) { + font.drawStringWithShadow(entry.text, x, y, color); + } else { + font.drawString(entry.text, x, y, color); } } + + private static void enableScissor(int x, int y, int width, int height) { + Minecraft mc = Minecraft.getMinecraft(); + int scale = mc.gameSettings.guiScale; + if (scale == 0) { + scale = Math.max(1, Math.min(mc.displayWidth, mc.displayHeight) / 320); + } + int sx = x * scale; + int sy = mc.displayHeight - (y + height) * scale; + int sw = width * scale; + int sh = height * scale; + GL11.glEnable(GL11.GL_SCISSOR_TEST); + GL11.glScissor(sx, sy, sw, sh); + } + + private static void disableScissor() { + GL11.glDisable(GL11.GL_SCISSOR_TEST); + } + + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); + } } 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 6c42bc8d..72341bb3 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 @@ -5,6 +5,7 @@ import com.coloryr.allmusic.client.core.AllMusicCore; import com.coloryr.allmusic.client.core.render.PictureFrameBuffer; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.client.core.render.TextureRender; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.TextComponent; import net.minecraft.resources.ResourceLocation; @@ -40,6 +41,12 @@ public class AllMusicClient implements AllMusicBridge { public static final Logger LOGGER = LogManager.getLogger("AllMusic Client"); private static final ResourceLocation channel = new ResourceLocation("allmusic", "channel"); + public static PoseStack context; + + public static void update(PoseStack matrices) { + context = matrices; + } + public AllMusicClient() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -112,6 +119,7 @@ public class AllMusicClient implements AllMusicBridge { @SubscribeEvent public void onRenderOverlay(RenderGameOverlayEvent.Pre e) { if (e.getType() == RenderGameOverlayEvent.ElementType.PORTAL) { + update(e.getMatrixStack()); AllMusicCore.hudUpdate(); } } @@ -139,7 +147,7 @@ public class AllMusicClient implements AllMusicBridge { @Override public TextFrameBuffer makeTextRender(String name) { - return new CoreRenderTarget(); + return new CoreRenderTarget(name); } @Override 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 dae7470e..79e8192a 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 @@ -4,321 +4,200 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; -import com.mojang.math.Matrix4f; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.renderer.RenderBuffers; import net.minecraft.network.chat.Component; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL30; + +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private static final RenderBuffers renderBuffers = new RenderBuffers(); + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final RenderTarget target; + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } - public CoreRenderTarget() { - target = new RenderTarget(800, 200, false, false); - target.setClearColor(0.0f, 0.0f, 0.0f, 0.0f); + private final List entries = new ArrayList<>(); + private final boolean isState; + + public CoreRenderTarget(String name) { + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = (int) (width * window.getGuiScale()); - nowHeight = (int) (height * window.getGuiScale()); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight, false); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - target.clear(false); - target.bindWrite(true); - - Window window = Minecraft.getInstance().getWindow(); - - RenderSystem.ortho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); + entries.clear(); } @Override public void unUse() { isDraw = false; - - Window window = Minecraft.getInstance().getWindow(); - - RenderSystem.ortho(0.0F, (double) window.getWidth() / window.getGuiScale(), (double) window.getHeight() / window.getGuiScale(), 0.0F, 1000.0F, 3000.0F); - - RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); - main.bindWrite(true); } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - Font font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - - if (font.width(component) == 0) { + Font font = Minecraft.getInstance().font; + int width = font.width(component); + if (width == 0) { return; } - // 使用 drawInBatch 将文字渲染到 CoreRenderTarget 自己的 buffer， - // 而不是 Font 内部的 buffer。这样 endBatch() 才能正确 flush 到当前 RenderTarget（FBO）。 - int width = font.drawInBatch(component, 0, y, color, shadow, - new Matrix4f(), renderBuffers.bufferSource(), - false, 0, 15728880); - - RenderSystem.disableDepthTest(); - renderBuffers.bufferSource().endBatch(); - RenderSystem.enableDepthTest(); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - RenderSystem.bindTexture(target.getColorTextureId()); - RenderSystem.enableTexture(); - RenderSystem.depthMask(false); - RenderSystem.enableBlend(); - RenderSystem.depthFunc(GL30.GL_ALWAYS); - - float w = (width / 2); - float h = (height / 2); - - Matrix4f matrix = Matrix4f.createTranslateMatrix(x + w, y + h, 0); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - float z = 0; - - // 计算贴图区域UV - // 注意：1.16.5 的 FBO 纹理不需要 Y 轴翻转，纹理原点在左上角 - float u0 = texX * scale / target.width; - float v0 = texY * scale / target.height; - float u1 = (texX + width) * scale / target.width; - float v1 = (texY + height) * scale / target.height; - - BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); - bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormat.POSITION_COLOR_TEX); - bufferBuilder.vertex(matrix, x0, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u0, v1).endVertex(); - bufferBuilder.vertex(matrix, x1, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v1).endVertex(); - bufferBuilder.vertex(matrix, x1, y0, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v0).endVertex(); - bufferBuilder.vertex(matrix, x0, y0, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u0, v0).endVertex(); - bufferBuilder.end(); - BufferUploader.end(bufferBuilder); - - RenderSystem.disableBlend(); - RenderSystem.depthMask(true); - - target.unbindRead(); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, (int) (texWidth * percent), texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - int texOffset = (int) (maxOffset * percent); - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); - } - - /** - * 正向百分比显示（从左开始显示，右边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示前面40%的内容 - */ - public void drawByForwardPercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移为0（靠左显示） - int screenOffset = 0; - - // 贴图偏移为0（从左边开始） - int texOffset = 0; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); - } - - /** - * 反向百分比显示（从右开始显示，左边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示后面40%的内容 - */ - public void drawByReversePercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移（靠右显示） - int screenOffset = maxWidth - renderWidth; - - // 贴图偏移（显示后面部分） - int texOffset = texWidth - contentWidth; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (TextItem item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + PoseStack matrices = AllMusicClient.context; + if (matrices == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + enableScissor(drawX, drawY, maxWidth, entry.height); + drawString(font, matrices, entry, drawX - scrollOffset, drawY, finalColor); + if (scrollOffset > 0) { + drawString(font, matrices, entry, drawX - scrollOffset + entry.width, drawY, finalColor); + } + disableScissor(); + } else { + drawString(font, matrices, entry, drawX, drawY, finalColor); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + PoseStack matrices = AllMusicClient.context; + if (matrices == null) return; + Font font = Minecraft.getInstance().font; + TextEntry entry = entries.get(line); + drawString(font, matrices, entry, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha)); } @Override public Point2f getLine(int line) { - if (line >= texts.size()) { + if (line >= texts.size() || line >= entries.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - @Override public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (TextItem item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); + if (texts.isEmpty()) { + return; } + PoseStack matrices = AllMusicClient.context; + if (matrices == null) return; + Font font = Minecraft.getInstance().font; - target.unbindRead(); + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + enableScissor(drawX, drawY, maxWidth, entry.height); + enableScissor(drawX, drawY, revealWidth, entry.height); + drawString(font, matrices, entry, drawX - (int) texOffset, drawY, finalColor); + disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + enableScissor(drawX, drawY, revealWidth, entry.height); + drawString(font, matrices, entry, drawX, drawY, finalColor); + disableScissor(); + } + } + } + + private static void drawString(Font font, PoseStack matrices, TextEntry entry, + int x, int y, int color) { + if (entry.shadow) { + font.drawShadow(matrices, entry.component, x, y, color); + } else { + font.draw(matrices, entry.component, x, (float) y, color); + } + } + + private static void enableScissor(int x, int y, int width, int height) { + Window window = Minecraft.getInstance().getWindow(); + double scale = window.getGuiScale(); + int sx = (int) (x * scale); + int sy = (int) (window.getHeight() - (y + height) * scale); + int sw = (int) (width * scale); + int sh = (int) (height * scale); + GL11.glEnable(GL11.GL_SCISSOR_TEST); + GL11.glScissor(sx, sy, sw, sh); + } + + private static void disableScissor() { + GL11.glDisable(GL11.GL_SCISSOR_TEST); + } + + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } } 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 8f845b2f..0bb23ba8 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 @@ -6,6 +6,7 @@ import com.coloryr.allmusic.client.core.render.PictureFrameBuffer; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.client.core.render.TextureRender; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.Resource; @@ -37,6 +38,8 @@ public class AllMusicClient implements AllMusicBridge { public static final Logger LOGGER = LogManager.getLogger("AllMusic Client"); private static final ResourceLocation channel = new ResourceLocation("allmusic", "channel"); + public static GuiGraphics context; + public AllMusicClient() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -124,6 +127,7 @@ public class AllMusicClient implements AllMusicBridge { @SubscribeEvent public void onRenderOverlay(RenderGuiOverlayEvent.Pre e) { if (e.getOverlay().id() == VanillaGuiOverlay.PORTAL.id()) { + context = e.getGuiGraphics(); AllMusicCore.hudUpdate(); } } @@ -135,7 +139,7 @@ public class AllMusicClient implements AllMusicBridge { @Override public TextFrameBuffer makeTextRender(String name) { - return new CoreRenderTarget(); + return new CoreRenderTarget(name); } @Override 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 e8236a1a..450f1f7b 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 @@ -4,300 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.RenderBuffers; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; -import org.joml.Matrix4f; -import org.lwjgl.opengl.GL30; + +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private static final RenderBuffers renderBuffers = new RenderBuffers(); + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final RenderTarget target; - private Matrix4f matrix4f; + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } - public CoreRenderTarget() { - target = new TextureTarget(800, 200, false, false); - target.setClearColor(0.0f, 0.0f, 0.0f, 0.0f); + private final List entries = new ArrayList<>(); + + private final boolean isState; + + public CoreRenderTarget(String name) { + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = (int) (width * window.getGuiScale()); - nowHeight = (int) (height * window.getGuiScale()); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight, false); - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } else if (matrix4f == null) { - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - target.clear(false); - target.bindWrite(true); - - RenderSystem.backupProjectionMatrix(); - if (matrix4f != null) { - RenderSystem.setProjectionMatrix(matrix4f, VertexSorting.ORTHOGRAPHIC_Z); - } + entries.clear(); } @Override public void unUse() { isDraw = false; - - RenderSystem.restoreProjectionMatrix(); - - RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); - main.bindWrite(true); } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - if (font.width(component) == 0) { + Font font = Minecraft.getInstance().font; + int width = font.width(component); + if (width == 0) { return; } - int width = font.drawInBatch(component, 0, y, color, shadow, new Matrix4f(), renderBuffers.bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880); - RenderSystem.disableDepthTest(); - renderBuffers.bufferSource().endBatch(); - RenderSystem.enableDepthTest(); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - RenderSystem.setShaderTexture(0, target.getColorTextureId()); - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); - - RenderSystem.depthMask(false); - RenderSystem.enableBlend(); - RenderSystem.depthFunc(GL30.GL_ALWAYS); - - float w = (width / 2); - float h = (height / 2); - - Matrix4f matrix = new Matrix4f().translation(x + w, y + h, 0); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - float z = 0; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); - bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX); - bufferBuilder.vertex(matrix, x0, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u0, v1).endVertex(); - bufferBuilder.vertex(matrix, x1, y1, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v1).endVertex(); - bufferBuilder.vertex(matrix, x1, y0, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u1, v0).endVertex(); - bufferBuilder.vertex(matrix, x0, y0, z).color(1.0f, 1.0f, 1.0f, alpha).uv(u0, v0).endVertex(); - - BufferUploader.drawWithShader(bufferBuilder.end()); - - RenderSystem.disableBlend(); - RenderSystem.depthMask(true); - - target.unbindRead(); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, (int) (texWidth * percent), texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - int texOffset = (int) (maxOffset * percent); - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); - } - - /** - * 正向百分比显示（从左开始显示，右边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示前面40%的内容 - */ - public void drawByForwardPercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移为0（靠左显示） - int screenOffset = 0; - - // 贴图偏移为0（从左边开始） - int texOffset = 0; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); - } - - /** - * 反向百分比显示（从右开始显示，左边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示后面40%的内容 - */ - public void drawByReversePercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移（靠右显示） - int screenOffset = maxWidth - renderWidth; - - // 贴图偏移（显示后面部分） - int texOffset = texWidth - contentWidth; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -305,19 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } - - target.unbindRead(); + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } -} +} \ No newline at end of file diff --git a/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/AllMusic.java b/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/AllMusic.java index b0000cc4..27aa30e4 100644 --- a/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/AllMusic.java +++ b/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/AllMusic.java @@ -142,7 +142,7 @@ public class AllMusic implements AllMusicBridge { @Override public TextFrameBuffer makeTextRender(String name) { - return new CoreRenderTarget(); + return new CoreRenderTarget(name); } @Override diff --git a/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 6ee73771..86b989cf 100644 --- a/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/forge_1_7_10/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -6,280 +6,161 @@ import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.shader.Framebuffer; import org.lwjgl.opengl.GL11; -public class CoreRenderTarget extends TextFrameBuffer { - private final Framebuffer target; +import java.util.ArrayList; +import java.util.List; - public CoreRenderTarget() { - target = new Framebuffer(800, 200, false); - target.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f); +public class CoreRenderTarget extends TextFrameBuffer { + private static class TextEntry { + final String text; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; + + TextEntry(String text, int y, int color, boolean shadow, int width, int height) { + this.text = text; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; + + public CoreRenderTarget(String name) { + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - - nowWidth = (width * scaledresolution.getScaledWidth()); - nowHeight = (height * scaledresolution.getScaledHeight()); - - if (nowWidth > target.framebufferWidth || nowHeight > target.framebufferHeight) { - target.createFramebuffer(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - target.framebufferClear(); - target.bindFramebuffer(true); + entries.clear(); } @Override public void unUse() { isDraw = false; - - Minecraft minecraft = Minecraft.getMinecraft(); - - Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(true); } @Override public void drawText(String text, int y, int color, boolean shadow) { - Minecraft minecraft = Minecraft.getMinecraft(); - - ScaledResolution scaledresolution = new ScaledResolution(minecraft, minecraft.displayWidth, minecraft.displayHeight); - - FontRenderer font = minecraft.fontRenderer; - - int width; - - if (shadow) { - width = font.drawStringWithShadow(text, 0, 0, color); - } else { - width = font.drawString(text, 0, 0, color); - } - - TextItem item = new TextItem(width, font.FONT_HEIGHT + (shadow ? 1 : 0), y, (float) scaledresolution.getScaledWidth()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - GL11.glBindTexture(GL11.GL_TEXTURE_2D, target.framebufferTexture); - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - - float w = (width / 2); - float h = (height / 2); - - GL11.glPushMatrix(); - GL11.glTranslatef(x + w, y + h, 0.0f); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - float z = 0; - - // 计算贴图区域UV - float u0 = texX * scale / target.framebufferWidth; - float v0 = 1 - (texY * scale / target.framebufferHeight); - float u1 = (texX + width) * scale / target.framebufferWidth; - float v1 = 1 - ((texY + height) * scale / target.framebufferHeight); - - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setColorRGBA_F(1.0f, 1.0f, 1.0f, alpha); - tessellator.addVertexWithUV(x0, y1, z, u0, v1); - tessellator.addVertexWithUV(x1, y1, z, u1, v1); - tessellator.addVertexWithUV(x1, y0, z, u1, v0); - tessellator.addVertexWithUV(x0, y0, z, u0, v0); - tessellator.draw(); - - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - - GL11.glPopMatrix(); - - GL11.glBindTexture(GL11.GL_TEXTURE_2D, 0); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); + color = (color & 0x00FFFFFF) | 0xFF000000; + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + int width = font.getStringWidth(text); + if (width == 0) { return; } - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); + int height = font.FONT_HEIGHT + (shadow ? 1 : 0); + if (isState) { + y = 0; } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, (int) (texWidth * percent), texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - int texOffset = (int) (maxOffset * percent); - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); - } - - /** - * 正向百分比显示（从左开始显示，右边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示前面40%的内容 - */ - public void drawByForwardPercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移为0（靠左显示） - int screenOffset = 0; - - // 贴图偏移为0（从左边开始） - int texOffset = 0; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); - } - - /** - * 反向百分比显示（从右开始显示，左边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示后面40%的内容 - */ - public void drawByReversePercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移（靠右显示） - int screenOffset = maxWidth - renderWidth; - - // 贴图偏移（显示后面部分） - int texOffset = texWidth - contentWidth; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); + entries.add(new TextEntry(text, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (TextItem item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + GL11.glPushMatrix(); + GL11.glTranslatef(drawX, drawY, 0); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + enableScissor(drawX, drawY, maxWidth, entry.height); + drawString(font, entry, -scrollOffset, 0, finalColor); + if (scrollOffset > 0) { + drawString(font, entry, -scrollOffset + entry.width, 0, finalColor); + } + disableScissor(); + } else { + drawString(font, entry, 0, 0, finalColor); + } + + GL11.glPopMatrix(); } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + TextEntry entry = entries.get(line); + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) (y + entry.y), 0); + drawString(font, entry, 0, 0, applyAlpha(entry.color, alpha)); + GL11.glPopMatrix(); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + GL11.glPushMatrix(); + GL11.glTranslatef(drawX, drawY, 0); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + enableScissor(drawX, drawY, maxWidth, entry.height); + enableScissor(drawX, drawY, revealWidth, entry.height); + drawString(font, entry, -(int) texOffset, 0, finalColor); + disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + enableScissor(drawX, drawY, revealWidth, entry.height); + drawString(font, entry, 0, 0, finalColor); + disableScissor(); + } + + GL11.glPopMatrix(); + } } @Override @@ -287,17 +168,42 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (TextItem item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); + private static void drawString(FontRenderer font, TextEntry entry, int x, int y, int color) { + if (entry.shadow) { + font.drawStringWithShadow(entry.text, x, y, color); + } else { + font.drawString(entry.text, x, y, color); } } + + private static void enableScissor(int x, int y, int width, int height) { + Minecraft mc = Minecraft.getMinecraft(); + int scale = mc.gameSettings.guiScale; + if (scale == 0) { + int k = Math.min(mc.displayWidth, mc.displayHeight); + scale = Math.max(1, k / 320); + } + int sx = x * scale; + int sy = mc.displayHeight - (y + height) * scale; + int sw = width * scale; + int sh = height * scale; + GL11.glEnable(GL11.GL_SCISSOR_TEST); + GL11.glScissor(sx, sy, sw, sh); + } + + private static void disableScissor() { + GL11.glDisable(GL11.GL_SCISSOR_TEST); + } + + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); + } } 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 d0b54bb2..fe5d1faa 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 @@ -8,6 +8,7 @@ import com.coloryr.allmusic.client.core.render.TextureRender; import com.coloryr.allmusic.comm.AllMusicInit; import com.coloryr.allmusic.comm.MusicCodec; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.Resource; @@ -37,6 +38,8 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid public static final String MODID = "allmusic_client"; public static final Logger LOGGER = LogManager.getLogger("AllMusic Client"); + public static GuiGraphics context; + @SubscribeEvent public static void setup(final FMLClientSetupEvent event) { AllMusicClient client = new AllMusicClient(); @@ -98,7 +101,7 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid @Override public TextFrameBuffer makeTextRender(String name) { - return new CoreRenderTarget(); + return new CoreRenderTarget(name); } @Override @@ -169,6 +172,7 @@ public class AllMusicClient implements IPayloadHandler, AllMusicBrid @SubscribeEvent public static void onRenderOverlay(RenderGuiLayerEvent.Post e) { if (e.getName().equals(VanillaGuiLayers.CAMERA_OVERLAYS)) { + context= e.getGuiGraphics(); AllMusicCore.hudUpdate(); } } 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 d77a244b..450f1f7b 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 @@ -4,299 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.RenderBuffers; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; -import org.joml.Matrix4f; -import org.lwjgl.opengl.GL30; + +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private static final RenderBuffers renderBuffers = new RenderBuffers(Runtime.getRuntime().availableProcessors()); + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final RenderTarget target; - private Matrix4f matrix4f; + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } - public CoreRenderTarget() { - target = new TextureTarget(800, 200, false, false); - target.setClearColor(0.0f, 0.0f, 0.0f, 0.0f); + private final List entries = new ArrayList<>(); + + private final boolean isState; + + public CoreRenderTarget(String name) { + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = (int) (width * window.getGuiScale()); - nowHeight = (int) (height * window.getGuiScale()); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight, false); - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } else if (matrix4f == null) { - matrix4f = new Matrix4f().setOrtho(0.0F, (float) (target.width / window.getGuiScale()), - (float) (target.height / window.getGuiScale()), 0.0F, 1000.0F, 21000.0F); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - target.clear(false); - target.bindWrite(true); - - RenderSystem.backupProjectionMatrix(); - if (matrix4f != null) { - RenderSystem.setProjectionMatrix(matrix4f, VertexSorting.ORTHOGRAPHIC_Z); - } + entries.clear(); } @Override public void unUse() { isDraw = false; - - RenderSystem.restoreProjectionMatrix(); - - RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); - main.bindWrite(true); } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - if (font.width(component) == 0) { + Font font = Minecraft.getInstance().font; + int width = font.width(component); + if (width == 0) { return; } - int width = font.drawInBatch(component, 0, y, color, shadow, new Matrix4f(), renderBuffers.bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880); - RenderSystem.disableDepthTest(); - renderBuffers.bufferSource().endBatch(); - RenderSystem.enableDepthTest(); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - RenderSystem.setShaderTexture(0, target.getColorTextureId()); - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - - RenderSystem.depthMask(false); - RenderSystem.enableBlend(); - RenderSystem.depthFunc(GL30.GL_ALWAYS); - - float w = (width / 2); - float h = (height / 2); - - Matrix4f matrix = new Matrix4f().translation(x + w, y + h, 0); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - float z = 0; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - BufferBuilder bufferBuilder = Tesselator.getInstance().begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - bufferBuilder.addVertex(matrix, x0, y1, z).setUv(u0, v1).setColor(1.0f, 1.0f, 1.0f, alpha); - bufferBuilder.addVertex(matrix, x1, y1, z).setUv(u1, v1).setColor(1.0f, 1.0f, 1.0f, alpha); - bufferBuilder.addVertex(matrix, x1, y0, z).setUv(u1, v0).setColor(1.0f, 1.0f, 1.0f, alpha); - bufferBuilder.addVertex(matrix, x0, y0, z).setUv(u0, v0).setColor(1.0f, 1.0f, 1.0f, alpha); - - BufferUploader.drawWithShader(bufferBuilder.buildOrThrow()); - - RenderSystem.disableBlend(); - RenderSystem.depthMask(true); - - target.unbindRead(); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, (int) (texWidth * percent), texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - int texOffset = (int) (maxOffset * percent); - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); - } - - /** - * 正向百分比显示（从左开始显示，右边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示前面40%的内容 - */ - public void drawByForwardPercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移为0（靠左显示） - int screenOffset = 0; - - // 贴图偏移为0（从左边开始） - int texOffset = 0; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); - } - - /** - * 反向百分比显示（从右开始显示，左边空白） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），表示显示的内容比例，例如0.4表示显示后面40%的内容 - */ - public void drawByReversePercent(float alpha, int startX, int startY, - int texX, int texY, - int texWidth, int texHeight, - int maxWidth, float percent, float scale) { - // 限制百分比范围 - percent = Math.min(1.0f, Math.max(0.0f, percent)); - - // 如果要显示的内容为0，直接返回 - if (percent <= 0) { - return; - } - - // 计算要显示的内容宽度 - int contentWidth = (int) (texWidth * percent); - - // 实际渲染宽度 - int renderWidth = Math.min(contentWidth, maxWidth); - - // 屏幕偏移（靠右显示） - int screenOffset = maxWidth - renderWidth; - - // 贴图偏移（显示后面部分） - int texOffset = texWidth - contentWidth; - - // 渲染 - draw(alpha, startX + screenOffset, startY, - renderWidth, texHeight, - texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -304,19 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } - - target.unbindRead(); + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } -} +} \ No newline at end of file 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 cd6f0166..450f1f7b 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 @@ -4,219 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.FilterMode; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.font.TextRenderable; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.gui.render.state.GlyphRenderState; -import net.minecraft.client.gui.render.state.GuiElementRenderState; -import net.minecraft.client.gui.render.state.GuiRenderState; -import net.minecraft.client.renderer.CachedOrthoProjectionMatrixBuffer; -import net.minecraft.client.renderer.MappableRingBuffer; -import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.client.renderer.fog.FogRenderer; import net.minecraft.network.chat.Component; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; -import org.jspecify.annotations.Nullable; -import org.lwjgl.system.MemoryUtil; -import java.nio.ByteBuffer; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final FogRenderer fogRenderer = new FogRenderer(); - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), 0); + entries.clear(); } @Override public void unUse() { - renderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE), this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - var minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - int i = (int) minecraft.mouseHandler.getScaledXPos(window); - int j = (int) minecraft.mouseHandler.getScaledYPos(window); - - GuiGraphics graphics = new GuiGraphics(Minecraft.getInstance(), renderState, i, j); - color = color | 0xFF000000; - graphics.drawString(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.submitGuiElementRenderState(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView(), RenderSystem.getSamplerCache().getRepeat(FilterMode.NEAREST)), - matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.peekScissorStack())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -224,280 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst( - Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom) - .thenComparing(ScreenRectangle::left) - .thenComparing(ScreenRectangle::right) - ); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)) - .thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final List meshesToDraw = new ArrayList<>(); - private final ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(786432); - private final Map vertexBuffers = new Object2ObjectOpenHashMap<>(); - private final CachedOrthoProjectionMatrixBuffer guiProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("gui", 1000.0F, 11000.0F, true); - private final CachedOrthoProjectionMatrixBuffer itemsProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("items", -1000.0F, 1000.0F, true); - private @Nullable ScreenRectangle previousScissorArea = null; - private @Nullable RenderPipeline previousPipeline = null; - private @Nullable TextureSetup previousTextureSetup = null; - private @Nullable BufferBuilder bufferBuilder = null; - - public GuiRenderer(GuiRenderState state) { - this.renderState = state; - } - - public void render(GpuBufferSlice bufferSlice, CoreRenderTarget target) { - this.renderState.forEachText(state -> { - var matrix3x2fc = state.pose; - var screenrectangle = state.scissor; - state.ensurePrepared().visit(new Font.GlyphVisitor() { - @Override - public void acceptGlyph(TextRenderable.Styled styled) { - this.accept(styled); - } - - @Override - public void acceptEffect(TextRenderable textRenderable) { - this.accept(textRenderable); - } - - private void accept(TextRenderable textRenderable) { - renderState.submitGlyphToCurrentLayer(new GlyphRenderState(matrix3x2fc, textRenderable, screenrectangle)); - } - }); - }); - this.renderState.sortElements(ELEMENT_SORT_COMPARATOR); - - this.previousScissorArea = null; - this.previousPipeline = null; - this.previousTextureSetup = null; - this.bufferBuilder = null; - this.renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - - var map = new Object2IntOpenHashMap(); - - for (var draw : this.meshesToDraw) { - var state = draw.mesh.drawState(); - var vertexformat = state.format(); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - map.put(vertexformat, map.getInt(vertexformat) + state.vertexCount() * vertexformat.getVertexSize()); - } - - for (var entry : map.object2IntEntrySet()) { - var vertexformat = entry.getKey(); - int i = entry.getIntValue(); - var mappableringbuffer = this.vertexBuffers.get(vertexformat); - if (mappableringbuffer == null || mappableringbuffer.size() < i) { - if (mappableringbuffer != null) { - mappableringbuffer.close(); - } - - this.vertexBuffers.put(vertexformat, new MappableRingBuffer(() -> "GUI vertex buffer for " + vertexformat, 34, i)); - } - } - - var commandencoder = RenderSystem.getDevice().createCommandEncoder(); - map = new Object2IntOpenHashMap<>(); - - for (MeshToDraw draw : this.meshesToDraw) { - var meshdata = draw.mesh; - var state = meshdata.drawState(); - var vertexformat = state.format(); - var mappableringbuffer = this.vertexBuffers.get(vertexformat); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - ByteBuffer bytebuffer = meshdata.vertexBuffer(); - int i = bytebuffer.remaining(); - int j = map.getInt(vertexformat); - - try (GpuBuffer.MappedView view = commandencoder.mapBuffer(mappableringbuffer.currentBuffer().slice(j, i), false, true)) { - MemoryUtil.memCopy(bytebuffer, view.data()); - } - - map.put(vertexformat, j + i); - this.draws.add(new Draw(mappableringbuffer.currentBuffer(), j / vertexformat.getVertexSize(), state.mode(), - state.indexCount(), draw.pipeline, draw.textureSetup, draw.scissorArea)); - draw.close(); - } - - this.draw(bufferSlice, target); - - for (var mappableringbuffer : this.vertexBuffers.values()) { - mappableringbuffer.rotate(); - } - - this.draws.clear(); - this.meshesToDraw.clear(); - this.renderState.reset(); - if (SharedConstants.DEBUG_SHUFFLE_UI_RENDERING_ORDER) { - RenderPipeline.updateSortKeySeed(); - TextureSetup.updateSortKeySeed(); - } - } - - private void draw(GpuBufferSlice bufferSlice, CoreRenderTarget target) { - if (!this.draws.isEmpty()) { - var minecraft = Minecraft.getInstance(); - var window = minecraft.getWindow(); - RenderSystem.setProjectionMatrix( - this.guiProjectionMatrixBuffer.getBuffer((float) target.target.width / window.getGuiScale(), (float) target.target.height / window.getGuiScale()), - ProjectionType.ORTHOGRAPHIC - ); - var rendertarget = target.target; - int i = 0; - - for (var item : this.draws) { - if (item.indexCount > i) { - i = item.indexCount; - } - } - - var buffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); - var gpubuffer = buffer.getBuffer(i); - var indexType = buffer.type(); - var gpubufferslice = RenderSystem.getDynamicUniforms() - .writeTransform(new Matrix4f().setTranslation(0.0F, 0.0F, -11000.0F), new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f()); - if (!this.meshesToDraw.isEmpty()) { - this.executeDrawRange(() -> "GUI before blur", rendertarget, bufferSlice, gpubufferslice, gpubuffer, - indexType, Math.min(this.meshesToDraw.size(), this.draws.size())); - } - } - } - - private void executeDrawRange(Supplier name, RenderTarget target, GpuBufferSlice bufferSlice, GpuBufferSlice bufferSlice1, - GpuBuffer buffer, VertexFormat.IndexType indexType, int count) { - try (var renderpass = RenderSystem.getDevice() - .createCommandEncoder() - .createRenderPass(name, target.getColorTextureView(), OptionalInt.empty(), - target.useDepth ? target.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderpass); - renderpass.setUniform("Fog", bufferSlice); - renderpass.setUniform("DynamicTransforms", bufferSlice1); - - for (int i = 0; i < count; i++) { - Draw draw = this.draws.get(i); - this.executeDraw(draw, renderpass, buffer, indexType); - } - } - } - - private void addElementToMesh(GuiElementRenderState state) { - var pipeline = state.pipeline(); - var texturesetup = state.textureSetup(); - var screenrectangle = state.scissorArea(); - if (pipeline != this.previousPipeline - || this.scissorChanged(screenrectangle, this.previousScissorArea) - || !texturesetup.equals(this.previousTextureSetup)) { - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - - this.bufferBuilder = new BufferBuilder(this.byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); - this.previousPipeline = pipeline; - this.previousTextureSetup = texturesetup; - this.previousScissorArea = screenrectangle; - } - - state.buildVertices(this.bufferBuilder); - } - - private void recordMesh(BufferBuilder builder, RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle rectangle) { - var meshdata = builder.build(); - if (meshdata != null) { - this.meshesToDraw.add(new MeshToDraw(meshdata, pipeline, textureSetup, rectangle)); - } - } - - private void executeDraw(Draw draw, RenderPass pass, GpuBuffer buffer, VertexFormat.IndexType index) { - var renderpipeline = draw.pipeline(); - pass.setPipeline(renderpipeline); - pass.setVertexBuffer(0, draw.vertexBuffer); - var screenrectangle = draw.scissorArea(); - if (screenrectangle != null) { - Window window = Minecraft.getInstance().getWindow(); - int i = window.getHeight(); - int j = window.getGuiScale(); - double d0 = screenrectangle.left() * j; - double d1 = i - screenrectangle.bottom() * j; - double d2 = screenrectangle.width() * j; - double d3 = screenrectangle.height() * j; - pass.enableScissor((int) d0, (int) d1, Math.max(0, (int) d2), Math.max(0, (int) d3)); - } else { - pass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - pass.bindTexture("Sampler0", draw.textureSetup.texure0(), draw.textureSetup.sampler0()); - } - - if (draw.textureSetup.texure1() != null) { - pass.bindTexture("Sampler1", draw.textureSetup.texure1(), draw.textureSetup.sampler1()); - } - - if (draw.textureSetup.texure2() != null) { - pass.bindTexture("Sampler2", draw.textureSetup.texure2(), draw.textureSetup.sampler2()); - } - - pass.setIndexBuffer(buffer, index); - pass.drawIndexed(draw.baseVertex, 0, draw.indexCount, 1); - } - - private boolean scissorChanged(@Nullable ScreenRectangle rectangle, @Nullable ScreenRectangle rectangle1) { - if (rectangle == rectangle1) { - return false; - } else { - return rectangle != null ? !rectangle.equals(rectangle1) : true; - } - } - - @Override - public void close() { - this.byteBufferBuilder.close(); - this.guiProjectionMatrixBuffer.close(); - this.itemsProjectionMatrixBuffer.close(); - - for (MappableRingBuffer mappableringbuffer : this.vertexBuffers.values()) { - mappableringbuffer.close(); - } - } - - record Draw(GpuBuffer vertexBuffer, int baseVertex, VertexFormat.Mode mode, int indexCount, - RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle scissorArea) { - } - - record MeshToDraw(MeshData mesh, RenderPipeline pipeline, TextureSetup textureSetup, - @Nullable ScreenRectangle scissorArea) implements AutoCloseable { - @Override - public void close() { - this.mesh.close(); - } - } - } -} +} \ No newline at end of file diff --git a/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 02b4db80..450f1f7b 100644 --- a/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/neoforge_1_21_3/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -170,7 +170,9 @@ public class CoreRenderTarget extends TextFrameBuffer { } private static int applyAlpha(int color, float alpha) { - int a = Math.clamp((int) (alpha * 255), 0, 255); + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; return (color & 0x00FFFFFF) | (a << 24); } } \ No newline at end of file diff --git a/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java b/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java index 43cbccde..450f1f7b 100644 --- a/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java +++ b/client/neoforge_1_21_4/src/main/java/com/coloryr/allmusic/client/CoreRenderTarget.java @@ -63,7 +63,6 @@ public class CoreRenderTarget extends TextFrameBuffer { Component component = MiniMessage.parse(text); Font font = Minecraft.getInstance().font; int width = font.width(component); - if (width == 0) { return; } @@ -171,7 +170,9 @@ public class CoreRenderTarget extends TextFrameBuffer { } private static int applyAlpha(int color, float alpha) { - int a = Math.clamp((int) (alpha * 255), 0, 255); + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; return (color & 0x00FFFFFF) | (a << 24); } } \ No newline at end of file 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 57a888bf..450f1f7b 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 @@ -4,212 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.font.glyphs.BakedGlyph; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.gui.render.state.GlyphEffectRenderState; -import net.minecraft.client.gui.render.state.GlyphRenderState; -import net.minecraft.client.gui.render.state.GuiElementRenderState; -import net.minecraft.client.gui.render.state.GuiRenderState; -import net.minecraft.client.renderer.CachedOrthoProjectionMatrixBuffer; -import net.minecraft.client.renderer.MappableRingBuffer; -import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.client.renderer.fog.FogRenderer; import net.minecraft.network.chat.Component; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; -import org.lwjgl.system.MemoryUtil; -import java.nio.ByteBuffer; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final FogRenderer fogRenderer = new FogRenderer(); - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), 0); + entries.clear(); } @Override public void unUse() { - renderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE), this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - Window window = Minecraft.getInstance().getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - GuiGraphics graphics = new GuiGraphics(Minecraft.getInstance(), renderState); - color = color | 0xFF000000; - graphics.drawString(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.submitGuiElementRenderState(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView()), matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.peekScissorStack())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.drawString(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.drawString(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphics gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.drawString(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -217,274 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst( - Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom) - .thenComparing(ScreenRectangle::left) - .thenComparing(ScreenRectangle::right) - ); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)) - .thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - private final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final List meshesToDraw = new ArrayList<>(); - private final ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(786432); - private final Map vertexBuffers = new Object2ObjectOpenHashMap<>(); - private final CachedOrthoProjectionMatrixBuffer guiProjectionMatrixBuffer = new CachedOrthoProjectionMatrixBuffer("gui", 1000.0F, 11000.0F, true); - private ScreenRectangle previousScissorArea; - private RenderPipeline previousPipeline; - private TextureSetup previousTextureSetup; - private BufferBuilder bufferBuilder; - - public GuiRenderer(GuiRenderState state) { - renderState = state; - } - - public void render(GpuBufferSlice gpu, CoreRenderTarget target) { - renderState.forEachText(state -> { - var matrix3x2f = state.pose; - var screenrectangle = state.scissor; - state.ensurePrepared().visit(new Font.GlyphVisitor() { - @Override - public void acceptGlyph(BakedGlyph.GlyphInstance glyph) { - if (glyph.glyph().textureView() != null) { - renderState.submitGlyphToCurrentLayer(new GlyphRenderState(matrix3x2f, glyph, screenrectangle)); - } - } - - @Override - public void acceptEffect(BakedGlyph glyph, BakedGlyph.Effect effect) { - if (glyph.textureView() != null) { - renderState.submitGlyphToCurrentLayer(new GlyphEffectRenderState(matrix3x2f, glyph, effect, screenrectangle)); - } - } - }); - }); - - renderState.sortElements(ELEMENT_SORT_COMPARATOR); - - previousScissorArea = null; - previousPipeline = null; - previousTextureSetup = null; - bufferBuilder = null; - renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - if (bufferBuilder != null) { - recordMesh(bufferBuilder, previousPipeline, previousTextureSetup, previousScissorArea); - } - - recordDraws(); - - if (!draws.isEmpty()) { - Minecraft minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - RenderSystem.setProjectionMatrix( - guiProjectionMatrixBuffer.getBuffer((float) target.target.width / window.getGuiScale(), - (float) target.target.height / window.getGuiScale()), - ProjectionType.ORTHOGRAPHIC - ); - var rendertarget = target.target; - int i = 0; - - for (Draw guirenderer$draw : draws) { - if (guirenderer$draw.indexCount > i) { - i = guirenderer$draw.indexCount; - } - } - - var buffer = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); - var gpubuffer = buffer.getBuffer(i); - var index = buffer.type(); - var gpubufferslice = RenderSystem.getDynamicUniforms().writeTransform(new Matrix4f().setTranslation(0.0F, 0.0F, -11000.0F), - new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f(), 0.0F); - if (!meshesToDraw.isEmpty()) { - executeDrawRange(() -> "before blur", rendertarget, gpu, gpubufferslice, gpubuffer, - index, Math.min(meshesToDraw.size(), draws.size()), target); - } - } - - for (MappableRingBuffer mappableringbuffer : vertexBuffers.values()) { - mappableringbuffer.rotate(); - } - - draws.clear(); - meshesToDraw.clear(); - renderState.reset(); - } - - private void executeDrawRange(Supplier name, RenderTarget target, GpuBufferSlice buffer1, GpuBufferSlice buffer2, - GpuBuffer buffer3, VertexFormat.IndexType index, int count, CoreRenderTarget target1) { - try (RenderPass renderpass = RenderSystem.getDevice() - .createCommandEncoder() - .createRenderPass(name, target.getColorTextureView(), OptionalInt.empty(), - target.useDepth ? target.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderpass); - renderpass.setUniform("Fog", buffer1); - renderpass.setUniform("DynamicTransforms", buffer2); - - for (int i = 0; i < count; i++) { - var item = draws.get(i); - executeDraw(item, renderpass, target1, buffer3, index); - } - } - } - - private void addElementToMesh(GuiElementRenderState state, int range) { - var pipeline = state.pipeline(); - var setup = state.textureSetup(); - var screen = state.scissorArea(); - if (pipeline != previousPipeline || scissorChanged(screen, previousScissorArea) || !setup.equals(previousTextureSetup)) { - if (bufferBuilder != null) { - recordMesh(bufferBuilder, previousPipeline, previousTextureSetup, previousScissorArea); - } - - bufferBuilder = new BufferBuilder(byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); - previousPipeline = pipeline; - previousTextureSetup = setup; - previousScissorArea = screen; - } - - state.buildVertices(bufferBuilder, 0.0F + range * 0.01F); - } - - private void recordMesh(BufferBuilder builder, RenderPipeline pipeline, TextureSetup texture, ScreenRectangle rectangle) { - var meshdata = builder.buildOrThrow(); - meshesToDraw.add(new MeshToDraw(meshdata, pipeline, texture, rectangle)); - } - - private void recordDraws() { - var map = new Object2IntOpenHashMap(); - - for (MeshToDraw item : meshesToDraw) { - var state = item.mesh.drawState(); - var vertexformat = state.format(); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - map.put(vertexformat, map.getInt(vertexformat) + state.vertexCount() * vertexformat.getVertexSize()); - } - - for (var entry : map.object2IntEntrySet()) { - var vertexformat = entry.getKey(); - int i = entry.getIntValue(); - var buffer = vertexBuffers.get(vertexformat); - if (buffer == null || buffer.size() < i) { - if (buffer != null) { - buffer.close(); - } - - vertexBuffers.put(vertexformat, new MappableRingBuffer(() -> "vertex buffer for " + vertexformat, 34, i)); - } - } - - var commandencoder = RenderSystem.getDevice().createCommandEncoder(); - map = new Object2IntOpenHashMap<>(); - - for (MeshToDraw item : meshesToDraw) { - var meshdata = item.mesh; - var state = meshdata.drawState(); - var vertexformat = state.format(); - var mappableringbuffer = vertexBuffers.get(vertexformat); - if (!map.containsKey(vertexformat)) { - map.put(vertexformat, 0); - } - - ByteBuffer bytebuffer = meshdata.vertexBuffer(); - int i = bytebuffer.remaining(); - int j = map.getInt(vertexformat); - - try (var item1 = commandencoder.mapBuffer(mappableringbuffer.currentBuffer().slice(j, i), false, true)) { - MemoryUtil.memCopy(bytebuffer, item1.data()); - } - - map.put(vertexformat, j + i); - draws.add(new Draw(mappableringbuffer.currentBuffer(), j / vertexformat.getVertexSize(), state.mode(), - state.indexCount(), item.pipeline, item.textureSetup, item.scissorArea)); - item.close(); - } - } - - private void executeDraw(Draw draw, RenderPass pass, CoreRenderTarget target, GpuBuffer buffer, VertexFormat.IndexType index) { - var renderpipeline = draw.pipeline(); - pass.setPipeline(renderpipeline); - pass.setVertexBuffer(0, draw.vertexBuffer); - var area = draw.scissorArea(); - if (area != null) { - Window window = Minecraft.getInstance().getWindow(); - - int i = target.target.height; - int j = window.getGuiScale(); - double d0 = area.left() * j; - double d1 = i - area.bottom() * j; - double d2 = area.width() * j; - double d3 = area.height() * j; - pass.enableScissor((int) d0, (int) d1, Math.max(0, (int) d2), Math.max(0, (int) d3)); - } else { - pass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - pass.bindSampler("Sampler0", draw.textureSetup.texure0()); - } - - if (draw.textureSetup.texure1() != null) { - pass.bindSampler("Sampler1", draw.textureSetup.texure1()); - } - - if (draw.textureSetup.texure2() != null) { - pass.bindSampler("Sampler2", draw.textureSetup.texure2()); - } - - pass.setIndexBuffer(buffer, index); - pass.drawIndexed(draw.baseVertex, 0, draw.indexCount, 1); - } - - private boolean scissorChanged(ScreenRectangle screen1, ScreenRectangle screen2) { - if (screen1 == screen2) { - return false; - } else { - return screen1 == null || !screen1.equals(screen2); - } - } - - @Override - public void close() { - byteBufferBuilder.close(); - - guiProjectionMatrixBuffer.close(); - - for (MappableRingBuffer mappableringbuffer : vertexBuffers.values()) { - mappableringbuffer.close(); - } - } - - record Draw(GpuBuffer vertexBuffer, int baseVertex, VertexFormat.Mode mode, int indexCount, - RenderPipeline pipeline, TextureSetup textureSetup, ScreenRectangle scissorArea) { - } - - record MeshToDraw(MeshData mesh, RenderPipeline pipeline, TextureSetup textureSetup, - ScreenRectangle scissorArea) implements AutoCloseable { - @Override - public void close() { - mesh.close(); - } - } - } -} +} \ No newline at end of file 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 45b3fe31..5f3122e6 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 @@ -3,82 +3,53 @@ package com.coloryr.allmusic.client; import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; -import com.coloryr.allmusic.client.others.ModernUI; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.FilterMode; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.MeshData; -import com.mojang.blaze3d.vertex.VertexFormat; -import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphicsExtractor; -import net.minecraft.client.gui.font.TextRenderable; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.fog.FogRenderer; -import net.minecraft.client.renderer.state.WindowRenderState; -import net.minecraft.client.renderer.state.gui.GlyphRenderState; -import net.minecraft.client.renderer.state.gui.GuiElementRenderState; -import net.minecraft.client.renderer.state.gui.GuiRenderState; import net.minecraft.network.chat.Component; -import net.minecraft.resources.Identifier; -import net.minecraft.util.profiling.Profiler; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector3f; -import org.joml.Vector4f; -import org.jspecify.annotations.Nullable; -import org.lwjgl.system.MemoryUtil; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final FogRenderer fogRenderer = new FogRenderer(); - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), 0); + entries.clear(); } @Override @@ -88,133 +59,104 @@ public class CoreRenderTarget extends TextFrameBuffer { @Override public void drawText(String text, int y, int color, boolean shadow) { - var minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - - int i = (int) minecraft.mouseHandler.getScaledXPos(window); - int j = (int) minecraft.mouseHandler.getScaledYPos(window); - - GuiGraphicsExtractor graphics = new GuiGraphicsExtractor(Minecraft.getInstance(), renderState, i, j); - color = color | 0xFF000000; - graphics.text(font, component, 0, y, color, shadow); - - renderer.render(fogRenderer.getBuffer(FogRenderer.FogMode.NONE), this); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.submitGuiElementRenderState(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView(), RenderSystem.getSamplerCache().getRepeat(FilterMode.NEAREST)), - matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.peekScissorStack())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); + Font font = Minecraft.getInstance().font; + int width = font.width(component); + if (width == 0) { return; } - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.text(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.text(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -222,285 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom).thenComparing(ScreenRectangle::left).thenComparing(ScreenRectangle::right)); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)).thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - private final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final List meshesToDraw = new ArrayList<>(); - private final ByteBufferBuilder byteBufferBuilder = new ByteBufferBuilder(786432); - private final Map vertexBuffers = new Object2ObjectOpenHashMap<>(); - private final Projection guiProjection = new Projection(); - private final ProjectionMatrixBuffer guiProjectionMatrixBuffer = new ProjectionMatrixBuffer("gui"); - private final CubeMap cubeMap = new CubeMap(Identifier.withDefaultNamespace("textures/gui/title/background/panorama")); - private ScreenRectangle previousScissorArea = null; - private RenderPipeline previousPipeline = null; - private TextureSetup previousTextureSetup = null; - private BufferBuilder bufferBuilder = null; - - public GuiRenderer(GuiRenderState renderState) { - this.renderState = renderState; - } - - public void render(GpuBufferSlice fogBuffer, CoreRenderTarget target) { - var profiler = Profiler.get(); - if (this.renderState.panoramaRenderState != null) { - this.cubeMap.render(10.0F, this.renderState.panoramaRenderState.spin()); - } - - profiler.push("allmusic text prepare"); - this.renderState.forEachText((text) -> { - var pose = text.pose; - var scissor = text.scissor; - Font.PreparedText preparedText = text.ensurePrepared(); - if (AllMusicClient.modui) { - ModernUI.text(preparedText, renderState, pose, scissor); - } else { - preparedText.visit(new Font.GlyphVisitor() { - @Override - public void acceptGlyph(TextRenderable.Styled glyph) { - renderState.addGlyphToCurrentLayer(new GlyphRenderState(pose, glyph, scissor)); - } - - @Override - public void acceptEffect(TextRenderable glyph) { - renderState.addGlyphToCurrentLayer(new GlyphRenderState(pose, glyph, scissor)); - } - }); - } - }); - this.renderState.sortElements(ELEMENT_SORT_COMPARATOR); - this.previousScissorArea = null; - this.previousPipeline = null; - this.previousTextureSetup = null; - this.bufferBuilder = null; - this.renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - this.ensureVertexBufferSizes(); - var commandEncoder = RenderSystem.getDevice().createCommandEncoder(); - var offsets = new Object2IntOpenHashMap(); - - for (var meshToDraw : this.meshesToDraw) { - var mesh = meshToDraw.mesh; - var drawState = mesh.drawState(); - var format = drawState.format(); - var vertexBuffer = this.vertexBuffers.get(format); - if (!offsets.containsKey(format)) { - offsets.put(format, 0); - } - - var meshVertexBuffer = mesh.vertexBuffer(); - int meshBufferSize = meshVertexBuffer.remaining(); - int offset = offsets.getInt(format); - - try (var mappedView = commandEncoder.mapBuffer(vertexBuffer.currentBuffer().slice(offset, meshBufferSize), false, true)) { - MemoryUtil.memCopy(meshVertexBuffer, mappedView.data()); - } - - offsets.put(format, offset + meshBufferSize); - this.draws.add(new Draw(vertexBuffer.currentBuffer(), offset / format.getVertexSize(), - drawState.mode(), drawState.indexCount(), meshToDraw.pipeline, meshToDraw.textureSetup, meshToDraw.scissorArea)); - meshToDraw.close(); - } - profiler.popPush("allmusic text draw"); - this.draw(fogBuffer, target); - profiler.popPush("allmusic text vertexBufferRotate"); - - for (MappableRingBuffer buffer : this.vertexBuffers.values()) { - buffer.rotate(); - } - - profiler.pop(); - this.draws.clear(); - this.meshesToDraw.clear(); - this.renderState.reset(); - if (SharedConstants.DEBUG_SHUFFLE_UI_RENDERING_ORDER) { - RenderPipeline.updateSortKeySeed(); - TextureSetup.updateSortKeySeed(); - } - } - - private void draw(GpuBufferSlice fogBuffer, CoreRenderTarget target) { - if (!this.draws.isEmpty()) { - var minecraft = Minecraft.getInstance(); - var windowState = minecraft.gameRenderer.getGameRenderState().windowRenderState; - this.guiProjection.setupOrtho(1000.0F, 11000.0F, (float) target.target.width / (float) windowState.guiScale, - (float) target.target.height / (float) windowState.guiScale, true); - RenderSystem.setProjectionMatrix(this.guiProjectionMatrixBuffer.getBuffer(this.guiProjection), ProjectionType.ORTHOGRAPHIC); - var mainRenderTarget = target.target; - int maxIndexCount = 0; - - for (var draw : this.draws) { - if (draw.indexCount > maxIndexCount) { - maxIndexCount = draw.indexCount; - } - } - - var autoIndices = RenderSystem.getSequentialBuffer(VertexFormat.Mode.QUADS); - var indexBuffer = autoIndices.getBuffer(maxIndexCount); - var indexType = autoIndices.type(); - var dynamicTransforms = RenderSystem.getDynamicUniforms().writeTransform((new Matrix4f()).setTranslation(0.0F, 0.0F, -11000.0F), - new Vector4f(1.0F, 1.0F, 1.0F, 1.0F), new Vector3f(), new Matrix4f()); - this.executeDrawRange(() -> "GUI before blur", mainRenderTarget, fogBuffer, dynamicTransforms, - indexBuffer, indexType, Math.min(this.meshesToDraw.size(), this.draws.size())); - } - } - - private void executeDrawRange(Supplier label, RenderTarget mainRenderTarget, GpuBufferSlice fogBuffer, - GpuBufferSlice dynamicTransforms, GpuBuffer indexBuffer, VertexFormat.IndexType indexType, int endIndex) { - try (var renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(label, mainRenderTarget.getColorTextureView(), - OptionalInt.empty(), mainRenderTarget.useDepth ? mainRenderTarget.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderPass); - renderPass.setUniform("Fog", fogBuffer); - renderPass.setUniform("DynamicTransforms", dynamicTransforms); - - for (int i = 0; i < endIndex; ++i) { - Draw draw = this.draws.get(i); - this.executeDraw(draw, renderPass, indexBuffer, indexType); - } - } - } - - private void addElementToMesh(GuiElementRenderState elementState) { - var pipeline = elementState.pipeline(); - var textureSetup = elementState.textureSetup(); - var scissorArea = elementState.scissorArea(); - if (pipeline != this.previousPipeline || this.scissorChanged(scissorArea, this.previousScissorArea) || !textureSetup.equals(this.previousTextureSetup)) { - if (this.bufferBuilder != null) { - this.recordMesh(this.bufferBuilder, this.previousPipeline, this.previousTextureSetup, this.previousScissorArea); - } - - this.bufferBuilder = new BufferBuilder(this.byteBufferBuilder, pipeline.getVertexFormatMode(), pipeline.getVertexFormat()); - this.previousPipeline = pipeline; - this.previousTextureSetup = textureSetup; - this.previousScissorArea = scissorArea; - } - - elementState.buildVertices(this.bufferBuilder); - } - - private void recordMesh(BufferBuilder bufferBuilder, RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle scissorArea) { - var mesh = bufferBuilder.build(); - if (mesh != null) { - this.meshesToDraw.add(new MeshToDraw(mesh, pipeline, textureSetup, scissorArea)); - } - - } - - private void ensureVertexBufferSizes() { - var requiredSizes = new Object2IntOpenHashMap(); - - for (var meshToDraw : this.meshesToDraw) { - var drawState = meshToDraw.mesh.drawState(); - var format = drawState.format(); - if (!requiredSizes.containsKey(format)) { - requiredSizes.put(format, 0); - } - - requiredSizes.put(format, requiredSizes.getInt(format) + drawState.vertexCount() * format.getVertexSize()); - } - - for (var entry : requiredSizes.object2IntEntrySet()) { - var vertexFormat = entry.getKey(); - int requiredSize = entry.getIntValue(); - var vertexBuffer = this.vertexBuffers.get(vertexFormat); - if (vertexBuffer == null || vertexBuffer.size() < requiredSize) { - if (vertexBuffer != null) { - vertexBuffer.close(); - } - - this.vertexBuffers.put(vertexFormat, new MappableRingBuffer(() -> "GUI vertex buffer for " + vertexFormat, 34, requiredSize)); - } - } - } - - private void executeDraw(Draw draw, RenderPass renderPass, GpuBuffer indexBuffer, VertexFormat.IndexType indexType) { - var pipeline = draw.pipeline(); - renderPass.setPipeline(pipeline); - renderPass.setVertexBuffer(0, draw.vertexBuffer); - var scissorArea = draw.scissorArea(); - if (scissorArea != null) { - this.enableScissor(scissorArea, renderPass); - } else { - renderPass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - renderPass.bindTexture("Sampler0", draw.textureSetup.texure0(), draw.textureSetup.sampler0()); - } - - if (draw.textureSetup.texure1() != null) { - renderPass.bindTexture("Sampler1", draw.textureSetup.texure1(), draw.textureSetup.sampler1()); - } - - if (draw.textureSetup.texure2() != null) { - renderPass.bindTexture("Sampler2", draw.textureSetup.texure2(), draw.textureSetup.sampler2()); - } - - renderPass.setIndexBuffer(indexBuffer, indexType); - renderPass.drawIndexed(draw.baseVertex, 0, draw.indexCount, 1); - } - - private boolean scissorChanged(@Nullable ScreenRectangle newScissor, @Nullable ScreenRectangle oldScissor) { - if (newScissor == oldScissor) { - return false; - } else if (newScissor != null) { - return !newScissor.equals(oldScissor); - } else { - return true; - } - } - - private void enableScissor(ScreenRectangle rectangle, RenderPass renderPass) { - WindowRenderState windowState = Minecraft.getInstance().gameRenderer.getGameRenderState().windowRenderState; - int windowHeight = windowState.height; - int guiScale = windowState.guiScale; - double left = rectangle.left() * guiScale; - double bottom = windowHeight - rectangle.bottom() * guiScale; - double width = rectangle.width() * guiScale; - double height = rectangle.height() * guiScale; - renderPass.enableScissor((int) left, (int) bottom, Math.max(0, (int) width), Math.max(0, (int) height)); - } - - public void close() { - this.byteBufferBuilder.close(); - this.guiProjectionMatrixBuffer.close(); - - for (MappableRingBuffer buffer : this.vertexBuffers.values()) { - buffer.close(); - } - - this.cubeMap.close(); - } - - private record Draw(GpuBuffer vertexBuffer, int baseVertex, VertexFormat.Mode mode, int indexCount, - RenderPipeline pipeline, TextureSetup textureSetup, @Nullable ScreenRectangle scissorArea) { - } - - private record MeshToDraw(MeshData mesh, RenderPipeline pipeline, TextureSetup textureSetup, - @Nullable ScreenRectangle scissorArea) implements AutoCloseable { - public void close() { - this.mesh.close(); - } - } - } -} +} \ No newline at end of file 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 e883eaf7..5f3122e6 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 @@ -4,208 +4,159 @@ import com.coloryr.allmusic.client.core.AllMusicHud; import com.coloryr.allmusic.client.core.Point2f; import com.coloryr.allmusic.client.core.render.TextFrameBuffer; import com.coloryr.allmusic.codec.HudPosType; -import com.mojang.blaze3d.GpuFormat; -import com.mojang.blaze3d.ProjectionType; -import com.mojang.blaze3d.buffers.GpuBufferSlice; -import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.pipeline.RenderTarget; -import com.mojang.blaze3d.pipeline.TextureTarget; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.systems.RenderPass; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.FilterMode; -import net.minecraft.SharedConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphicsExtractor; -import net.minecraft.client.gui.font.TextRenderable; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.render.TextureSetup; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.state.gui.GlyphRenderState; -import net.minecraft.client.renderer.state.gui.GuiElementRenderState; -import net.minecraft.client.renderer.state.gui.GuiRenderState; import net.minecraft.network.chat.Component; -import net.minecraft.resources.Identifier; -import net.minecraft.util.profiling.Profiler; -import org.joml.Matrix3x2f; -import org.joml.Matrix4f; -import org.joml.Vector4f; -import org.jspecify.annotations.Nullable; -import java.util.*; -import java.util.function.Supplier; +import java.util.ArrayList; +import java.util.List; public class CoreRenderTarget extends TextFrameBuffer { - private final RenderTarget target; - private final String name; + private static class TextEntry { + final Component component; + final int y; + final int color; + final boolean shadow; + final int width; + final int height; - private final GuiRenderer renderer; - private final GuiRenderState renderState = new GuiRenderState(); + TextEntry(Component component, int y, int color, boolean shadow, int width, int height) { + this.component = component; + this.y = y; + this.color = color; + this.shadow = shadow; + this.width = width; + this.height = height; + } + } + + private final List entries = new ArrayList<>(); + + private final boolean isState; public CoreRenderTarget(String name) { - this.name = name; - target = new TextureTarget(name, 800, 200, false, GpuFormat.RGBA8_UNORM); - renderer = new GuiRenderer(renderState); + isState = name.equals("state"); } @Override public void resize(int width, int height) { - Window window = Minecraft.getInstance().getWindow(); - - nowWidth = width * window.getGuiScale(); - nowHeight = height * window.getGuiScale(); - - if (nowWidth > target.width || nowHeight > target.height) { - target.resize(nowWidth, nowHeight); - } + nowWidth = width; + nowHeight = height; } @Override public void use() { isDraw = true; - clear(); - RenderSystem.getDevice().createCommandEncoder().clearColorTexture(target.getColorTexture(), new Vector4f(0)); + entries.clear(); } @Override public void unUse() { - renderer.render(this); isDraw = false; } @Override public void drawText(String text, int y, int color, boolean shadow) { - var minecraft = Minecraft.getInstance(); - Window window = minecraft.getWindow(); - - var font = Minecraft.getInstance().font; + color = (color & 0x00FFFFFF) | 0xFF000000; Component component = MiniMessage.parse(text); - int width = font.width(component.getVisualOrderText()); - + Font font = Minecraft.getInstance().font; + int width = font.width(component); if (width == 0) { return; } - int i = (int) minecraft.mouseHandler.getScaledXPos(window); - int j = (int) minecraft.mouseHandler.getScaledYPos(window); - - GuiGraphicsExtractor graphics = new GuiGraphicsExtractor(Minecraft.getInstance(), renderState, i, j); - color = color | 0xFF000000; - graphics.text(font, component, 0, y, color, shadow); - - TextItem item = new TextItem(width, font.lineHeight + (shadow ? 1 : 0), y, (float) window.getGuiScale()); - texts.add(item); - } - - /** - * 渲染贴图的一部分到屏幕指定位置 - * - * @param alpha 透明度 - * @param x 屏幕X坐标（左上角） - * @param y 屏幕Y坐标（左上角） - * @param width 需要渲染的宽度 - * @param height 需要渲染的高度 - * @param texX 贴图左上角X坐标 - * @param texY 贴图左上角Y坐标 - * @param scale 贴图缩放 - */ - private void draw(float alpha, float x, float y, float width, float height, float texX, float texY, float scale) { - float w = width / 2; - float h = height / 2; - - Matrix3x2f matrix = new Matrix3x2f().translation(x + w, y + h); - - float x0 = -w; - float x1 = w; - float y0 = -h; - float y1 = h; - - // 计算贴图区域UV - float u0 = texX * scale / target.width; - float v0 = 1 - (texY * scale / target.height); - float u1 = (texX + width) * scale / target.width; - float v1 = 1 - ((texY + height) * scale / target.height); - - int color = 0xFFFFFF00 + (int) (255 * alpha); - - AllMusicClient.context.submitGuiElementRenderState(new FloatRenderState(RenderPipelines.GUI_TEXTURED, - TextureSetup.singleTexture(target.getColorTextureView(), RenderSystem.getSamplerCache().getRepeat(FilterMode.NEAREST)), - matrix, x0, y0, x1, y1, u0, u1, v0, v1, color, AllMusicClient.context.peekScissorStack())); - } - - public void drawLoop(float alpha, float x, float y, - float texX, float texY, - float textWidth, float textHeight, - int maxWidth, float offsetX, float scale) { - - // 如果宽度不大于最大宽度，直接全部渲染 - if (maxWidth == -1 || textWidth <= maxWidth) { - draw(alpha, x, y, textWidth, textHeight, texX, texY, scale); - return; + int height = font.lineHeight + (shadow ? 1 : 0); + if (isState) { + y = 0; } - - if (textWidth - offsetX < maxWidth) { - float nowWith = textWidth - offsetX; - draw(alpha, x, y, nowWith, textHeight, offsetX, texY, scale); - draw(alpha, x + nowWith, y, maxWidth - nowWith, textHeight, 0, texY, scale); - } else { - draw(alpha, x, y, maxWidth, textHeight, offsetX, texY, scale); - } - } - - /** - * 居中百分比显示（根据百分比选择显示贴图的中间部分） - * - * @param alpha 透明度 - * @param startX 起始X坐标（屏幕左上角） - * @param startY 起始Y坐标（屏幕左上角） - * @param texX 贴图左上角X - * @param texY 贴图左上角Y - * @param texWidth 贴图总宽度 - * @param texHeight 贴图高度 - * @param maxWidth 最大渲染宽度 - * @param percent 百分比（0.0-1.0），0%显示左边，100%显示右边 - */ - public void drawByPercent(float alpha, float startX, float startY, - float texX, float texY, - float texWidth, float texHeight, - int maxWidth, float percent, float scale) { - - // 限制百分比范围 - percent = Math.clamp(percent, 0.0f, 1.0f); - - // 如果贴图宽度小于等于最大宽度，直接全部显示 - if (texWidth <= maxWidth) { - draw(alpha, startX, startY, texWidth * percent, texHeight, texX, texY, scale); - return; - } - - // 计算贴图的起始位置（根据百分比） - float maxOffset = texWidth - maxWidth; - float texOffset = maxOffset * percent; - - // 渲染 - draw(alpha, startX, startY, maxWidth, texHeight, texX + texOffset, texY, scale); + entries.add(new TextEntry(component, y, color, shadow, width, height)); + texts.add(new TextItem(width, height, y, 1.0f)); } @Override public void draw(float alpha, int x, int y, int maxWidth, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); + if (texts.isEmpty()) { + return; + } - drawLoop(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, getOffset(item) % item.textWidth, item.scale); + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + int scrollOffset = (int) (offsetX % entry.width); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - scrollOffset, drawY, finalColor, entry.shadow); + if (scrollOffset > 0) { + gui.text(font, entry.component, drawX - scrollOffset + entry.width, drawY, finalColor, entry.shadow); + } + gui.disableScissor(); + } else { + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + } } } @Override public void drawLine(float x, float y, float alpha, int line) { + if (texts.isEmpty()) { + return; + } if (line >= texts.size()) { return; } - TextItem item = texts.get(line); - draw(alpha, x, y, item.textWidth, item.textHeight, 0, item.y, item.scale); + if (line >= entries.size()) return; + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + TextEntry entry = entries.get(line); + gui.text(Minecraft.getInstance().font, entry.component, + (int) x, (int) (y + entry.y), + applyAlpha(entry.color, alpha), entry.shadow); + } + + @Override + public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { + if (texts.isEmpty()) { + return; + } + GuiGraphicsExtractor gui = AllMusicClient.context; + if (gui == null) return; + Font font = Minecraft.getInstance().font; + + for (TextEntry entry : entries) { + int displayWidth = maxWidth != -1 ? Math.min(entry.width, maxWidth) : entry.width; + Point2f point = AllMusicHud.getPos(displayWidth, entry.height, x, y, dir); + + int drawX = (int) point.x; + int drawY = (int) (point.y + entry.y); + int finalColor = applyAlpha(entry.color, alpha); + + if (maxWidth != -1 && entry.width > maxWidth) { + float maxOffset = entry.width - maxWidth; + float texOffset = maxOffset * state; + int revealWidth = (int) (maxWidth * state); + + gui.enableScissor(drawX, Math.max(0, drawY), drawX + maxWidth, drawY + entry.height); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX - (int) texOffset, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } else { + int revealWidth = (int) (entry.width * state); + gui.enableScissor(drawX, Math.max(0, drawY), drawX + revealWidth, drawY + entry.height); + gui.text(font, entry.component, drawX, drawY, finalColor, entry.shadow); + gui.disableScissor(); + } + } } @Override @@ -213,199 +164,15 @@ public class CoreRenderTarget extends TextFrameBuffer { if (line >= texts.size()) { return new Point2f(0, 0); } - TextItem item = texts.get(line); - return new Point2f(item.textWidth, item.textHeight); + if (line >= entries.size()) return new Point2f(0, 0); + TextEntry entry = entries.get(line); + return new Point2f(entry.width, entry.height); } - - @Override - public void drawWithState(float alpha, int x, int y, int maxWidth, float state, HudPosType dir) { - for (var item : texts) { - Point2f point = AllMusicHud.getPos(Math.min(maxWidth, item.textWidth), item.textHeight, x, y, dir); - - drawByPercent(alpha, point.x, point.y + item.y, 0, item.y, item.textWidth, item.textHeight, maxWidth, state, item.scale); - } + private static int applyAlpha(int color, float alpha) { + int a = (int) (alpha * 255); + if (a < 0) a = 0; + if (a > 255) a = 255; + return (color & 0x00FFFFFF) | (a << 24); } - - public static class GuiRenderer implements AutoCloseable { - private static final Comparator SCISSOR_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(ScreenRectangle::top) - .thenComparing(ScreenRectangle::bottom).thenComparing(ScreenRectangle::left).thenComparing(ScreenRectangle::right)); - private static final Comparator TEXTURE_COMPARATOR = Comparator.nullsFirst(Comparator.comparing(TextureSetup::getSortKey)); - private static final Comparator ELEMENT_SORT_COMPARATOR; - private final GuiRenderState renderState; - private final List draws = new ArrayList<>(); - private final StagedVertexBuffer vertexBuffer = new StagedVertexBuffer(() -> "GUI Vertex Buffer", 786432); - private final Projection guiProjection = new Projection(); - private final ProjectionMatrixBuffer guiProjectionMatrixBuffer = new ProjectionMatrixBuffer("gui"); - private final CubeMap cubeMap = new CubeMap(Identifier.withDefaultNamespace("textures/gui/title/background/panorama")); - private @Nullable ScreenRectangle previousScissorArea = null; - private @Nullable RenderPipeline previousPipeline = null; - private @Nullable TextureSetup previousTextureSetup = null; - private StagedVertexBuffer.@Nullable Draw previousDraw; - - public GuiRenderer(final GuiRenderState renderState) { - this.renderState = renderState; - } - - public void render(CoreRenderTarget target) { - var profiler = Profiler.get(); - if (this.renderState.panoramaRenderState != null) { - this.cubeMap.render(10.0F, this.renderState.panoramaRenderState.spin()); - } - - profiler.push("prepare"); - this.prepare(); - profiler.popPush("upload"); - this.vertexBuffer.upload(); - profiler.popPush("draw"); - this.draw(target); - profiler.popPush("endFrame"); - this.vertexBuffer.endDraw(); - this.vertexBuffer.endFrame(); - this.draws.clear(); - this.renderState.reset(); - if (SharedConstants.DEBUG_SHUFFLE_UI_RENDERING_ORDER) { - RenderPipeline.updateSortKeySeed(); - TextureSetup.updateSortKeySeed(); - } - - profiler.pop(); - } - - private void prepare() { - this.prepareText(); - this.renderState.sortElements(ELEMENT_SORT_COMPARATOR); - this.addElementsToMeshes(); - } - - private void addElementsToMeshes() { - this.previousScissorArea = null; - this.previousPipeline = null; - this.previousTextureSetup = null; - this.previousDraw = null; - this.renderState.forEachElement(this::addElementToMesh, GuiRenderState.TraverseRange.BEFORE_BLUR); - } - - private void draw(CoreRenderTarget target) { - if (!this.draws.isEmpty()) { - var minecraft = Minecraft.getInstance(); - var windowState = minecraft.gameRenderer.gameRenderState().windowRenderState; - this.guiProjection.setupOrtho(1000.0F, 11000.0F, (float) target.target.width / (float) windowState.guiScale, - (float) target.target.height / (float) windowState.guiScale, true); - RenderSystem.setProjectionMatrix(this.guiProjectionMatrixBuffer.getBuffer(this.guiProjection), ProjectionType.ORTHOGRAPHIC); - var mainRenderTarget = target.target; - var dynamicTransforms = RenderSystem.getDynamicUniforms().writeTransform((new Matrix4f()).setTranslation(0.0F, 0.0F, -11000.0F)); - if (!this.draws.isEmpty()) { - this.executeDrawRange(() -> "GUI before blur", mainRenderTarget, dynamicTransforms, this.draws.size()); - } - } - } - - private void executeDrawRange(Supplier label, RenderTarget mainRenderTarget, GpuBufferSlice dynamicTransforms, int endIndex) { - try (var renderPass = RenderSystem.getDevice().createCommandEncoder() - .createRenderPass(label, mainRenderTarget.getColorTextureView(), - Optional.empty(), mainRenderTarget.useDepth ? mainRenderTarget.getDepthTextureView() : null, OptionalDouble.empty())) { - RenderSystem.bindDefaultUniforms(renderPass); - renderPass.setUniform("DynamicTransforms", dynamicTransforms); - - for (int i = 0; i < endIndex; ++i) { - Draw draw = this.draws.get(i); - this.executeDraw(draw, renderPass); - } - } - } - - private void addElementToMesh(final GuiElementRenderState elementState) { - var pipeline = elementState.pipeline(); - var textureSetup = elementState.textureSetup(); - var scissorArea = elementState.scissorArea(); - if (this.previousDraw == null || pipeline != this.previousPipeline || this.scissorChanged(scissorArea, this.previousScissorArea) || !textureSetup.equals(this.previousTextureSetup)) { - this.previousPipeline = pipeline; - this.previousTextureSetup = textureSetup; - this.previousScissorArea = scissorArea; - this.previousDraw = this.vertexBuffer.appendDraw(pipeline.getVertexFormatBinding(0), pipeline.getPrimitiveTopology()); - this.draws.add(new Draw(this.previousDraw, pipeline, textureSetup, scissorArea)); - } - - elementState.buildVertices(this.vertexBuffer.getVertexBuilder(Objects.requireNonNull(this.previousDraw))); - } - - private void prepareText() { - this.renderState.forEachText((text) -> { - var pose = text.pose; - var scissor = text.scissor; - text.ensurePrepared().visit(new Font.GlyphVisitor() { - public void acceptRenderable(final TextRenderable renderable) { - renderState.addGlyphToCurrentLayer(new GlyphRenderState(pose, renderable, scissor)); - } - }); - }); - } - - private void executeDraw(final Draw draw, final RenderPass renderPass) { - var executeInfo = this.vertexBuffer.getExecuteInfo(draw.draw); - if (executeInfo != null) { - var pipeline = draw.pipeline(); - renderPass.setPipeline(pipeline); - renderPass.setVertexBuffer(0, executeInfo.vertexBuffer().slice()); - var scissorArea = draw.scissorArea(); - if (scissorArea != null) { - this.enableScissor(scissorArea, renderPass); - } else { - renderPass.disableScissor(); - } - - if (draw.textureSetup.texure0() != null) { - renderPass.bindTexture("Sampler0", draw.textureSetup.texure0(), draw.textureSetup.sampler0()); - } - - if (draw.textureSetup.texure1() != null) { - renderPass.bindTexture("Sampler1", draw.textureSetup.texure1(), draw.textureSetup.sampler1()); - } - - if (draw.textureSetup.texure2() != null) { - renderPass.bindTexture("Sampler2", draw.textureSetup.texure2(), draw.textureSetup.sampler2()); - } - - renderPass.setIndexBuffer(executeInfo.indexBuffer(), executeInfo.indexType()); - renderPass.drawIndexed(executeInfo.indexCount(), 1, executeInfo.firstIndex(), executeInfo.baseVertex(), 0); - } - } - - private boolean scissorChanged(final @Nullable ScreenRectangle newScissor, final @Nullable ScreenRectangle oldScissor) { - if (newScissor == oldScissor) { - return false; - } else if (newScissor != null) { - return !newScissor.equals(oldScissor); - } else { - return true; - } - } - - private void enableScissor(final ScreenRectangle rectangle, final RenderPass renderPass) { - var window = Minecraft.getInstance().gameRenderer.gameRenderState().windowRenderState; - int guiScale = window.guiScale; - double left = (rectangle.left() * guiScale); - double top = (rectangle.top() * guiScale); - double right = Math.min(rectangle.right() * guiScale, window.width); - double bottom = Math.min(rectangle.bottom() * guiScale, window.height); - renderPass.enableScissor((int) left, window.height - (int) bottom, Math.max(0, (int) (right - left)), Math.max(0, (int) (bottom - top))); - } - - public void close() { - this.vertexBuffer.close(); - this.guiProjectionMatrixBuffer.close(); - this.cubeMap.close(); - } - - static { - ELEMENT_SORT_COMPARATOR = Comparator.comparing(GuiElementRenderState::scissorArea, SCISSOR_COMPARATOR) - .thenComparing(GuiElementRenderState::pipeline, Comparator.comparing(RenderPipeline::getSortKey)) - .thenComparing(GuiElementRenderState::textureSetup, TEXTURE_COMPARATOR); - } - - private record Draw(StagedVertexBuffer.Draw draw, RenderPipeline pipeline, TextureSetup textureSetup, - @Nullable ScreenRectangle scissorArea) { - } - } -} +} \ No newline at end of file diff --git a/onejar/fabric_1_20_1/build.gradle.kts b/onejar/fabric_1_20_1/build.gradle.kts new file mode 100644 index 00000000..649bb783 --- /dev/null +++ b/onejar/fabric_1_20_1/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + id("fabric-loom") version Versions.fabricLoom +} + +// 直接引用 client 和 server 模块的源码目录，无需手动复制 +val clientSourceDir = project(":client:fabric_1_20_1").projectDir.resolve("src/main/java") +val serverSourceDir = project(":server:fabric_1_20_1").projectDir.resolve("src/main/java") +val clientResDir = project(":client:fabric_1_20_1").projectDir.resolve("src/main/resources") +val serverResDir = project(":server:fabric_1_20_1").projectDir.resolve("src/main/resources") + +sourceSets { + main { + java { + setSrcDirs(listOf(clientSourceDir, serverSourceDir)) + } + resources { + setSrcDirs(listOf( + file("src/main/resources"), // onejar 自己的合并资源（fabric.mod.json） + clientResDir, + serverResDir + )) + } + } +} + +dependencies { + minecraft("com.mojang:minecraft:1.20.1") + mappings(loom.officialMojangMappings()) + modImplementation("net.fabricmc:fabric-loader:0.16.10") + + modImplementation("net.fabricmc.fabric-api:fabric-api:0.92.3+1.20.1") + + modImplementation(include("net.kyori:adventure-platform-fabric:5.9.0")!!) +} + +tasks { + processResources { + // onejar 自己的 fabric.mod.json 优先（排在 srcDirs 第一位）， + // client/server 的 fabric.mod.json 作为重复项被排除 + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + filesMatching("fabric.mod.json") { + expand( + "version" to project.version + ) + } + } + + remapJar { + inputFile.set(shadowJar.get().archiveFile) + + archiveFileName.set("[fabric-1.20.1]AllMusic-${project.version}.jar") + destinationDirectory.set(file("${parent!!.projectDir}/../build")) + } + + build { + dependsOn(remapJar) + } +} diff --git a/onejar/fabric_1_20_1/src/main/resources/assets/allmusic/icon.png b/onejar/fabric_1_20_1/src/main/resources/assets/allmusic/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b2b5fa790ca8e14661cd169aa56e1ca5dd818a76 GIT binary patch literal 32781 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 literal 0 HcmV?d00001 diff --git a/onejar/fabric_1_20_1/src/main/resources/fabric.mod.json b/onejar/fabric_1_20_1/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..22b23486 --- /dev/null +++ b/onejar/fabric_1_20_1/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "allmusic_client", + "version": "${version}", + "name": "AllMusic Client", + "description": "AllMusic Client Mod", + "authors": [ + "Color_yr" + ], + "contact": { + "homepage": "https://github.com/Coloryr/AllMusic", + "sources": "https://github.com/Coloryr/AllMusic" + }, + "license": "GPL-3.0", + "icon": "assets/allmusic/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "com.coloryr.allmusic.server.AllMusicServer" + ], + "client": [ + "com.coloryr.allmusic.client.AllMusicClient" + ] + }, + "mixins": [ + "allmusic_server.mixins.json", + "allmusic_client.mixins.json" + ], + "depends": { + "fabricloader": ">=0.19.3", + "fabric": "*", + "minecraft": ">=1.16" + }, + "suggests": {} +} diff --git a/server/fabric_1_16_5/src/main/resources/fabric.mod.json b/server/fabric_1_16_5/src/main/resources/fabric.mod.json index 0c02766e..ee75526a 100644 --- a/server/fabric_1_16_5/src/main/resources/fabric.mod.json +++ b/server/fabric_1_16_5/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "adventure-platform-fabric.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.19.3", "fabric": "*", "minecraft": ">=1.16" }, diff --git a/server/fabric_1_20_1/src/main/resources/fabric.mod.json b/server/fabric_1_20_1/src/main/resources/fabric.mod.json index c5b0b45b..b06238f8 100644 --- a/server/fabric_1_20_1/src/main/resources/fabric.mod.json +++ b/server/fabric_1_20_1/src/main/resources/fabric.mod.json @@ -23,10 +23,9 @@ "allmusic_server.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.19.3", "fabric-api": "*", - "minecraft": "~1.20", - "java": ">=17" + "minecraft": "~1.20" }, "suggests": { } diff --git a/server/fabric_1_21/src/main/resources/fabric.mod.json b/server/fabric_1_21/src/main/resources/fabric.mod.json index eefebd6e..fe591676 100644 --- a/server/fabric_1_21/src/main/resources/fabric.mod.json +++ b/server/fabric_1_21/src/main/resources/fabric.mod.json @@ -26,9 +26,8 @@ "allmusic_server.mixins.json" ], "depends": { - "fabricloader": ">=0.15.11", + "fabricloader": ">=0.19.3", "minecraft": ">=1.21", - "java": ">=21", "fabric-api": "*" }, "suggests": { diff --git a/server/fabric_1_21_11/src/main/resources/fabric.mod.json b/server/fabric_1_21_11/src/main/resources/fabric.mod.json index c6001cf3..b77d1c66 100644 --- a/server/fabric_1_21_11/src/main/resources/fabric.mod.json +++ b/server/fabric_1_21_11/src/main/resources/fabric.mod.json @@ -29,9 +29,8 @@ } ], "depends": { - "fabricloader": ">=0.18.4", + "fabricloader": ">=0.19.3", "minecraft": ">=1.21.11", - "java": ">=21", "fabric-api": "*" }, "suggests": { diff --git a/server/fabric_1_21_6/src/main/resources/fabric.mod.json b/server/fabric_1_21_6/src/main/resources/fabric.mod.json index 17208733..4953f884 100644 --- a/server/fabric_1_21_6/src/main/resources/fabric.mod.json +++ b/server/fabric_1_21_6/src/main/resources/fabric.mod.json @@ -29,9 +29,8 @@ } ], "depends": { - "fabricloader": ">=0.16.14", + "fabricloader": ">=0.19.3", "minecraft": ">=1.21.6", - "java": ">=21", "fabric-api": "*" }, "suggests": { diff --git a/server/fabric_26_1/src/main/resources/fabric.mod.json b/server/fabric_26_1/src/main/resources/fabric.mod.json index 4f152853..648c6821 100644 --- a/server/fabric_26_1/src/main/resources/fabric.mod.json +++ b/server/fabric_26_1/src/main/resources/fabric.mod.json @@ -29,9 +29,8 @@ } ], "depends": { - "fabricloader": ">=0.18.3", + "fabricloader": ">=0.19.3", "minecraft": ">=26.1", - "java": ">=25", "fabric-api": "*" }, "suggests": { diff --git a/server/fabric_26_2/src/main/resources/fabric.mod.json b/server/fabric_26_2/src/main/resources/fabric.mod.json index fc00108e..6ac18ec3 100644 --- a/server/fabric_26_2/src/main/resources/fabric.mod.json +++ b/server/fabric_26_2/src/main/resources/fabric.mod.json @@ -31,7 +31,6 @@ "depends": { "fabricloader": ">=0.19.3", "minecraft": ">=26.2", - "java": ">=25", "fabric-api": "*" }, "suggests": { diff --git a/settings.gradle.kts b/settings.gradle.kts index 01c5b8dc..844f0048 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -58,6 +58,7 @@ include(":server:velocity") include(":onejar") include(":onejar:fabric_1_16_5") +include(":onejar:fabric_1_20_1") pluginManagement { repositories {