From 189b4a81aba5524908d23956fc9ac41be372982f Mon Sep 17 00:00:00 2001 From: DilithiumThoride Date: Mon, 1 Jun 2026 10:31:41 -0500 Subject: [PATCH 1/6] Add Jade readout for cable overload --- .../gtceu/common/blockentity/CableBlockEntity.java | 4 ++-- .../com/gregtechceu/gtceu/data/lang/IntegrationLang.java | 1 + .../gtceu/integration/jade/provider/CableBlockProvider.java | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java index ba3c179a040..c2321af7e29 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java @@ -61,7 +61,7 @@ public class CableBlockEntity extends PipeBlockEntity handlers = new EnumMap<>(Direction.class); private final PerTickLongCounter maxVoltageCounter = new PerTickLongCounter(); @@ -207,7 +207,7 @@ public long getMaxVoltage() { return getNodeData().getVoltage(); } - public int getDefaultTemp() { + public static int getDefaultTemp() { return 293; } diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java index e421abd7451..e3db3734835 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java @@ -84,6 +84,7 @@ private static void initWailaLikeLang(RegistrateLangProvider provider) { provider.add("gtceu.top.allow_output_input", "Allow Input"); provider.add("gtceu.top.cable_voltage", "Voltage: "); provider.add("gtceu.top.cable_amperage", "Amperage: "); + provider.add("gtceu.top.cable_overloaded", "§4OVERHEATING: %sK / %sKr"); provider.add("gtceu.top.exhaust_vent_direction", "Exhaust Vent: %s"); provider.add("gtceu.top.exhaust_vent_blocked", "Blocked"); provider.add("gtceu.top.machine_mode", "Machine Mode: "); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java index b91c909ee95..639aa086450 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java @@ -31,6 +31,7 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi var tag = data.getCompound("cableData"); long voltage = tag.getLong("currentVoltage"); double amperage = tag.getDouble("currentAmperage"); + int temperature = tag.getInt("temperature"); iTooltip.add(Component.translatable("gtceu.top.cable_voltage")); if (voltage != 0) { iTooltip.append(Component.literal(GTValues.VNF[GTUtil.getTierByVoltage(voltage)])); @@ -43,6 +44,10 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi iTooltip.append(Component.literal(DECIMAL_FORMAT_1F.format(amperage) + "A / ")); } iTooltip.append(Component.literal(DECIMAL_FORMAT_1F.format(tag.getDouble("maxAmperage")) + "A")); + + if (temperature != CableBlockEntity.getDefaultTemp()){ + iTooltip.append(Component.translatable("gtceu.top.cable_overloaded", temperature, CableBlockEntity.getMeltTemp())); + } } } } @@ -59,6 +64,7 @@ public void appendServerData(CompoundTag compoundTag, BlockAccessor blockAccesso cableData.putLong("currentVoltage", cable.getCurrentMaxVoltage()); cableData.putDouble("maxAmperage", cable.getMaxAmperage()); cableData.putDouble("currentAmperage", cable.getAverageAmperage()); + cableData.putInt("temperature", cable.getTemperature()); data.put("cableData", cableData); } } From 88f28c6994d449a65d1e9810b86b1451e5aa50cf Mon Sep 17 00:00:00 2001 From: DilithiumThoride Date: Mon, 1 Jun 2026 10:45:45 -0500 Subject: [PATCH 2/6] datagen --- src/generated/resources/assets/gtceu/lang/en_ud.json | 1 + src/generated/resources/assets/gtceu/lang/en_us.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 5dd7bd5552d..5170f443ffd 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -3903,6 +3903,7 @@ "gtceu.top.buffer_bound_pos": "%s :Z '%s :ʎ '%s :X - o⟘ punoᗺ", "gtceu.top.buffer_not_bound": "punoᗺ ʎןʇuǝɹɹnƆ ʇoN ɹǝɟɟnᗺ", "gtceu.top.cable_amperage": " :ǝbɐɹǝdɯⱯ", + "gtceu.top.cable_overloaded": "ɹʞ%s / ʞ%s :⅁NI⟘ⱯƎHᴚƎΛOㄣ§", "gtceu.top.cable_voltage": " :ǝbɐʇןoΛ", "gtceu.top.convert_eu": "ɹ§ƎℲɔ§ >- ɹ§∩Ǝǝ§ buıʇɹǝʌuoƆ", "gtceu.top.convert_fe": "ɹ§∩Ǝǝ§ >- ɹ§ƎℲɔ§ buıʇɹǝʌuoƆ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index bd4a84627d4..a0e94f76a7a 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -3903,6 +3903,7 @@ "gtceu.top.buffer_bound_pos": "Bound To - X: %s, Y: %s, Z: %s", "gtceu.top.buffer_not_bound": "Buffer Not Currently Bound", "gtceu.top.cable_amperage": "Amperage: ", + "gtceu.top.cable_overloaded": "§4OVERHEATING: %sK / %sKr", "gtceu.top.cable_voltage": "Voltage: ", "gtceu.top.convert_eu": "Converting §eEU§r -> §cFE§r", "gtceu.top.convert_fe": "Converting §cFE§r -> §eEU§r", From 85d8a930f22ffe34e0db97cbb6f994eae6cb4b0c Mon Sep 17 00:00:00 2001 From: DilithiumThoride Date: Mon, 1 Jun 2026 10:59:30 -0500 Subject: [PATCH 3/6] lang prodding --- src/generated/resources/assets/gtceu/lang/en_ud.json | 2 +- src/generated/resources/assets/gtceu/lang/en_us.json | 2 +- .../java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java | 2 +- .../gtceu/integration/jade/provider/CableBlockProvider.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 5170f443ffd..a2c6022ff67 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -3903,7 +3903,7 @@ "gtceu.top.buffer_bound_pos": "%s :Z '%s :ʎ '%s :X - o⟘ punoᗺ", "gtceu.top.buffer_not_bound": "punoᗺ ʎןʇuǝɹɹnƆ ʇoN ɹǝɟɟnᗺ", "gtceu.top.cable_amperage": " :ǝbɐɹǝdɯⱯ", - "gtceu.top.cable_overloaded": "ɹʞ%s / ʞ%s :⅁NI⟘ⱯƎHᴚƎΛOㄣ§", + "gtceu.top.cable_overloaded": "ɹ§ʞ%s / ʞ%s :⅁NI⟘ⱯƎHᴚƎΛOㄣ§", "gtceu.top.cable_voltage": " :ǝbɐʇןoΛ", "gtceu.top.convert_eu": "ɹ§ƎℲɔ§ >- ɹ§∩Ǝǝ§ buıʇɹǝʌuoƆ", "gtceu.top.convert_fe": "ɹ§∩Ǝǝ§ >- ɹ§ƎℲɔ§ buıʇɹǝʌuoƆ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index a0e94f76a7a..e4405a8d4f8 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -3903,7 +3903,7 @@ "gtceu.top.buffer_bound_pos": "Bound To - X: %s, Y: %s, Z: %s", "gtceu.top.buffer_not_bound": "Buffer Not Currently Bound", "gtceu.top.cable_amperage": "Amperage: ", - "gtceu.top.cable_overloaded": "§4OVERHEATING: %sK / %sKr", + "gtceu.top.cable_overloaded": "§4OVERHEATING: %sK / %sK§r", "gtceu.top.cable_voltage": "Voltage: ", "gtceu.top.convert_eu": "Converting §eEU§r -> §cFE§r", "gtceu.top.convert_fe": "Converting §cFE§r -> §eEU§r", diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java index e3db3734835..c4f738d0e8c 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java @@ -84,7 +84,7 @@ private static void initWailaLikeLang(RegistrateLangProvider provider) { provider.add("gtceu.top.allow_output_input", "Allow Input"); provider.add("gtceu.top.cable_voltage", "Voltage: "); provider.add("gtceu.top.cable_amperage", "Amperage: "); - provider.add("gtceu.top.cable_overloaded", "§4OVERHEATING: %sK / %sKr"); + provider.add("gtceu.top.cable_overloaded", "§4OVERHEATING: %sK / %sK§r"); provider.add("gtceu.top.exhaust_vent_direction", "Exhaust Vent: %s"); provider.add("gtceu.top.exhaust_vent_blocked", "Blocked"); provider.add("gtceu.top.machine_mode", "Machine Mode: "); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java index 639aa086450..0d07a4948d7 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java @@ -43,7 +43,7 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi if (amperage != 0) { iTooltip.append(Component.literal(DECIMAL_FORMAT_1F.format(amperage) + "A / ")); } - iTooltip.append(Component.literal(DECIMAL_FORMAT_1F.format(tag.getDouble("maxAmperage")) + "A")); + iTooltip.append(Component.translatable("gtceu.jade.amperage_use", DECIMAL_FORMAT_1F.format(tag.getDouble("maxAmperage")))); if (temperature != CableBlockEntity.getDefaultTemp()){ iTooltip.append(Component.translatable("gtceu.top.cable_overloaded", temperature, CableBlockEntity.getMeltTemp())); From e2baabfb7881f4fafd7c858ef5941849714cb518 Mon Sep 17 00:00:00 2001 From: DilithiumThoride Date: Mon, 1 Jun 2026 15:01:12 -0500 Subject: [PATCH 4/6] lang prodding 2 --- src/generated/resources/assets/gtceu/lang/en_us.json | 2 +- .../com/gregtechceu/gtceu/data/lang/IntegrationLang.java | 2 +- .../gtceu/integration/jade/provider/CableBlockProvider.java | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index e4405a8d4f8..056a9b161b3 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -3903,7 +3903,7 @@ "gtceu.top.buffer_bound_pos": "Bound To - X: %s, Y: %s, Z: %s", "gtceu.top.buffer_not_bound": "Buffer Not Currently Bound", "gtceu.top.cable_amperage": "Amperage: ", - "gtceu.top.cable_overloaded": "§4OVERHEATING: %sK / %sK§r", + "gtceu.top.cable_overloaded": "§4OVERHEATING: %s%%§r", "gtceu.top.cable_voltage": "Voltage: ", "gtceu.top.convert_eu": "Converting §eEU§r -> §cFE§r", "gtceu.top.convert_fe": "Converting §cFE§r -> §eEU§r", diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java index c4f738d0e8c..ea1223974ec 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/IntegrationLang.java @@ -84,7 +84,7 @@ private static void initWailaLikeLang(RegistrateLangProvider provider) { provider.add("gtceu.top.allow_output_input", "Allow Input"); provider.add("gtceu.top.cable_voltage", "Voltage: "); provider.add("gtceu.top.cable_amperage", "Amperage: "); - provider.add("gtceu.top.cable_overloaded", "§4OVERHEATING: %sK / %sK§r"); + provider.add("gtceu.top.cable_overloaded", "§4OVERHEATING: %s%%§r"); provider.add("gtceu.top.exhaust_vent_direction", "Exhaust Vent: %s"); provider.add("gtceu.top.exhaust_vent_blocked", "Blocked"); provider.add("gtceu.top.machine_mode", "Machine Mode: "); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java index 0d07a4948d7..91d929f2707 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java @@ -46,7 +46,7 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi iTooltip.append(Component.translatable("gtceu.jade.amperage_use", DECIMAL_FORMAT_1F.format(tag.getDouble("maxAmperage")))); if (temperature != CableBlockEntity.getDefaultTemp()){ - iTooltip.append(Component.translatable("gtceu.top.cable_overloaded", temperature, CableBlockEntity.getMeltTemp())); + iTooltip.add(Component.translatable("gtceu.top.cable_overloaded", progressToFailure(CableBlockEntity.getDefaultTemp(),CableBlockEntity.getMeltTemp(),temperature))); } } } @@ -75,4 +75,8 @@ public void appendServerData(CompoundTag compoundTag, BlockAccessor blockAccesso public ResourceLocation getUid() { return GTCEu.id("cable_info"); } + + private int progressToFailure(int base, int melt, int current){ + return (100 * (current - base)) / (melt - base); + } } From f68b67688bb9978879ea97a80209ff1f4391e3ff Mon Sep 17 00:00:00 2001 From: DilithiumThoride Date: Mon, 1 Jun 2026 15:04:25 -0500 Subject: [PATCH 5/6] datagen --- src/generated/resources/assets/gtceu/lang/en_ud.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index a2c6022ff67..fadd44ee66c 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -3903,7 +3903,7 @@ "gtceu.top.buffer_bound_pos": "%s :Z '%s :ʎ '%s :X - o⟘ punoᗺ", "gtceu.top.buffer_not_bound": "punoᗺ ʎןʇuǝɹɹnƆ ʇoN ɹǝɟɟnᗺ", "gtceu.top.cable_amperage": " :ǝbɐɹǝdɯⱯ", - "gtceu.top.cable_overloaded": "ɹ§ʞ%s / ʞ%s :⅁NI⟘ⱯƎHᴚƎΛOㄣ§", + "gtceu.top.cable_overloaded": "ɹ§%s%% :⅁NI⟘ⱯƎHᴚƎΛOㄣ§", "gtceu.top.cable_voltage": " :ǝbɐʇןoΛ", "gtceu.top.convert_eu": "ɹ§ƎℲɔ§ >- ɹ§∩Ǝǝ§ buıʇɹǝʌuoƆ", "gtceu.top.convert_fe": "ɹ§∩Ǝǝ§ >- ɹ§ƎℲɔ§ buıʇɹǝʌuoƆ", From b7a945f75b9917f630d3c5b4901319b4613e401f Mon Sep 17 00:00:00 2001 From: DilithiumThoride Date: Mon, 1 Jun 2026 20:10:15 -0500 Subject: [PATCH 6/6] s p o t --- .../integration/jade/provider/CableBlockProvider.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java index 91d929f2707..fa3df3dff2c 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jade/provider/CableBlockProvider.java @@ -43,10 +43,12 @@ public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPlugi if (amperage != 0) { iTooltip.append(Component.literal(DECIMAL_FORMAT_1F.format(amperage) + "A / ")); } - iTooltip.append(Component.translatable("gtceu.jade.amperage_use", DECIMAL_FORMAT_1F.format(tag.getDouble("maxAmperage")))); + iTooltip.append(Component.translatable("gtceu.jade.amperage_use", + DECIMAL_FORMAT_1F.format(tag.getDouble("maxAmperage")))); - if (temperature != CableBlockEntity.getDefaultTemp()){ - iTooltip.add(Component.translatable("gtceu.top.cable_overloaded", progressToFailure(CableBlockEntity.getDefaultTemp(),CableBlockEntity.getMeltTemp(),temperature))); + if (temperature != CableBlockEntity.getDefaultTemp()) { + iTooltip.add(Component.translatable("gtceu.top.cable_overloaded", progressToFailure( + CableBlockEntity.getDefaultTemp(), CableBlockEntity.getMeltTemp(), temperature))); } } } @@ -76,7 +78,7 @@ public ResourceLocation getUid() { return GTCEu.id("cable_info"); } - private int progressToFailure(int base, int melt, int current){ + private int progressToFailure(int base, int melt, int current) { return (100 * (current - base)) / (melt - base); } }