From a82876824d6253a14535e33fc9f50264972f5858 Mon Sep 17 00:00:00 2001
From: GaLicn <133291877+GaLicn@users.noreply.github.com>
Date: Fri, 12 Dec 2025 11:35:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=88=9D=E5=A7=8B=E5=8C=96&u?=
 =?UTF-8?q?i=E7=BB=98=E5=88=B6=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LabeledWirelessTransceiverScreen.java     |  13 ++++++------
 ...LabeledWirelessTransceiverBlockEntity.java |  19 +++++++++++++++---
 .../gui/lable_wireless_transceiver_gui.png    | Bin 1339 -> 1453 bytes
 .../lable_wireless_transceiver_gui_副本.png   | Bin 0 -> 1339 bytes
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/assets/extendedae_plus/textures/gui/lable_wireless_transceiver_gui_副本.png

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 f45845b..78d125d 100644
--- a/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java
+++ b/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java
@@ -37,10 +37,10 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
     private static final int TEX_H = 256;
 
     private static final int LIST_X = 9;
-    private static final int LIST_Y = 25;
+    private static final int LIST_Y = 27;
     private static final int LIST_W = 110; // 118-9+1
-    private static final int LIST_H = 116; // 140-25+1
-    private static final int ROW_H = 12;
+    private static final int LIST_H = 114; // 140-27+1
+    private static final int ROW_H = 11; // 10px text height + 1px 分隔
     private static final int VISIBLE_ROWS = LIST_H / ROW_H; // 10
     private static final int SCROLL_X = 123;
     private static final int SCROLL_Y = 21;
@@ -148,7 +148,7 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
 
         // 占位绘制：列表和信息区内的内容框线
         // 标签列表区域
-        gfx.fill(this.leftPos + 9, this.topPos + 25, this.leftPos + 118 + 1, this.topPos + 140 + 1, 0x20FFFFFF);
+        gfx.fill(this.leftPos + 9, this.topPos + 27, this.leftPos + 118 + 1, this.topPos + 140 + 1, 0x20FFFFFF);
         // 滚动条区域
         gfx.fill(this.leftPos + 123, this.topPos + 21, this.leftPos + 128 + 1, this.topPos + 141 + 1, 0x20000000);
         // 当前收发器信息区域
@@ -210,8 +210,9 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen<La
                 gfx.fill(baseX, y, baseX + LIST_W, y + ROW_H, 0x40FFFFFF);
             }
             LabelEntry e = filtered.get(idx);
-            String text = this.font.plainSubstrByWidth(e.label(), LIST_W - 4);
-            gfx.drawString(this.font, text, baseX + 2, y + 2, 0x404040, false);
+            String text = this.font.plainSubstrByWidth(e.label(), LIST_W - 2);
+            int ty = y + (ROW_H - this.font.lineHeight) / 2;
+            gfx.drawString(this.font, text, baseX + 2, ty, 0x404040, false);
         }
 
         // 信息显示
diff --git a/src/main/java/com/extendedae_plus/content/wireless/LabeledWirelessTransceiverBlockEntity.java b/src/main/java/com/extendedae_plus/content/wireless/LabeledWirelessTransceiverBlockEntity.java
index 5341212..1266a16 100644
--- a/src/main/java/com/extendedae_plus/content/wireless/LabeledWirelessTransceiverBlockEntity.java
+++ b/src/main/java/com/extendedae_plus/content/wireless/LabeledWirelessTransceiverBlockEntity.java
@@ -170,8 +170,9 @@ public class LabeledWirelessTransceiverBlockEntity extends AEBaseBlockEntity imp
 
     /**
      * 在加载或跨区块迁移后重新获取网络并重连。
+     * @param ensureRegister 为 true 时，如果保存的标签不存在网络则尝试重新注册。
      */
-    public void refreshLabel() {
+    public void refreshLabel(boolean ensureRegister) {
         ServerLevel sl = getServerLevel();
         if (sl == null) return;
         if (labelForDisplay == null || labelForDisplay.isEmpty()) {
@@ -180,11 +181,17 @@ public class LabeledWirelessTransceiverBlockEntity extends AEBaseBlockEntity imp
             updateState();
             return;
         }
-        var network = LabelNetworkRegistry.get(sl).getNetwork(sl, labelForDisplay, placerId);
+        var registry = LabelNetworkRegistry.get(sl);
+        var network = registry.getNetwork(sl, labelForDisplay, placerId);
+        if (network == null && ensureRegister) {
+            network = registry.register(sl, labelForDisplay, placerId, this);
+        }
         if (network == null) {
             this.frequency = 0L;
             this.labelLink.clearTarget();
         } else {
+            // 确保虚拟节点重建（网络从存档恢复时 managedNode 为空）
+            network.ensureVirtualNode(sl);
             this.frequency = network.channel();
             this.labelLink.setTarget(network);
         }
@@ -192,6 +199,10 @@ public class LabeledWirelessTransceiverBlockEntity extends AEBaseBlockEntity imp
         setChanged();
     }
 
+    public void refreshLabel() {
+        refreshLabel(false);
+    }
+
     public void onRemoved() {
         this.beingRemoved = true;
         labelLink.onUnloadOrRemove();
@@ -260,7 +271,9 @@ public class LabeledWirelessTransceiverBlockEntity extends AEBaseBlockEntity imp
         if (sl == null) return;
         GridHelper.onFirstTick(this, be -> {
             be.managedNode.create(be.getLevel(), be.getBlockPos());
-            be.refreshLabel();
+            be.refreshLabel(true);
+            be.labelLink.updateStatus();
+            be.updateState();
         });
     }
 
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 a8aade533f9b3f130b5d7f3311f5db260fdff3ce..48a5ef2351e5e84d552985b4247ae662d1c9d826 100644
GIT binary patch
literal 1453
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJFNBu^K|kcv5P?%H?9gvvBL
z+&qDQLBwn)N8Ow+%s-ZI6c$yExXq!oh$HI8l8pfzoQiBBTlgdbJ(qK4c}R*lcc}<;
zN3=hYUX$n4H2J1M_szL?cfS8Da`ViF=oq%RcRT+)n^UWASD#SJ;Q8C^-_MU%%$YMP
zpFZ85$DVNbsrGfY3m={c|IYt=$Gky@vB7{uw4s%8$L3Oj)i3u)@4fqe^PX~Ri}^oI
za<{#`KkXd@-=3fM628u{DJ*%nSNQ(ixs`vPy*{7&YrA}XQH_D@{MujVmc5T=+ORTx
zUTu{@EfYgxG}nR0{r08}FK-4h+~GT963OH+g8><BSozzR!$_CufQ<Xmat?+TPB6;V
zWT^jBSGb|d=0vjKeb$6NUdLrG>+?CB`hkq2Z3+iu7!!i0)$#&uKtpbg>Sr_zx+PfK
z47?dQgmEBaE}KNR#>gWY1}zvaLULW;15RVEGfHlaif4ov4zb`s)6BW{?6W&|>(<-<
z`F|qfe}8}a>+N>)xO+eM_TG<-m$$K4d_X5jMB<PRqk<0uc64Ul0pT=}8LmA{n>9aX
zY+y+^2Z~25-eWqz{QJe>=H!`n_9X>x+BD;qGi=bk_xHiyjXcNs<Ry1!W?jz|sW>#v
z_H6mzV`n!`maF`+aHF`-ORHWc=NYQ7;DrP-GAYSAZ$oN7)BCA`cjuZdeQm;ZW}8Lr
zvpX6yZk0wcZP3+=wXo+}RyG%C{q42ypX=WiSs#qeD`zx5wCHAw+}O!roqT={cLLB$
zbGSF`{dQ$1!v@iFtT*JU-^DN_%)%OyJxu;LHkGrcea+Ei2wxv3b>K?`(}rB2_9~W!
z+=np@S5+8txSunvS*FYS;7RA==FA(N?9Jy`BVxIk3x1y3deG#D&d%w0ya@E}UETwe
z{olwtoL<XN^YQCSMxYH2H*R&GmyeKlxO9tQ6EKF}<S|U!EAr#%_Q~(;5~iQM!?@@7
z!QaV}eX@2&4R_7Av+SsQ{OpG3)U}HfMJw1aQXg_+EM_!V#Vu>h2nt6At2Cy9mxq2b
zmi+LuYpLYmNGxM%+A!0)LBIZQna<(c`g;t)rdw1OzFF~np4<VshmyD>3+R)xtOr);
zm7HOD@MGb8_6vr>4fg)ErVV`ePqrKIGb*0xa}Y2qX8&+$_4?k_A1~YAvv2tQY#PJ$
zf4{2VEcx4SYt^v#pfQfD0n9S9xf?ufU(Db<;MdQ{Tz%Sy0TlfWeDNn+L5AZ>!}Jt?
qBM&TV|NsA|c;ga~!3HXAnHkcLT)FUclSeyHgu&C*&t;ucLK6Uv9{qa&

literal 1339
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJEi51uZLAr*7p+}*!=S}4PT
zkIFyTMb289ym%B;f53G5wiOo+>{R7oS6#92=+cD_B?b!@JX^5n(Ap_pGO?4`N;7tx
zUG%?k;lwY$;sSTQ@BeLg|9tw6>D3SU+Mj=_o&ULDUhy}1+oC`J7$$wQ|MBVZ()DZ?
zJ{^1g{*Q12d*0o9at?<VHnYps-M4ShVQerU5p7t`_Tc{7<{Li$@4kBLdHvJJw+~`I
zXWq)Zy+3^y^N$aUyPMB`K6(88*}v~zzh8ImPtBtn*ZS&T&+<R*_n(`82GfSc)8j2|
zX4o+{Y)I#7@MoT(R?Z-xhK}C6@YH6RDaM%4xA>7Y3&SA<YOpk8nYrx$UPTUDAVW;L
ziJ_RKLG~u|B1Z-VpFxUlT<lDaZhk4u@a)d6y|x(w3>?DfsO)X?_wzlWzrMVgxsfke
zW;w$K0d@cRQmYFd-ub!FFIXBVU{L<<p7iN2hd!V0-J9U`SOnb&G(*MG*6Uo2-KN<a
z%n;FWI(%Jk(@HRNw)wh#F!RRN(!KNdXMrqpn1Kat$Ues!!S|eLgW(+R4H4&96CPWL
zCji+DYg(|Vh8wZL;2i4>8>RzJK-I>a4BQW68qR+4VYDdB$u{6Uy<-|sHpZX#z}nll
zn==b^E9Yo3v~c1^wp<5*X%(1!4H)LvR%SBTE@Keb_Ws4h$KTl}Y{_Sc1aiM=Fsz=(
z_2<*=?eFXo&ZfO%@SA668uswe&d<yd`*&&{n7jM?F{99JeQmxEByn2=bi-NJ13|Gb
zW^f*Os(qd9f}wB&FsS$!9Jc-`@Jvym<)$FVA)w)Q|G&=O$n}2TuWt<3^7FU~zV>en
ziEd}#;9kMTkjR7^6*F!K5w}WXD){*3JTu6W_tW=DIJB34Qat1Az_D3bpylix#y#Jj
zMJJ2a{d)MDan1cZA_>3G?>}ZFTk-NJ;~U<2jPM{vXWWQkSaYShZzh9IwWPs@?PpjX
zJnMbU{NjU`UP~nh2R>KfaWHkI>X{iB{{L4vt>OqQ0@*-iA2UPN<%J%LbT?-KMHoC?
L{an^LB{Ts5HoV5%

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
new file mode 100644
index 0000000000000000000000000000000000000000..a8aade533f9b3f130b5d7f3311f5db260fdff3ce
GIT binary patch
literal 1339
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJEi51uZLAr*7p+}*!=S}4PT
zkIFyTMb289ym%B;f53G5wiOo+>{R7oS6#92=+cD_B?b!@JX^5n(Ap_pGO?4`N;7tx
zUG%?k;lwY$;sSTQ@BeLg|9tw6>D3SU+Mj=_o&ULDUhy}1+oC`J7$$wQ|MBVZ()DZ?
zJ{^1g{*Q12d*0o9at?<VHnYps-M4ShVQerU5p7t`_Tc{7<{Li$@4kBLdHvJJw+~`I
zXWq)Zy+3^y^N$aUyPMB`K6(88*}v~zzh8ImPtBtn*ZS&T&+<R*_n(`82GfSc)8j2|
zX4o+{Y)I#7@MoT(R?Z-xhK}C6@YH6RDaM%4xA>7Y3&SA<YOpk8nYrx$UPTUDAVW;L
ziJ_RKLG~u|B1Z-VpFxUlT<lDaZhk4u@a)d6y|x(w3>?DfsO)X?_wzlWzrMVgxsfke
zW;w$K0d@cRQmYFd-ub!FFIXBVU{L<<p7iN2hd!V0-J9U`SOnb&G(*MG*6Uo2-KN<a
z%n;FWI(%Jk(@HRNw)wh#F!RRN(!KNdXMrqpn1Kat$Ues!!S|eLgW(+R4H4&96CPWL
zCji+DYg(|Vh8wZL;2i4>8>RzJK-I>a4BQW68qR+4VYDdB$u{6Uy<-|sHpZX#z}nll
zn==b^E9Yo3v~c1^wp<5*X%(1!4H)LvR%SBTE@Keb_Ws4h$KTl}Y{_Sc1aiM=Fsz=(
z_2<*=?eFXo&ZfO%@SA668uswe&d<yd`*&&{n7jM?F{99JeQmxEByn2=bi-NJ13|Gb
zW^f*Os(qd9f}wB&FsS$!9Jc-`@Jvym<)$FVA)w)Q|G&=O$n}2TuWt<3^7FU~zV>en
ziEd}#;9kMTkjR7^6*F!K5w}WXD){*3JTu6W_tW=DIJB34Qat1Az_D3bpylix#y#Jj
zMJJ2a{d)MDan1cZA_>3G?>}ZFTk-NJ;~U<2jPM{vXWWQkSaYShZzh9IwWPs@?PpjX
zJnMbU{NjU`UP~nh2R>KfaWHkI>X{iB{{L4vt>OqQ0@*-iA2UPN<%J%LbT?-KMHoC?
L{an^LB{Ts5HoV5%

literal 0
HcmV?d00001