From 002f490a142cbed6fb61b3b039234d001b02b02b Mon Sep 17 00:00:00 2001
From: GaLicn <133291877+GaLicn@users.noreply.github.com>
Date: Thu, 11 Dec 2025 22:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LabeledWirelessTransceiverScreen.java     |  60 ++++++++++--------
 .../gui/lable_wireless_transceiver_gui.png    | Bin 1296 -> 2464 bytes
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java b/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java
index 2578442..f1597dd 100644
--- a/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java
+++ b/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java
@@ -21,12 +21,12 @@ import java.util.List;
 
 /**
  * 标签无线收发器屏幕（UI 占位，等待按钮布局）。
- * 纹理：textures/gui/lable_wireless_transceiver_gui.png，尺寸 194x156。
+ * 纹理：textures/gui/lable_wireless_transceiver_gui.png，尺寸 256x156。
  */
 public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<LabeledWirelessTransceiverMenu> {
     private static final ResourceLocation TEX = ExtendedAEPlus.id("textures/gui/lable_wireless_transceiver_gui.png");
-    private static final int BTN_U = 197;
-    private static final int BTN_V = 54;
+    private static final int BTN_U = 2;
+    private static final int BTN_V = 159;
     private static final int BTN_W = 28;
     private static final int BTN_H = 16;
     private static final int TEX_W = 256;
@@ -34,14 +34,15 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
 
     private static final int LIST_X = 8;
     private static final int LIST_Y = 21;
-    private static final int LIST_W = 100;
+    private static final int LIST_W = 112; // 119-8+1
     private static final int LIST_H = 121; // 141-21+1
     private static final int ROW_H = 12;
     private static final int VISIBLE_ROWS = LIST_H / ROW_H; // 10
-    private static final int SCROLL_X = 111;
+    private static final int SCROLL_X = 123;
     private static final int SCROLL_Y = 21;
     private static final int SCROLL_W = 6;
     private static final int SCROLL_H = LIST_H;
+    private static final int INFO_MAX_WIDTH = 116; // 信息区实际宽度(249-134+1=116)
 
     private EditBox searchBox;
     private ImageButton newBtn;
@@ -62,7 +63,7 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
 
     public LabeledWirelessTransceiverScreen(LabeledWirelessTransceiverMenu menu, Inventory inv, Component title) {
         super(menu, inv, title);
-        this.imageWidth = 194;
+        this.imageWidth = 256;
         this.imageHeight = 156;
         this.inventoryLabelY = this.imageHeight; // 不显示玩家物品栏标签
         this.bePos = menu.getBlockEntityPos();
@@ -71,10 +72,10 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
     @Override
     protected void init() {
         super.init();
-        // 搜索框：起点(78,4) 终点(189,15) => 宽112 高12
-        int sx = this.leftPos + 78;
-        int sy = this.topPos + 4;
-        this.searchBox = new EditBox(this.font, sx, sy, 112, 12, Component.empty());
+        // 搜索框：起点(134,23) 终点(249,31) => 宽116 高9（取整为9）
+        int sx = this.leftPos + 134;
+        int sy = this.topPos + 23;
+        this.searchBox = new EditBox(this.font, sx, sy, 116, 9, Component.empty());
         this.searchBox.setBordered(false);
         this.searchBox.setMaxLength(64);
         this.searchBox.setVisible(true);
@@ -84,10 +85,10 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
         });
         this.addRenderableWidget(this.searchBox);
 
-        int startX = this.leftPos + 124;
-        int startY = this.topPos + 91;
-        int hGap = 8;
-        int vGap = 10;
+        int startX = this.leftPos + 145;
+        int startY = this.topPos + 101;
+        int hGap = 30;
+        int vGap = 8;
         int secondColX = startX + BTN_W + hGap;
         int secondRowY = startY + BTN_H + vGap;
 
@@ -124,7 +125,7 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
         // 左上角标题
         gfx.drawString(this.font, this.title, 8, 8, 0x404040, false);
         // 右侧信息区标题
-        gfx.drawString(this.font, Component.translatable("gui.extendedae_plus.labeled_wireless.info"), 124, 24, 0x404040, false);
+        gfx.drawString(this.font, Component.translatable("gui.extendedae_plus.labeled_wireless.info"), 134, 8, 0x404040, false);
     }
 
     @Override
@@ -134,11 +135,11 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
 
         // 占位绘制：列表和信息区内的内容框线
         // 标签列表区域
-        gfx.fill(this.leftPos + 8, this.topPos + 21, this.leftPos + 107 + 1, this.topPos + 141 + 1, 0x20FFFFFF);
+        gfx.fill(this.leftPos + 8, this.topPos + 21, this.leftPos + 119 + 1, this.topPos + 141 + 1, 0x20FFFFFF);
         // 滚动条区域
-        gfx.fill(this.leftPos + 111, this.topPos + 21, this.leftPos + 116 + 1, this.topPos + 141 + 1, 0x20000000);
+        gfx.fill(this.leftPos + 123, this.topPos + 21, this.leftPos + 128 + 1, this.topPos + 141 + 1, 0x20000000);
         // 当前收发器信息区域
-        gfx.fill(this.leftPos + 121, this.topPos + 21, this.leftPos + 189 + 1, this.topPos + 76 + 1, 0x10FFFFFF);
+        gfx.fill(this.leftPos + 134, this.topPos + 41, this.leftPos + 249 + 1, this.topPos + 92 + 1, 0x10FFFFFF);
 
         renderList(gfx);
         renderScrollBar(gfx);
@@ -201,16 +202,16 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
         }
 
         // 信息显示
-        int infoX = this.leftPos + 124;
-        int infoY = this.topPos + 36;
+        int infoX = this.leftPos + 134;
+        int infoY = this.topPos + 41;
         String labelLine = Component.translatable("gui.extendedae_plus.labeled_wireless.current_label").getString() + ": " + (currentLabel == null || currentLabel.isEmpty() ? "-" : currentLabel);
         String ownerLine = Component.translatable("gui.extendedae_plus.labeled_wireless.current_owner").getString() + ": " + (currentOwner == null || currentOwner.isEmpty() ? Component.translatable("extendedae_plus.jade.owner.public").getString() : currentOwner);
         Component channelComp = maxChannels <= 0
                 ? Component.translatable("extendedae_plus.jade.channels", usedChannels)
                 : Component.translatable("extendedae_plus.jade.channels_of", usedChannels, maxChannels);
-        gfx.drawString(this.font, labelLine, infoX, infoY, 0x404040, false);
-        gfx.drawString(this.font, ownerLine, infoX, infoY + 12, 0x404040, false);
-        gfx.drawString(this.font, channelComp, infoX, infoY + 24, 0x404040, false);
+        gfx.drawString(this.font, trimInfo(labelLine), infoX, infoY, 0x404040, false);
+        gfx.drawString(this.font, trimInfo(ownerLine), infoX, infoY + 12, 0x404040, false);
+        gfx.drawString(this.font, trimInfo(channelComp.getString()), infoX, infoY + 24, 0x404040, false);
     }
 
     private void renderScrollBar(GuiGraphics gfx) {
@@ -342,10 +343,10 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
 
     private void drawAllButtonText(GuiGraphics gfx) {
         // 按钮文本（24px 内居中，避免溢出）。放在 super.render 之后，确保绘制在按钮纹理之上。
-        int startX = this.leftPos + 124;
-        int startY = this.topPos + 91;
-        int hGap = 8;
-        int vGap = 10;
+        int startX = this.leftPos + 145;
+        int startY = this.topPos + 101;
+        int hGap = 30;
+        int vGap = 8;
         int secondColX = startX + BTN_W + hGap;
         int secondRowY = startY + BTN_H + vGap;
 
@@ -372,4 +373,9 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
             scrollOffset = Math.min(maxOffset, targetRow - VISIBLE_ROWS + 1);
         }
     }
+
+    private String trimInfo(String text) {
+        if (text == null) return "";
+        return this.font.plainSubstrByWidth(text, INFO_MAX_WIDTH);
+    }
 }
diff --git a/src/main/resources/assets/extendedae_plus/textures/gui/lable_wireless_transceiver_gui.png b/src/main/resources/assets/extendedae_plus/textures/gui/lable_wireless_transceiver_gui.png
index 6fb7716a6ecc909dca0104ada22244af654f8dab..2e72cc53777fe1302cc4a0168e7d74c288568be3 100644
GIT binary patch
literal 2464
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJFFbWaz@kP61PcWnEogi5eI
zIQoIv<XTXKgY#nhgo($_tzZ<+k`_*0IJI?aYwJZPPm_!G3p%B&>>s)7WU7ccByPOs
z_Mb70Lq}#>`T3ORGb`_X-XqS-SNv?w^O)^-63f+#Up;C)UH<Kll0(8orsd(=|Gm34
zy?f6dZ{dhd2Ttqn-B-SyA&g^tp1jV@Lw7lKydK=SX<YvP_mM?;Z#S`Um@siIc=(~=
zz$O-v1DigTMKkp_FlAWSC~VMSWZkf4&)sPb$_p5z`1m<=yd4;IwDY&CUf|GZXgkcz
zbXq8Y;q<B7xtvrrg3n$k=hdz6_Es6MD(mg?8{6$)<!YU7zrH5Vcx&E0bJJM=2N&mr
zzuwKdA?nM!>hSRWKTT&GV1K{AGUbu`=9)XRu6E1CmZvD!8%#M6axPo+K!CYvPRD`b
z^Yi&{9#{J;7QpcNoO+E_{l>$d?e_}SGJUW=dqGlq-hm|z^O<}uRWv!&GO`BPC!4Dn
zXf9w-%d~M^u&;q>#r%!ZLNi1H7$%#{QwWH6V7zkv1}~=%*P5@%2Tq1pFIsb8s`u~I
z_s^2}fq}@({lC=zLE(GJ_Tb<H(-};QOSPG@IW-!#&d^Z`2nOmsb9F7p8r201*OE4M
zIQTN&XIV4zwcGYjjSA8q&we}F|NGfGrWv_0JDYzxOo;ja;_`Akfg{ryE?)YkY%rmr
zo{>l7nx6YtNrBy0&RL({&+zHZTpxv42gW7t2@Fh?Ok4`*@1111#46%Y#logAL4Cof
zf&mW)zvcc34Ut?iJGa=M-pM1Xy?`Of*85G_>u-*o)jM3`foY^xS({^uXaGa%;!;B<
zU;?~gzNyI}5||LpqQsRihzE=+piww9UjD0ET^+9XcKzlvvlv-YEFC<oWj01L01L}E
z1v2ir!4A`IUy&`&k7w$cIeR5%3$Wx9aGNb40nEmf3q1I+_Q3OV^CUmBEmL!NaD=Ix
z`@v=Xb#p72^;H}aVi<vT&YpXcGe@TYT)dmzJIcnwA)w&Uz`)4F!oj0d@ao^3-T#6f
zJdfXRXY>0XPo26$!gi*1d$t(a-`A}3-#_`{Z}+Q0{kcU8L*rxCSxgbSf1ls~-&cRM
z?Y!OJE0d+)J$TB(;llaDFk#A)S`HqK1q^IFXHT#!Vi9qmT%d1{=#A*o#Tjp%6aF#z
zGXD8-`TghlH(FRYS~yKu3qBwFx}i7M1>zHsmk!9V^4U*4uFiDUP|jHJ#yW@3whia&
zerD}ne)sm@Uh%lwCoTCD9UfFPE@KGuuK)e{hj`AfH~)V6mVc;X0=jsQpoZ5aI~F!z
z3C-M=mckSWEC(qUaKFd(X6>%PE#DLk>VX!otNU^IkGh#6BU2*CM}==cWB8#)>4HqK
zp>U%tr^$WhijPyn%ZuK8zhAd`a<Pn4!-0=LZEL2<{rUR+<N6yPZW^Dr+x(C(&ac5?
zN`pC*tLLru0}V`E2?s9p_$YWeFuIT};C_$u#oQ|9Wf>_<>LM9j3Agi^?H=~TxiuV^
x#xjd(N9E&R)A}~*f)WutH4S}6V=l)Z{v|buhrLtx7y?^f44$rjF6*2UngE+>Y9ast

literal 1296
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJEiqn<8~Ar*7p+_B9MEoC_V
z(cUwjp(T=yJtF1{Ye?*!o>^I!ZXP{iaNx;<HxCjL9E5zo@MbVAlXj}%Q0_j`SXQvY
zxUqaeBiqE+dlzmuzcH`Qe*QxLoiB@Sz2E!%$({SRX0PA>|2o4l|NS-fk1jqB{jWan
z&pgeD>Msx5*XFZN+57oh`}vyse~(%V1;X`W<$^bTd(!=O?p;RL=jZ0l{Qdbizg%DH
z9J|sYpR>0ZHnBWt5VOrT;EntEPOw3==F`io2fx((yLr6XmT5y%czkv0fhn8}Ef`40
z;AnL9bX5j}<7cC{yEihdNhnUPEwH(}yE<Kj;{fB%>3@FAy7c>JxGIBy8iRrIb`BPs
z*Q@96muCNXQChx7Q;;Fz!S(yotA0exe=ys5zBI#Oare{v_3iYm%r=W_$R7S*Bv^ia
zUmT;vJ`1U5ypd<*X1gYf_dN_|bDUSi#gNEkQ20AmbyM6Co8Mdw_Hq{U_AoUVFrpyV
zWfj@)H?c50+wtpY|6&J*gueUR_Q|m_F&OJGF>-<_$2-yQ_nGrOI`%a?*^7li?8e{6
z=a<UWKYKd;*cA>eeujqv(DT;6r-3}bX*;9;RE7gG-{0Mn1ewj#!~irq5y%RQWr@0$
zIIoC<;Y=YgDn8clD0=zH!iR~0`%e9bf;}F~{pZTG`!Xo_;6n+Giwjo2>js7(G?)*_
zs2x-|r6Msw0UWM}RV0qgWNEgToFF4TTlzI~8mGg7Z|B}MRI)G}!hysLIN1V$hMZB6
zaGA-%ECg1THUn&kK)Mi*#WfrnAqHaAj>|4e#lML*obCO3@Zysj8@iseB~+)E7noR@
ztvRKMFLGM`3O5v|pXXWdw2)!npR{ZSTR%pHH-!v&G5gIL<_R;O04E?&9E~D;AyCiE
o!0`XS#Do*lz;cZZRG=|4%&A|X_{V(P3ZMvsr>mdKI;Vst09N~#!vFvP