R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加智能系列、实体加速器按钮翻译键;调整无线收发器jade显示顺序

Browse Source
This commit is contained in:
C-H716 2025-11-05 22:04:45 +08:00
parent 5f8e2647b2
commit 19cf58a7e4
7 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java
View File

@ -49,15 +49,15 @@ public class EntitySpeedTickerScreen<C extends EntitySpeedTickerMenu> extends Up
public List<Component> getTooltipMessage() { public List<Component> getTooltipMessage() {
if (menu.targetBlacklisted) { if (menu.targetBlacklisted) {
return List.of( return List.of(
Component.literal("实体加速"), Component.translatable("extendedae_plus.gui.entity_acceleration.title"),
Component.literal("已禁用（目标在黑名单）") Component.translatable("extendedae_plus.gui.entity_acceleration.blacklisted")
); );
} }
boolean enabled = eap$entitySpeedTickerEnabled; boolean enabled = eap$entitySpeedTickerEnabled;
return List.of( return List.of(
Component.literal("实体加速"), Component.translatable("extendedae_plus.gui.entity_acceleration.title"),
enabled ? Component.literal("已启用: 将加速目标方块实体的tick") : enabled ? Component.translatable("extendedae_plus.gui.entity_acceleration.enabled") :
Component.literal("已关闭: 不会对目标方块实体进行加速") Component.translatable("extendedae_plus.gui.entity_acceleration.disabled")
); );
} }

20
src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverJadePluginComponents.java
View File

@ -62,16 +62,6 @@ public enum WirelessTransceiverJadePluginComponents implements IBlockComponentPr
} }
} }
}, },
NETWORK_USABLE("wt_network_usable") {
@Override
protected void add(BlockAccessor accessor, ITooltip tooltip, IPluginConfig config, CompoundTag data) {
if (data.contains("networkUsable")) {
boolean usable = data.getBoolean("networkUsable");
String statusKey = usable ? "extendedae_plus.jade.online" : "extendedae_plus.jade.offline";
tooltip.add(Component.translatable(statusKey));
}
}
},
CHANNELS("wt_channels") { CHANNELS("wt_channels") {
@Override @Override
protected void add(BlockAccessor accessor, ITooltip tooltip, IPluginConfig config, CompoundTag data) { protected void add(BlockAccessor accessor, ITooltip tooltip, IPluginConfig config, CompoundTag data) {
@ -104,6 +94,16 @@ public enum WirelessTransceiverJadePluginComponents implements IBlockComponentPr
tooltip.add(Component.translatable("extendedae_plus.jade.owner.public")); tooltip.add(Component.translatable("extendedae_plus.jade.owner.public"));
} }
} }
},
NETWORK_USABLE("wt_network_usable") {
@Override
protected void add(BlockAccessor accessor, ITooltip tooltip, IPluginConfig config, CompoundTag data) {
if (data.contains("networkUsable")) {
boolean usable = data.getBoolean("networkUsable");
String statusKey = usable ? "extendedae_plus.jade.online" : "extendedae_plus.jade.offline";
tooltip.add(Component.translatable(statusKey));
}
}
}; };
private final ResourceLocation uid; private final ResourceLocation uid;

14
src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java
View File

@ -79,10 +79,10 @@ public abstract class AdvPatternProviderScreenMixin extends AEBaseScreen<AdvPatt
eap$AdvancedBlockingEnabled, eap$AdvancedBlockingEnabled,
() -> ModNetwork.CHANNEL.sendToServer(new ToggleAdvancedBlockingC2SPacket()), () -> ModNetwork.CHANNEL.sendToServer(new ToggleAdvancedBlockingC2SPacket()),
() -> { () -> {
var t = Component.literal("智能阻挡"); var t = Component.translatable("extendedae_plus.gui.advanced_blocking.title");
var line = eap$AdvancedBlockingEnabled var line = eap$AdvancedBlockingEnabled
? Component.literal("已启用：对于同一种配方将不再阻挡 (需要启用原版阻挡模式)") ? Component.translatable("extendedae_plus.gui.advanced_blocking.enabled_desc")
: Component.literal("已禁用：建议开启以获得更智能的阻挡行为"); : Component.translatable("extendedae_plus.gui.advanced_blocking.disabled_desc");
return List.of(t, line); return List.of(t, line);
} }
); );
@ -94,10 +94,10 @@ public abstract class AdvPatternProviderScreenMixin extends AEBaseScreen<AdvPatt
eap$SmartDoublingEnabled, eap$SmartDoublingEnabled,
() -> ModNetwork.CHANNEL.sendToServer(new ToggleSmartDoublingC2SPacket()), () -> ModNetwork.CHANNEL.sendToServer(new ToggleSmartDoublingC2SPacket()),
() -> { () -> {
var t = Component.literal("智能翻倍"); var t = Component.translatable("extendedae_plus.gui.smart_doubling.title");
var line = eap$SmartDoublingEnabled var line = eap$SmartDoublingEnabled
? Component.literal("已启用：根据请求量对处理样板进行智能缩放") ? Component.translatable("extendedae_plus.gui.smart_doubling.enabled_desc")
: Component.literal("已禁用：按原始样板数量进行发配"); : Component.translatable("extendedae_plus.gui.smart_doubling.disabled_desc");
return List.of(t, line); return List.of(t, line);
} }
); );
@ -186,7 +186,7 @@ public abstract class AdvPatternProviderScreenMixin extends AEBaseScreen<AdvPatt
// 设置 tooltip // 设置 tooltip
String cur = this.eap$PerProviderLimitInput.getValue(); String cur = this.eap$PerProviderLimitInput.getValue();
if (cur.isBlank()) cur = "0"; if (cur.isBlank()) cur = "0";
this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.literal("单样物品发配数量上限: " + cur))); this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.translatable("extendedae_plus.gui.per_provider_limit.tooltip", cur)));
} else { } else {
// 智能翻倍未启用时，移除输入框 // 智能翻倍未启用时，移除输入框
this.removeWidget(this.eap$PerProviderLimitInput); this.removeWidget(this.eap$PerProviderLimitInput);

14
src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/SmallAdvPatternProviderScreenMixin.java
View File

@ -80,10 +80,10 @@ public abstract class SmallAdvPatternProviderScreenMixin extends AEBaseScreen<Sm
eap$AdvancedBlockingEnabled, eap$AdvancedBlockingEnabled,
() -> ModNetwork.CHANNEL.sendToServer(new ToggleAdvancedBlockingC2SPacket()), () -> ModNetwork.CHANNEL.sendToServer(new ToggleAdvancedBlockingC2SPacket()),
() -> { () -> {
var t = Component.literal("智能阻挡"); var t = Component.translatable("extendedae_plus.gui.advanced_blocking.title");
var line = eap$AdvancedBlockingEnabled var line = eap$AdvancedBlockingEnabled
? Component.literal("已启用：对于同一种配方将不再阻挡 (需要启用原版阻挡模式)") ? Component.translatable("extendedae_plus.gui.advanced_blocking.enabled_desc")
: Component.literal("已禁用：建议开启以获得更智能的阻挡行为"); : Component.translatable("extendedae_plus.gui.advanced_blocking.disabled_desc");
return List.of(t, line); return List.of(t, line);
} }
); );
@ -95,10 +95,10 @@ public abstract class SmallAdvPatternProviderScreenMixin extends AEBaseScreen<Sm
eap$SmartDoublingEnabled, eap$SmartDoublingEnabled,
() -> ModNetwork.CHANNEL.sendToServer(new ToggleSmartDoublingC2SPacket()), () -> ModNetwork.CHANNEL.sendToServer(new ToggleSmartDoublingC2SPacket()),
() -> { () -> {
var t = Component.literal("智能翻倍"); var t = Component.translatable("extendedae_plus.gui.smart_doubling.title");
var line = eap$SmartDoublingEnabled var line = eap$SmartDoublingEnabled
? Component.literal("已启用：根据请求量对处理样板进行智能缩放") ? Component.translatable("extendedae_plus.gui.smart_doubling.enabled_desc")
: Component.literal("已禁用：按原始样板数量进行发配"); : Component.translatable("extendedae_plus.gui.smart_doubling.disabled_desc");
return List.of(t, line); return List.of(t, line);
} }
); );
@ -187,7 +187,7 @@ public abstract class SmallAdvPatternProviderScreenMixin extends AEBaseScreen<Sm
// 设置 tooltip // 设置 tooltip
String cur = this.eap$PerProviderLimitInput.getValue(); String cur = this.eap$PerProviderLimitInput.getValue();
if (cur.isBlank()) cur = "0"; if (cur.isBlank()) cur = "0";
this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.literal("单样物品发配数量上限: " + cur))); this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.translatable("extendedae_plus.gui.per_provider_limit.tooltip", cur)));
} else { } else {
// 智能翻倍未启用时，移除输入框 // 智能翻倍未启用时，移除输入框
this.removeWidget(this.eap$PerProviderLimitInput); this.removeWidget(this.eap$PerProviderLimitInput);

14
src/main/java/com/extendedae_plus/mixin/ae2/client/gui/patternProvider/PatternProviderSmartFeaturesMixin.java
View File

@ -82,10 +82,10 @@ public abstract class PatternProviderSmartFeaturesMixin<C extends PatternProvide
eap$AdvancedBlockingEnabled, eap$AdvancedBlockingEnabled,
() -> ModNetwork.CHANNEL.sendToServer(new ToggleAdvancedBlockingC2SPacket()), () -> ModNetwork.CHANNEL.sendToServer(new ToggleAdvancedBlockingC2SPacket()),
() -> { () -> {
var t = Component.literal("智能阻挡"); var t = Component.translatable("extendedae_plus.gui.advanced_blocking.title");
var line = eap$AdvancedBlockingEnabled var line = eap$AdvancedBlockingEnabled
? Component.literal("已启用：对于同一种配方将不再阻挡 (需要启用原版阻挡模式)") ? Component.translatable("extendedae_plus.gui.advanced_blocking.enabled_desc")
: Component.literal("已禁用：建议开启以获得更智能的阻挡行为"); : Component.translatable("extendedae_plus.gui.advanced_blocking.disabled_desc");
return List.of(t, line); return List.of(t, line);
} }
); );
@ -97,10 +97,10 @@ public abstract class PatternProviderSmartFeaturesMixin<C extends PatternProvide
eap$SmartDoublingEnabled, eap$SmartDoublingEnabled,
() -> ModNetwork.CHANNEL.sendToServer(new ToggleSmartDoublingC2SPacket()), () -> ModNetwork.CHANNEL.sendToServer(new ToggleSmartDoublingC2SPacket()),
() -> { () -> {
var t = Component.literal("智能翻倍"); var t = Component.translatable("extendedae_plus.gui.smart_doubling.title");
var line = eap$SmartDoublingEnabled var line = eap$SmartDoublingEnabled
? Component.literal("已启用：根据请求量对处理样板进行智能缩放") ? Component.translatable("extendedae_plus.gui.smart_doubling.enabled_desc")
: Component.literal("已禁用：按原始样板数量进行发配"); : Component.translatable("extendedae_plus.gui.smart_doubling.disabled_desc");
return List.of(t, line); return List.of(t, line);
} }
); );
@ -190,7 +190,7 @@ public abstract class PatternProviderSmartFeaturesMixin<C extends PatternProvide
// 设置 tooltip // 设置 tooltip
String cur = this.eap$PerProviderLimitInput.getValue(); String cur = this.eap$PerProviderLimitInput.getValue();
if (cur.isBlank()) cur = "0"; if (cur.isBlank()) cur = "0";
this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.literal("单样物品发配数量上限: " + cur))); this.eap$PerProviderLimitInput.setTooltip(Tooltip.create(Component.translatable("extendedae_plus.gui.per_provider_limit.tooltip", cur)));
} else { } else {
// 智能翻倍未启用时，移除输入框 // 智能翻倍未启用时，移除输入框
this.removeWidget(this.eap$PerProviderLimitInput); this.removeWidget(this.eap$PerProviderLimitInput);

13
src/main/resources/assets/extendedae_plus/lang/en_us.json
View File

@ -54,6 +54,19 @@
"chat.extendedae_plus.terminal.pos": "The crafting plan's corresponding provider is now highlighted at: %s, Dimension: %s (%s blocks away)", "chat.extendedae_plus.terminal.pos": "The crafting plan's corresponding provider is now highlighted at: %s, Dimension: %s (%s blocks away)",
"extendedae_plus.gui.advanced_blocking.title": "Smart Blocking",
"extendedae_plus.gui.advanced_blocking.enabled_desc": "Will not block the same recipe type (requires vanilla blocking mode enabled)",
"extendedae_plus.gui.advanced_blocking.disabled_desc": "Use vanilla blocking logic",
"extendedae_plus.gui.smart_doubling.title": "Smart Doubling",
"extendedae_plus.gui.smart_doubling.enabled_desc": "Intelligently double processing patterns based on request quantity",
"extendedae_plus.gui.smart_doubling.disabled_desc": "Distribute according to original pattern quantity",
"extendedae_plus.gui.per_provider_limit.tooltip": "Per-item distribution limit: %s",
"extendedae_plus.gui.entity_acceleration.title": "Entity Acceleration",
"extendedae_plus.gui.entity_acceleration.blacklisted": "Target is blacklisted",
"extendedae_plus.gui.entity_acceleration.enabled": "Accelerate target block entity ticks",
"extendedae_plus.gui.entity_acceleration.disabled": "Do not accelerate target block entities",
"extendedae_plus.screen.reload_mapping": "Reload Mapping", "extendedae_plus.screen.reload_mapping": "Reload Mapping",
"extendedae_plus.screen.reload_mapping_success": "Overloading mapping successful", "extendedae_plus.screen.reload_mapping_success": "Overloading mapping successful",
"extendedae_plus.screen.reload_mapping_fail": "Overloading mapping failed: %s", "extendedae_plus.screen.reload_mapping_fail": "Overloading mapping failed: %s",

15
src/main/resources/assets/extendedae_plus/lang/zh_cn.json
View File

@ -54,6 +54,19 @@
"chat.extendedae_plus.terminal.pos": "合成计划对应供应器现在突出显示在：%s，维度：%s (%s个方块外)", "chat.extendedae_plus.terminal.pos": "合成计划对应供应器现在突出显示在：%s，维度：%s (%s个方块外)",
"extendedae_plus.gui.advanced_blocking.title": "智能阻挡",
"extendedae_plus.gui.advanced_blocking.enabled_desc": "对于同一种配方将不再阻挡 (需要启用原版阻挡模式)",
"extendedae_plus.gui.advanced_blocking.disabled_desc": "使用原版阻挡逻辑",
"extendedae_plus.gui.smart_doubling.title": "智能翻倍",
"extendedae_plus.gui.smart_doubling.enabled_desc": "根据请求量对处理样板进行智能翻倍",
"extendedae_plus.gui.smart_doubling.disabled_desc": "按原始样板数量进行发配",
"extendedae_plus.gui.per_provider_limit.tooltip": "单样物品发配数量上限: %s",
"extendedae_plus.gui.entity_acceleration.title": "实体加速",
"extendedae_plus.gui.entity_acceleration.blacklisted": "目标在黑名单中",
"extendedae_plus.gui.entity_acceleration.enabled": "加速目标方块实体的tick",
"extendedae_plus.gui.entity_acceleration.disabled": "不加速目标方块实体",
"extendedae_plus.screen.reload_mapping": "重载映射", "extendedae_plus.screen.reload_mapping": "重载映射",
"extendedae_plus.screen.reload_mapping_success": "重载映射成功", "extendedae_plus.screen.reload_mapping_success": "重载映射成功",
"extendedae_plus.screen.reload_mapping_fail": "重载映射失败: %s", "extendedae_plus.screen.reload_mapping_fail": "重载映射失败: %s",
@ -87,8 +100,6 @@
"item.extendedae_plus.entity_speed_ticker.tip.max": "最高可达 1024x 加速", "item.extendedae_plus.entity_speed_ticker.tip.max": "最高可达 1024x 加速",
"item.extendedae_plus.entity_speed_ticker.tip.energy": "加速将消耗 AE 网络能量，网络能量不足时无法加速", "item.extendedae_plus.entity_speed_ticker.tip.energy": "加速将消耗 AE 网络能量，网络能量不足时无法加速",
"config.screen.extendedae_plus": "ExtendedAE Plus 配置", "config.screen.extendedae_plus": "ExtendedAE Plus 配置",
"config.extendedae_plus.option.pageMultiplier": "扩展样板供应器槽位倍率", "config.extendedae_plus.option.pageMultiplier": "扩展样板供应器槽位倍率",
"config.extendedae_plus.option.pageMultiplier_with_range": "扩展样板供应器槽位倍率", "config.extendedae_plus.option.pageMultiplier_with_range": "扩展样板供应器槽位倍率",