diff --git a/gradle.properties b/gradle.properties index 32815b9..ba9b599 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G loom.platform = forge # Mod properties -mod_version = 1.4.2-fix +mod_version = 1.4.3 maven_group = com.extendedae_plus archives_name = extendedae_plus diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java index 8df0927..2ae2419 100644 --- a/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java @@ -94,7 +94,6 @@ public class AdvPatternProviderLogicAdvancedMixin implements AdvancedBlockingHol @Inject(method = "exportSettings(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("TAIL")) private void onExportSettings(CompoundTag output, CallbackInfo ci) { - System.out.println(this.eap$advancedBlocking); output.putBoolean(EAP_ADV_BLOCKING_KEY, this.eap$advancedBlocking); } diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicDoublingMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicDoublingMixin.java index 85f7041..5436f6f 100644 --- a/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicDoublingMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicDoublingMixin.java @@ -76,7 +76,6 @@ public class AdvPatternProviderLogicDoublingMixin implements SmartDoublingHolder @Inject(method = "exportSettings(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("TAIL")) private void onExportSettings(CompoundTag output, CallbackInfo ci) { - System.out.println(this.eap$smartDoubling); output.putBoolean(EAP_SMART_DOUBLING_KEY, this.eap$smartDoubling); } diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/InterfaceLogicUpgradesMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/InterfaceLogicUpgradesMixin.java index bf3bb9b..cdecdfa 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/InterfaceLogicUpgradesMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/InterfaceLogicUpgradesMixin.java @@ -41,60 +41,33 @@ public class InterfaceLogicUpgradesMixin { ) private void expandInterfaceUpgrades(IManagedGridNode gridNode, InterfaceLogicHost host, Item is, int slots, CallbackInfo ci) { try { - // 添加更多的安全检查 - if (this.upgrades == null) { - System.err.println("[ExtendedAE_Plus] InterfaceLogic upgrades为null，跳过升级槽扩展"); + // 安全检查 + if (this.upgrades == null || gridNode == null || host == null || is == null) { return; } - if (gridNode == null || host == null || is == null) { - System.err.println("[ExtendedAE_Plus] InterfaceLogic构造参数为null，跳过升级槽扩展"); - return; - } - - System.out.println("[ExtendedAE_Plus] InterfaceLogic升级槽扩展开始"); - int currentSlots = this.upgrades.size(); - System.out.println("[ExtendedAE_Plus] 当前升级槽数量: " + currentSlots); // 检查Applied Flux是否已经修改了升级槽 if (UpgradeSlotCompat.isAppfluxPresent()) { - System.out.println("[ExtendedAE_Plus] 检测到Applied Flux存在"); - if (currentSlots >= 3) { - // Applied Flux已经增加了升级槽到3个或更多，我们不需要再修改 - System.out.println("[ExtendedAE_Plus] Applied Flux已经增加了足够的升级槽，跳过修改"); + // Applied Flux已经增加了足够的升级槽，跳过修改 return; } else if (currentSlots == 2) { // Applied Flux增加到2个，我们再增加1个到3个 - System.out.println("[ExtendedAE_Plus] Applied Flux增加到2个槽，我们再增加到3个"); this.upgrades = UpgradeInventories.forMachine(is, 3, this::onUpgradesChanged); } else if (currentSlots == 1) { - // Applied Flux可能还没有生效，我们直接增加到3个 - System.out.println("[ExtendedAE_Plus] Applied Flux存在但未生效，直接增加到3个槽"); + // Applied Flux存在但未生效，直接增加到3个 this.upgrades = UpgradeInventories.forMachine(is, 3, this::onUpgradesChanged); - } else { - System.out.println("[ExtendedAE_Plus] Applied Flux存在，当前槽数异常: " + currentSlots + "，跳过修改"); - return; } } else { - System.out.println("[ExtendedAE_Plus] Applied Flux不存在"); - if (currentSlots == 1) { - // Applied Flux不存在，我们将升级槽从1个增加到2个 - System.out.println("[ExtendedAE_Plus] 将升级槽从1个增加到2个"); + // Applied Flux不存在，将升级槽从1个增加到2个 this.upgrades = UpgradeInventories.forMachine(is, 2, this::onUpgradesChanged); - } else { - System.out.println("[ExtendedAE_Plus] Applied Flux不存在，当前槽数异常: " + currentSlots + "，跳过修改"); - return; } } - - System.out.println("[ExtendedAE_Plus] InterfaceLogic升级槽扩展完成，最终槽数: " + this.upgrades.size()); } catch (Exception e) { // 发生异常时不修改升级槽，确保不会崩溃 - System.err.println("[ExtendedAE_Plus] Failed to expand interface upgrades: " + e.getMessage()); - e.printStackTrace(); } } } diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicAdvancedMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicAdvancedMixin.java index 18e5a4e..31b4654 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicAdvancedMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicAdvancedMixin.java @@ -94,7 +94,6 @@ public class PatternProviderLogicAdvancedMixin implements AdvancedBlockingHolder @Inject(method = "exportSettings(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("TAIL")) private void onExportSettings(CompoundTag output, CallbackInfo ci) { - System.out.println(this.eap$advancedBlocking); output.putBoolean(EAP_ADV_BLOCKING_KEY, this.eap$advancedBlocking); } diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java index ff3152d..13806f2 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/PatternProviderLogicDoublingMixin.java @@ -76,7 +76,6 @@ public class PatternProviderLogicDoublingMixin implements SmartDoublingHolder { @Inject(method = "exportSettings(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("TAIL")) private void onExportSettings(CompoundTag output, CallbackInfo ci) { - System.out.println(this.eap$smartDoubling); output.putBoolean(EAP_SMART_DOUBLING_KEY, this.eap$smartDoubling); }