diff --git a/src/main/java/com/extendedae_plus/util/PowerUtils.java b/src/main/java/com/extendedae_plus/util/PowerUtils.java index 3727ecb..b86bef1 100644 --- a/src/main/java/com/extendedae_plus/util/PowerUtils.java +++ b/src/main/java/com/extendedae_plus/util/PowerUtils.java @@ -61,8 +61,8 @@ public final class PowerUtils { public static double getFinalPower(int speedCardCount, int energyCardCount) { double raw = getRawPower(speedCardCount); double reduction = getReductionPercent(energyCardCount); - // 返回与实际抽取值一致的浮点能耗(包含与原实现一致的 /2 单位转换) - return raw * (1.0 - reduction) / 2.0; + // 返回与实际抽取值一致的浮点能耗(在原实现基础上再除以 2,以降低能耗) + return raw * (1.0 - reduction) / 4.0; } /** diff --git a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json index 619b23f..1179156 100644 --- a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json +++ b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json @@ -3,9 +3,29 @@ "gui.expatternprovider.hide_slots": "隐藏槽位", "gui.expatternprovider.show_slots": "显示槽位", "gui.expatternprovider.clear_selection": "取消选择", - "block.extendedae_plus.wireless_transceiver": "无线收发器", - "item.extendedae_plus.wireless_transceiver": "无线收发器", + "gui.extendedae_plus.global.toggle_blocking": "切换阻挡模式", + "gui.extendedae_plus.global.toggle_adv_blocking": "切换高级阻挡", + "gui.extendedae_plus.global.toggle_smart_doubling": "切换智能翻倍", + "gui.extendedae_plus.global.all_on": "全部开启", + "gui.extendedae_plus.global.all_off": "全部关闭", + "itemGroup.extendedae_plus.main": "扩展AE Plus", + "item.extendedae_plus.wireless_transceiver": "无线收发器", + "item.extendedae_plus.4x_crafting_accelerator": "4x并行处理单元", + "item.extendedae_plus.16x_crafting_accelerator": "16x并行处理单元", + "item.extendedae_plus.64x_crafting_accelerator": "64x并行处理单元", + "item.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元", + "item.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", + "item.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", + + "block.extendedae_plus.wireless_transceiver": "无线收发器", + "block.extendedae_plus.4x_crafting_accelerator": "4x并行处理单元", + "block.extendedae_plus.16x_crafting_accelerator": "16x并行处理单元", + "block.extendedae_plus.64x_crafting_accelerator": "64x并行处理单元", + "block.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元", + "block.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", + "block.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", + "extendedae_plus.upload_to_matrix": "上传到装配矩阵", "extendedae_plus.upload_to_matrix.success": "样板已上传到装配矩阵", "extendedae_plus.upload_to_matrix.fail_not_crafting": "仅支持上传合成样板,处理样板将被忽略", @@ -16,18 +36,6 @@ "extendedae_plus.screen.cn_name": "中文名", "extendedae_plus.button.choose_provider":"上传样板", "extendedae_plus.pattern.hovertext.player": "由 %s 编码", - - "block.extendedae_plus.4x_crafting_accelerator": "4x并行处理单元", - "block.extendedae_plus.16x_crafting_accelerator": "16x并行处理单元", - "block.extendedae_plus.64x_crafting_accelerator": "64x并行处理单元", - "block.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元", - "block.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", - - "item.extendedae_plus.4x_crafting_accelerator": "4x并行处理单元", - "item.extendedae_plus.16x_crafting_accelerator": "16x并行处理单元", - "item.extendedae_plus.64x_crafting_accelerator": "64x并行处理单元", - "item.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元", - "item.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", "item.extendedae_plus.entity_speed_ticker": "实体加速器", "screen.extendedae_plus.entity_speed_ticker.energy": "能耗: %s FE/t", @@ -46,6 +54,7 @@ "extendedae_plus.tooltip.locked": "锁定状态: %s", "screen.extendedae_plus.title": "ExtendedAE Plus 配置", + "config.extendedae_plus.pageMultiplier": "扩展样板供应器槽位倍率", "config.extendedae_plus.pageMultiplier_with_range": "扩展样板供应器槽位倍率 (1-64)", "config.extendedae_plus.wirelessMaxRange": "无线最大距离", @@ -56,13 +65,6 @@ "config.extendedae_plus.state_off": "关", "config.extendedae_plus.showEncoderPatternPlayer": "显示样板编码玩家", "config.extendedae_plus.patternTerminalShowSlotsDefault": "样板终端默认显示槽位", - "block.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", - "item.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", - "gui.extendedae_plus.global.toggle_blocking": "切换阻挡模式", - "gui.extendedae_plus.global.toggle_adv_blocking": "切换高级阻挡", - "gui.extendedae_plus.global.toggle_smart_doubling": "切换智能翻倍", - "gui.extendedae_plus.global.all_on": "全部开启", - "gui.extendedae_plus.global.all_off": "全部关闭", "config.extendedae_plus.smartScalingMaxMultiplier": "智能倍增最大倍数", "config.extendedae_plus.smartScalingMaxMultiplier_with_range": "智能倍增最大倍数 (0为不限制)", "config.extendedae_plus.smartScalingMinBenefitFactor": "智能倍增最小收益因子 (默认 4)"