From 56b82e0e8e3f94ae834b3d43809ae80f6f6999c9 Mon Sep 17 00:00:00 2001 From: GaLicn <133291877+GaLicn@users.noreply.github.com> Date: Fri, 12 Dec 2025 09:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E8=B4=A8&=E8=B0=83=E6=95=B4=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=A4=A7=E5=B0=8F=E5=86=99=E6=95=8F=E6=84=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/wireless/LabelNetworkRegistry.java | 4 +-- .../LabeledWirelessTransceiverScreen.java | 4 +-- .../LabeledWirelessTransceiverBlock.java | 6 ++-- ...LabeledWirelessTransceiverBlockEntity.java | 26 ++++++------------ .../labeled_wireless_transceiver.json | 10 +++++++ .../lable_wireless_transceiver_off.json | 7 +++++ .../lable_wireless_transceiver_on.json | 7 +++++ .../item/labeled_wireless_transceiver.json | 3 ++ .../lable_wireless_transceiver_off.png | Bin 0 -> 409 bytes .../lable_wireless_transceiver_on.png | Bin 0 -> 499 bytes 10 files changed, 42 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/assets/extendedae_plus/blockstates/labeled_wireless_transceiver.json create mode 100644 src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_off.json create mode 100644 src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_on.json create mode 100644 src/main/resources/assets/extendedae_plus/models/item/labeled_wireless_transceiver.json create mode 100644 src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_off.png create mode 100644 src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_on.png diff --git a/src/main/java/com/extendedae_plus/ae/wireless/LabelNetworkRegistry.java b/src/main/java/com/extendedae_plus/ae/wireless/LabelNetworkRegistry.java index 116e286..d7d1491 100644 --- a/src/main/java/com/extendedae_plus/ae/wireless/LabelNetworkRegistry.java +++ b/src/main/java/com/extendedae_plus/ae/wireless/LabelNetworkRegistry.java @@ -55,11 +55,11 @@ public class LabelNetworkRegistry extends SavedData { } /** - * 规范化标签：trim + toLowerCase。 + * 规范化标签：trim；保持大小写敏感。 */ public static String normalizeLabel(String raw) { if (raw == null) return null; - String t = raw.trim().toLowerCase(Locale.ROOT); + String t = raw.trim(); if (t.isEmpty()) return null; if (t.length() > 64) { t = t.substring(0, 64); 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 d66c821..4049de2 100644 --- a/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java +++ b/src/main/java/com/extendedae_plus/client/screen/LabeledWirelessTransceiverScreen.java @@ -266,13 +266,13 @@ public class LabeledWirelessTransceiverScreen extends AbstractContainerScreen= 32) { - newState = 4; - } else if (usedChannels >= 24) { - newState = 3; - } else if (usedChannels >= 16) { - newState = 2; - } else if (usedChannels >= 8) { - newState = 1; - } else if (usedChannels >= 0) { - newState = 0; + try { + var grid = node.getGrid(); + online = grid != null && grid.getEnergyService().isNetworkPowered(); + } catch (Throwable ignored) { + online = false; } } - if (currentState.getValue(LabeledWirelessTransceiverBlock.STATE) != newState) { - this.level.setBlock(this.worldPosition, currentState.setValue(LabeledWirelessTransceiverBlock.STATE, newState), 3); + if (currentState.getValue(LabeledWirelessTransceiverBlock.STATE) != online) { + this.level.setBlock(this.worldPosition, currentState.setValue(LabeledWirelessTransceiverBlock.STATE, online), 3); } } diff --git a/src/main/resources/assets/extendedae_plus/blockstates/labeled_wireless_transceiver.json b/src/main/resources/assets/extendedae_plus/blockstates/labeled_wireless_transceiver.json new file mode 100644 index 0000000..8fa674d --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/blockstates/labeled_wireless_transceiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "state=false": { + "model": "extendedae_plus:block/wirelesstransceiver/lable_wireless_transceiver_off" + }, + "state=true": { + "model": "extendedae_plus:block/wirelesstransceiver/lable_wireless_transceiver_on" + } + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_off.json b/src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_off.json new file mode 100644 index 0000000..c7f095b --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_off.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/wireless_transceiver/lable_wireless_transceiver_off" + } +} + diff --git a/src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_on.json b/src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_on.json new file mode 100644 index 0000000..601d4c4 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/lable_wireless_transceiver_on.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/wireless_transceiver/lable_wireless_transceiver_on" + } +} + diff --git a/src/main/resources/assets/extendedae_plus/models/item/labeled_wireless_transceiver.json b/src/main/resources/assets/extendedae_plus/models/item/labeled_wireless_transceiver.json new file mode 100644 index 0000000..704d1b0 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/item/labeled_wireless_transceiver.json @@ -0,0 +1,3 @@ +{ + "parent": "extendedae_plus:block/wirelesstransceiver/lable_wireless_transceiver_off" +} diff --git a/src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_off.png b/src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_off.png new file mode 100644 index 0000000000000000000000000000000000000000..701f0fcbb3161c92e3a18f1693e4dea3a21d3fd4 GIT binary patch literal 409 zcmV;K0cQS*P)Y5QbM-6FtL$no0|~F2BXv?ixYU8Z6S8Dt0NtS=bzYG}qY)`7PsDu$Wdp0Cl5|clJcaAKp>!xGR{nE4c6Eg9 z5?9G&ECP^fbfi@95|qKUs^w1e|8S)YdZoZB*A%Q$%BmC;;Pve(=o|bgxlMafO{x4G zN$9fmiQa|p+Xz#w#P36VBG%Bx)E#0$wT9iSSv-iV*l@(R^m;&t6}I@TwHB3cz=OC7 zpQLGD71V_UEZ9_&{{jF2|Nl@czW@LL00v1!K~w_(fO5l>8~d`m00000NkvXXu0mjf DK~J`D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_on.png b/src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_on.png new file mode 100644 index 0000000000000000000000000000000000000000..906f82d536f594c5e6514fdd9e010a862bd069e4 GIT binary patch literal 499 zcmVRO7clOuGD@WioQ8U*N-TDdXA+7t z7Eqt_zb_pP(QH%=`1&8I_h+FJy2y@%?-j`$W+NXwZ3Od#Kg5KVTvZ1o>%i z4C~(S4qhDjM9-p5=8pjtN!m5AGPEVJYYaW7(`K{Y?v${ z)GQP~@^N!L13)3wsb0(0@VwW6I2XyS^`e3R{Cy1vQ=`LSO7S1M!cq z^Wa`2?7{hzvn`{{r-*1)%Ak*T(K5=$q6vdr#l_%0@B=3-E~Lw*Q4?8qr;t+1#9(d} p7lX6iXs9RsNfcFl1R*k$DZd{_(V0|?i^Ko`002ovPDHLkV1lKU;{yNy literal 0 HcmV?d00001