diff --git a/src/main/java/com/extendedae_plus/config/ModConfig.java b/src/main/java/com/extendedae_plus/config/ModConfig.java index fb9f2f2..2ef2f44 100644 --- a/src/main/java/com/extendedae_plus/config/ModConfig.java +++ b/src/main/java/com/extendedae_plus/config/ModConfig.java @@ -145,6 +145,7 @@ public final class ModConfig { "开启后,将优先尝试从磁盘提取FE能量;反之优先消耗AE网络中的能量" }) @Configurable.Synchronized + @Configurable.ValueUpdateCallback(method = "onPrioritizeDiskEnergyUpdate") public boolean prioritizeDiskEnergy = true; private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor(); diff --git a/src/main/java/com/extendedae_plus/mixin/gtceu/ModularUIGuiContainerCloseMixin.java b/src/main/java/com/extendedae_plus/mixin/gtceu/ModularUIGuiContainerCloseMixin.java index c2fb91f..df04a87 100644 --- a/src/main/java/com/extendedae_plus/mixin/gtceu/ModularUIGuiContainerCloseMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/gtceu/ModularUIGuiContainerCloseMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(value = ModularUIGuiContainer.class) +@Mixin(value = ModularUIGuiContainer.class, remap = false) public class ModularUIGuiContainerCloseMixin { @Inject(method = "removed", at = @At("HEAD")) diff --git a/src/main/resources/assets/extendedae_plus/lang/en_us.json b/src/main/resources/assets/extendedae_plus/lang/en_us.json index 0561e7f..d78e87f 100644 --- a/src/main/resources/assets/extendedae_plus/lang/en_us.json +++ b/src/main/resources/assets/extendedae_plus/lang/en_us.json @@ -52,15 +52,9 @@ "extendedae_plus.upload_to_matrix.fail_no_matrix": "No formed assembly matrix found in the current network", "extendedae_plus.upload_to_matrix.fail_no_GTMatrix": "No formed molecular manipulators were found in the current network", "extendedae_plus.upload_to_matrix.fail_full": "The assembly matrix pattern inventory is full or cannot insert", - "extendedae_plus.upload_to_GTMatrix.fail_full": "The sample compartment of the molecular manipulator is full or cannot be inserted", - "extendedae_plus.upload_to_matrix.repetition": "The assembly matrix already exists on the same board, and the upload is skipped and a blank template is returned", - "extendedae_plus.upload_to_GTMatrix.repetition": "The same board already exists for the molecular manipulator, skipping the upload and returning the blank template", - - "extendedae_plus.upload_to_GTMatrix.fail_full": "The sample compartment of the molecular manipulator is full or cannot be inserted", - "extendedae_plus.upload_to_matrix.repetition": "The assembly matrix already exists on the same board, and the upload is skipped and a blank template is returned", - "extendedae_plus.upload_to_GTMatrix.repetition": "The same board already exists for the molecular manipulator, skipping the upload and returning the blank template", - - "extendedae_plus.upload_to_matrix.repetition": "The Assembly Matrix already contains the same pattern. Upload skipped and blank pattern returned.", + "extendedae_plus.upload_to_GTMatrix.fail_full": "The Molecular Manipulator's pattern inventory is full or cannot accept the pattern", + "extendedae_plus.upload_to_matrix.repetition": "The Assembly Matrix already contains the same pattern, upload skipped and blank pattern returned", + "extendedae_plus.upload_to_GTMatrix.repetition": "The Molecular Manipulator already contains the same pattern, upload skipped and blank pattern returned", "extendedae_plus.screen.reload_mapping": "Reload Mapping", "extendedae_plus.screen.reload_mapping_success": "Overloading mapping successful", diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json index d3d0ab5..39d19df 100644 --- a/src/main/resources/extendedae_plus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -26,6 +26,9 @@ "extendedae.client.HighlightButtonMixin", "extendedae.client.gui.GuiExPatternProviderMixin", "extendedae.client.gui.GuiExPatternTerminalMixin", + "gtceu.AEPatternViewSlotWidgetMixin", + "gtceu.ModularUIGuiContainerCloseMixin", + "gtceu.SlotWidgetMixin", "jei.EncodePatternTransferHandlerMixin", "jei.EncodingHelperMixin", "jei.accessor.BookmarkOverlayAccessor", @@ -56,6 +59,8 @@ "ae2.autopattern.CraftingTreeNodeMixin", "ae2.autopattern.CraftingTreeProcessMixin", "ae2.autopattern.PatternProviderLogicContainsRedirectMixin", + "ae2.autopattern.gtceu.GTLCoreMEPatternBufferPartMachineMixin", + "ae2.autopattern.gtceu.MEPatternBufferPartMachineMixin", "ae2.compat.PatternProviderCompatMixin", "ae2.compat.PatternProviderLogicCompatMixin", "ae2.compat.PatternProviderLogicHostCompatMixin",