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 0000000..701f0fc Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_off.png differ 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 0000000..906f82d Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/block/wireless_transceiver/lable_wireless_transceiver_on.png differ