修修修

src/main/java/com/extendedae_plus/mixin/ae2/AEBaseScreenMixin.java

@@ -1,12 +1,20 @@
 package com.extendedae_plus.mixin.ae2;
 
 import appeng.client.gui.AEBaseScreen;
+import appeng.client.gui.TextOverride;
+import appeng.client.Point;
 import appeng.client.gui.style.PaletteColor;
 import appeng.client.gui.style.ScreenStyle;
+import appeng.client.gui.style.Text;
+import appeng.client.gui.style.TextAlignment;
 import com.extendedae_plus.api.ExPatternPageAccessor;
 import com.glodblock.github.extendedae.client.gui.GuiExPatternProvider;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.Rect2i;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.contents.TranslatableContents;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -57,20 +65,84 @@ public abstract class AEBaseScreenMixin {
         return net.minecraft.client.Minecraft.getInstance().font;
     }
 
-    // 在标签绘制后追加页码绘制，仅限扩展样板供应器界面
+    // 在 AEBaseScreen.drawText 完成某个文本绘制后，若该文本为“样板”标签，则紧接着绘制页码。
-    @Inject(method = "renderLabels", at = @At("TAIL"), remap = false)
+    @Inject(method = "drawText", at = @At("TAIL"), remap = false)
-    private void eap$renderPageIndicator(GuiGraphics guiGraphics, int x, int y, CallbackInfo ci) {
+    private void eap$appendPageAfterPatternsLabel(GuiGraphics guiGraphics,
+                                                 Text text,
+                                                 @Nullable TextOverride override,
+                                                 CallbackInfo ci) {
         Object self = this;
         if (!(self instanceof GuiExPatternProvider)) {
             return;
         }
+
+        try {
+            // 解析最终用于显示的标签内容
+            Component content = text.getText();
+            if (override != null && override.getContent() != null) {
+                content = override.getContent().copy().withStyle(content.getStyle());
+            }
+
+            // 计算“样板”文本起点与宽度，按对齐方式与缩放修正 x/y
+            int imageWidth = eap$getIntField(self, "imageWidth", 0);
+            int imageHeight = eap$getIntField(self, "imageHeight", 0);
+            Rect2i bounds = new Rect2i(0, 0, imageWidth, imageHeight);
+            Point pos = text.getPosition().resolve(bounds);
+
+            float scale = text.getScale();
+
+            Font font = eap$getFont(self);
+            // 只关心第一行（标题类文本无换行或 maxWidth<=0）
+            var contentLine = (text.getMaxWidth() <= 0)
+                    ? content.getVisualOrderText()
+                    : font.split(content, text.getMaxWidth()).get(0);
+            int lineWidth = font.width(contentLine);
+
+            int x = pos.getX();
+            int y = pos.getY();
+            // 对齐修正
+            var align = text.getAlign();
+            if (align == TextAlignment.CENTER) {
+                int textPx = Math.round(lineWidth * scale);
+                x -= textPx / 2;
+            } else if (align == TextAlignment.RIGHT) {
+                int textPx = Math.round(lineWidth * scale);
+                x -= textPx;
+            }
+
+            // 判断是否为“样板”组标题（多语言兼容且避免标题）
+            boolean isPatterns = false;
+            // 1) 基于翻译键
+            var contents = content.getContents();
+            if (contents instanceof TranslatableContents tc) {
+                String key = tc.getKey();
+                if (key != null && key.endsWith(".patterns")) {
+                    isPatterns = true;
+                }
+            }
+            // 2) 基于已知本地化键的字符串解析
+            if (!isPatterns) {
+                String label = content.getString();
+                if (label != null) {
+                    if (label.equals(Component.translatable("gui.pattern_provider.patterns").getString())) isPatterns = true;
+                    else if (label.equals(Component.translatable("gui.extendedae.patterns").getString())) isPatterns = true;
+                    else if (label.equals(Component.translatable("gui.ae2.patterns").getString())) isPatterns = true;
+                }
+            }
+            // 3) 容错：中文“样板”且在标题下方（放宽到 y>=14）或文本正好等于“样板”
+            if (!isPatterns) {
+                String s = content.getString();
+                if (s != null && ("样板".equals(s) || (s.contains("样板") && y >= 14))) {
+                    isPatterns = true;
+                }
+            }
+            if (!isPatterns) return;
+
             int cur = 1;
             int max = 1;
-        try {
             if (self instanceof ExPatternPageAccessor accessor) {
                 cur = Math.max(0, accessor.eap$getCurrentPage()) + 1;
             }
-            // 读取最大页（从 GUI 本地字段）
             try {
                 var fMax = self.getClass().getDeclaredField("eap$maxPageLocal");
                 fMax.setAccessible(true);
@@ -80,23 +152,25 @@ public abstract class AEBaseScreenMixin {
                 }
             } catch (Throwable ignored) {}
 
-            ScreenStyle style = eap$getStyle(self);
+            String pageText = "第"+cur+"页" + "/" + max + "页";
-            Font font = eap$getFont(self);
-            int leftPos = eap$getIntField(self, "leftPos", 0);
-            int topPos = eap$getIntField(self, "topPos", 0);
-            int imageWidth = eap$getIntField(self, "imageWidth", 0);
 
-            String text = cur + "/" + max;
+            ScreenStyle style = eap$getStyle(self);
-            int tx = leftPos + imageWidth - font.width(text) - 6;
-            int ty = topPos + 6;
             int color = 0xFFFFFFFF;
             if (style != null) {
                 try {
-                    color = style.getColor(PaletteColor.MUTED_TEXT_COLOR).toARGB();
+                    color = style.getColor(PaletteColor.DEFAULT_TEXT_COLOR).toARGB();
                 } catch (Throwable ignored) {}
             }
-            guiGraphics.drawString(font, text, tx, ty, color, false);
+            int padding = 4;
-        } catch (Throwable ignored) {
+            if (scale == 1.0f) {
-        }
+                guiGraphics.drawString(font, pageText, x + lineWidth + padding, y, color, false);
+            } else {
+                guiGraphics.pose().pushPose();
+                guiGraphics.pose().translate(x, y, 1);
+                guiGraphics.pose().scale(scale, scale, 1);
+                guiGraphics.drawString(font, pageText, lineWidth + padding, 0, color, false);
+                guiGraphics.pose().popPose();
+            }
+        } catch (Throwable ignored) {}
     }
 }