From efd6f0d0a6b5f69f9bc15b10403a79a0b7265728 Mon Sep 17 00:00:00 2001 From: IncandescenceSy <76633436+IncandescenceSy@users.noreply.github.com> Date: Wed, 14 May 2025 17:32:24 -0500 Subject: [PATCH 1/3] Display Throughput in energy hatch tooltips --- .../multi/multiblockpart/MetaTileEntityEnergyHatch.java | 2 ++ .../multi/multiblockpart/MetaTileEntityLaserHatch.java | 1 + src/main/resources/assets/gregtech/lang/en_us.lang | 1 + src/main/resources/assets/gregtech/lang/ja_jp.lang | 1 + src/main/resources/assets/gregtech/lang/ru_ru.lang | 1 + src/main/resources/assets/gregtech/lang/zh_cn.lang | 1 + 6 files changed, 7 insertions(+) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java index 489afffac1f..5dc679916bb 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java @@ -136,10 +136,12 @@ public void addInformation(ItemStack stack, @Nullable World world, List tierName)); tooltip.add( I18n.format("gregtech.universal.tooltip.amperage_out_till", energyContainer.getOutputAmperage())); + tooltip.add(I18n.format("gregtech.universal.tooltip.throughput", energyContainer.getOutputVoltage() * energyContainer.getOutputAmperage())); } else { tooltip.add( I18n.format("gregtech.universal.tooltip.voltage_in", energyContainer.getInputVoltage(), tierName)); tooltip.add(I18n.format("gregtech.universal.tooltip.amperage_in_till", energyContainer.getInputAmperage())); + tooltip.add(I18n.format("gregtech.universal.tooltip.throughput", energyContainer.getInputVoltage() * energyContainer.getInputAmperage())); } tooltip.add( I18n.format("gregtech.universal.tooltip.energy_storage_capacity", energyContainer.getEnergyCapacity())); diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityLaserHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityLaserHatch.java index 38e1dbdcd31..83d823fbedc 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityLaserHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityLaserHatch.java @@ -102,6 +102,7 @@ public void addInformation(ItemStack stack, @Nullable World world, @NotNull List tooltip.add(I18n.format("gregtech.universal.tooltip.voltage_in", V[tier], VNF[tier])); tooltip.add(I18n.format("gregtech.universal.tooltip.amperage_in_till", amperage)); } + tooltip.add(I18n.format("gregtech.universal.tooltip.throughput", V[tier] * amperage)); tooltip.add(I18n.format("gregtech.universal.tooltip.energy_storage_capacity", buffer.getEnergyCapacity())); tooltip.add(I18n.format("gregtech.universal.enabled")); } diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 9e86c2e951a..ab34b23613f 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -5500,6 +5500,7 @@ gregtech.universal.tooltip.amperage_out=§eAmperage OUT: §f%,dA gregtech.universal.tooltip.amperage_out_till=§eAmperage OUT up to: §f%,dA gregtech.universal.tooltip.amperage_in_out=§eAmperage IN/OUT: §f%,dA gregtech.universal.tooltip.amperage_in_out_till=§eAmperage IN/OUT up to: §f%,dA +gregtech.universal.tooltip.throughput=§bThroughput: §f%,d EU/t gregtech.universal.tooltip.energy_storage_capacity=§cEnergy Capacity: §f%,d EU gregtech.universal.tooltip.energy_tier_range=§aAllowed Voltage Tiers: §f%s §f- %s gregtech.universal.tooltip.item_storage_capacity=§6Item Slots: §f%,d diff --git a/src/main/resources/assets/gregtech/lang/ja_jp.lang b/src/main/resources/assets/gregtech/lang/ja_jp.lang index 846a51bd8f6..47497548d3c 100644 --- a/src/main/resources/assets/gregtech/lang/ja_jp.lang +++ b/src/main/resources/assets/gregtech/lang/ja_jp.lang @@ -5485,6 +5485,7 @@ gregtech.universal.tooltip.amperage_out=§e出力電流: §f%,dA gregtech.universal.tooltip.amperage_out_till=§e最大出力電流: §f%,dA gregtech.universal.tooltip.amperage_in_out=§e入出力電流: §f%,dA gregtech.universal.tooltip.amperage_in_out_till=§e最大入出力電流: §f%,dA +gregtech.universal.tooltip.throughput=§b処理能力: §f%,d EU/t gregtech.universal.tooltip.energy_storage_capacity=§c蓄電量: §f%,d EU gregtech.universal.tooltip.energy_tier_range=§a許容電圧: §f%s §f- %s gregtech.universal.tooltip.item_storage_capacity=§6アイテムスロット数: §f%,d diff --git a/src/main/resources/assets/gregtech/lang/ru_ru.lang b/src/main/resources/assets/gregtech/lang/ru_ru.lang index f51bc246bb6..682b5903d72 100644 --- a/src/main/resources/assets/gregtech/lang/ru_ru.lang +++ b/src/main/resources/assets/gregtech/lang/ru_ru.lang @@ -4757,6 +4757,7 @@ gregtech.universal.tooltip.amperage_out=§eСила генерируемого gregtech.universal.tooltip.amperage_out_till=§eГенерирует ток до: §f%,dА gregtech.universal.tooltip.amperage_in_out=§eСила тока: §f%,dA gregtech.universal.tooltip.amperage_in_out_till=§eСила тока до: §f%,dA +gregtech.universal.tooltip.throughput=§bПропускная способность: §f%,d EU/t gregtech.universal.tooltip.energy_storage_capacity=§cЭнергоемкость: §f%,d EU gregtech.universal.tooltip.item_storage_total=§6Вместимость: §f%,d предметов gregtech.universal.tooltip.item_stored=§dХранит: §f%s, %,d штук diff --git a/src/main/resources/assets/gregtech/lang/zh_cn.lang b/src/main/resources/assets/gregtech/lang/zh_cn.lang index ce1b8dbe8e8..9e1d692765c 100644 --- a/src/main/resources/assets/gregtech/lang/zh_cn.lang +++ b/src/main/resources/assets/gregtech/lang/zh_cn.lang @@ -5500,6 +5500,7 @@ gregtech.universal.tooltip.amperage_out=§e输出电流：§f%,dA gregtech.universal.tooltip.amperage_out_till=§e输出电流上限：§f%,dA gregtech.universal.tooltip.amperage_in_out=§e输入/输出电流：§f%,dA gregtech.universal.tooltip.amperage_in_out_till=§e输入/输出电流上限：§f%,dA +gregtech.universal.tooltip.throughput=§b吞吐量: §f%,d EU/t gregtech.universal.tooltip.energy_storage_capacity=§c能量缓存：§f%,d EU gregtech.universal.tooltip.energy_tier_range=§a适配电压等级：§f%s §f- %s gregtech.universal.tooltip.item_storage_capacity=§6物品槽位数量：§f%,d From 3232e4274a889fa1e63e4209c5f8ecb7440543b0 Mon Sep 17 00:00:00 2001 From: IncandescenceSy <76633436+IncandescenceSy@users.noreply.github.com> Date: Wed, 14 May 2025 19:07:05 -0500 Subject: [PATCH 2/3] applySpotless --- .../multi/multiblockpart/MetaTileEntityEnergyHatch.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java index 5dc679916bb..6a331a027df 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java @@ -136,12 +136,14 @@ public void addInformation(ItemStack stack, @Nullable World world, List tierName)); tooltip.add( I18n.format("gregtech.universal.tooltip.amperage_out_till", energyContainer.getOutputAmperage())); - tooltip.add(I18n.format("gregtech.universal.tooltip.throughput", energyContainer.getOutputVoltage() * energyContainer.getOutputAmperage())); + tooltip.add(I18n.format("gregtech.universal.tooltip.throughput", + energyContainer.getOutputVoltage() * energyContainer.getOutputAmperage())); } else { tooltip.add( I18n.format("gregtech.universal.tooltip.voltage_in", energyContainer.getInputVoltage(), tierName)); tooltip.add(I18n.format("gregtech.universal.tooltip.amperage_in_till", energyContainer.getInputAmperage())); - tooltip.add(I18n.format("gregtech.universal.tooltip.throughput", energyContainer.getInputVoltage() * energyContainer.getInputAmperage())); + tooltip.add(I18n.format("gregtech.universal.tooltip.throughput", + energyContainer.getInputVoltage() * energyContainer.getInputAmperage())); } tooltip.add( I18n.format("gregtech.universal.tooltip.energy_storage_capacity", energyContainer.getEnergyCapacity())); From 40b4898011a9c222b346801f1ecfe2c7a941a0eb Mon Sep 17 00:00:00 2001 From: IncandescenceSy <76633436+IncandescenceSy@users.noreply.github.com> Date: Sat, 17 May 2025 16:45:02 -0500 Subject: [PATCH 3/3] Remove translations --- src/main/resources/assets/gregtech/lang/ja_jp.lang | 1 - src/main/resources/assets/gregtech/lang/ru_ru.lang | 1 - src/main/resources/assets/gregtech/lang/zh_cn.lang | 1 - 3 files changed, 3 deletions(-) diff --git a/src/main/resources/assets/gregtech/lang/ja_jp.lang b/src/main/resources/assets/gregtech/lang/ja_jp.lang index 47497548d3c..846a51bd8f6 100644 --- a/src/main/resources/assets/gregtech/lang/ja_jp.lang +++ b/src/main/resources/assets/gregtech/lang/ja_jp.lang @@ -5485,7 +5485,6 @@ gregtech.universal.tooltip.amperage_out=§e出力電流: §f%,dA gregtech.universal.tooltip.amperage_out_till=§e最大出力電流: §f%,dA gregtech.universal.tooltip.amperage_in_out=§e入出力電流: §f%,dA gregtech.universal.tooltip.amperage_in_out_till=§e最大入出力電流: §f%,dA -gregtech.universal.tooltip.throughput=§b処理能力: §f%,d EU/t gregtech.universal.tooltip.energy_storage_capacity=§c蓄電量: §f%,d EU gregtech.universal.tooltip.energy_tier_range=§a許容電圧: §f%s §f- %s gregtech.universal.tooltip.item_storage_capacity=§6アイテムスロット数: §f%,d diff --git a/src/main/resources/assets/gregtech/lang/ru_ru.lang b/src/main/resources/assets/gregtech/lang/ru_ru.lang index 682b5903d72..f51bc246bb6 100644 --- a/src/main/resources/assets/gregtech/lang/ru_ru.lang +++ b/src/main/resources/assets/gregtech/lang/ru_ru.lang @@ -4757,7 +4757,6 @@ gregtech.universal.tooltip.amperage_out=§eСила генерируемого gregtech.universal.tooltip.amperage_out_till=§eГенерирует ток до: §f%,dА gregtech.universal.tooltip.amperage_in_out=§eСила тока: §f%,dA gregtech.universal.tooltip.amperage_in_out_till=§eСила тока до: §f%,dA -gregtech.universal.tooltip.throughput=§bПропускная способность: §f%,d EU/t gregtech.universal.tooltip.energy_storage_capacity=§cЭнергоемкость: §f%,d EU gregtech.universal.tooltip.item_storage_total=§6Вместимость: §f%,d предметов gregtech.universal.tooltip.item_stored=§dХранит: §f%s, %,d штук diff --git a/src/main/resources/assets/gregtech/lang/zh_cn.lang b/src/main/resources/assets/gregtech/lang/zh_cn.lang index 9e1d692765c..ce1b8dbe8e8 100644 --- a/src/main/resources/assets/gregtech/lang/zh_cn.lang +++ b/src/main/resources/assets/gregtech/lang/zh_cn.lang @@ -5500,7 +5500,6 @@ gregtech.universal.tooltip.amperage_out=§e输出电流：§f%,dA gregtech.universal.tooltip.amperage_out_till=§e输出电流上限：§f%,dA gregtech.universal.tooltip.amperage_in_out=§e输入/输出电流：§f%,dA gregtech.universal.tooltip.amperage_in_out_till=§e输入/输出电流上限：§f%,dA -gregtech.universal.tooltip.throughput=§b吞吐量: §f%,d EU/t gregtech.universal.tooltip.energy_storage_capacity=§c能量缓存：§f%,d EU gregtech.universal.tooltip.energy_tier_range=§a适配电压等级：§f%s §f- %s gregtech.universal.tooltip.item_storage_capacity=§6物品槽位数量：§f%,d