fix: 取消mixin部分非混淆字段的混淆映射

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 loom.platform = forge
 
 # Mod properties
-mod_version = 1.4.2
+mod_version = 1.4.2-fix
 maven_group = com.extendedae_plus
 archives_name = extendedae_plus
 

src/main/java/com/extendedae_plus/mixin/advancedae/accessor/AdvPatternProviderMenuAdvancedAccessor.java

@@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(AdvPatternProviderMenu.class)
 public interface AdvPatternProviderMenuAdvancedAccessor {
-    @Accessor("logic")
+    @Accessor(value = "logic", remap = false)
     AdvPatternProviderLogic eap$logic();
 }

src/main/java/com/extendedae_plus/mixin/advancedae/menu/AdvPatternProviderMenuAdvancedMixin.java

@@ -9,6 +9,7 @@ import net.minecraft.world.inventory.MenuType;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogicHost;
 import net.pedroksl.advanced_ae.gui.advpatternprovider.AdvPatternProviderMenu;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -18,7 +19,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(AdvPatternProviderMenu.class)
 public abstract class AdvPatternProviderMenuAdvancedMixin implements PatternProviderMenuAdvancedSync {
-    @Shadow
+    @Final
+    @Shadow(remap = false)
     protected AdvPatternProviderLogic logic;
 
     // 选择一个未占用的 GUI 同步 id（AE2 已用到 7），这里使用 21 以避冲突
@@ -38,7 +40,7 @@ public abstract class AdvPatternProviderMenuAdvancedMixin implements PatternProv
     }
 
     // 构造器尾注入（public ctor）
-    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initAdvancedSync_Public(int id, Inventory playerInventory, AdvPatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;
@@ -49,7 +51,7 @@ public abstract class AdvPatternProviderMenuAdvancedMixin implements PatternProv
     }
 
     // 构造器尾注入（protected ctor with MenuType）
-    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initAdvancedSync_Protected(MenuType menuType, int id, Inventory playerInventory, AdvPatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;

src/main/java/com/extendedae_plus/mixin/advancedae/menu/AdvPatternProviderMenuDoublingMixin.java

@@ -9,6 +9,7 @@ import net.minecraft.world.inventory.MenuType;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogicHost;
 import net.pedroksl.advanced_ae.gui.advpatternprovider.AdvPatternProviderMenu;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -18,7 +19,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(AdvPatternProviderMenu.class)
 public abstract class AdvPatternProviderMenuDoublingMixin implements PatternProviderMenuDoublingSync {
-    @Shadow
+    @Final
+    @Shadow(remap = false)
     protected AdvPatternProviderLogic logic;
 
     @Unique
@@ -35,7 +37,7 @@ public abstract class AdvPatternProviderMenuDoublingMixin implements PatternProv
         }
     }
 
-    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initSmartSync_Public(int id, Inventory playerInventory, AdvPatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;
@@ -45,7 +47,7 @@ public abstract class AdvPatternProviderMenuDoublingMixin implements PatternProv
         } catch (Throwable ignored) {}
     }
 
-    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lnet/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initSmartSync_Protected(MenuType menuType, int id, Inventory playerInventory, AdvPatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;

src/main/java/com/extendedae_plus/mixin/ae2/accessor/MEStorageMenuAccessor.java

@@ -10,23 +10,23 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(MEStorageMenu.class)
 public interface MEStorageMenuAccessor {
-    @Accessor("storage")
+    @Accessor(value = "storage", remap = false)
     @Nullable
     MEStorage getStorage();
 
-    @Accessor("powerSource")
+    @Accessor(value = "powerSource", remap = false)
     @Nullable
     IEnergySource getPowerSource();
 
-    @Accessor("hasPower")
+    @Accessor(value = "hasPower", remap = false)
     boolean getHasPower();
 
     // Access client-side config manager mirror used for syncing settings
-    @Accessor("clientCM")
+    @Accessor(value = "clientCM", remap = false)
     IConfigManager getClientCM();
 
     // Access server-side config manager
-    @Accessor("serverCM")
+    @Accessor(value = "serverCM", remap = false)
     @Nullable
     IConfigManager getServerCM();
 }

src/main/java/com/extendedae_plus/mixin/ae2/accessor/PatternEncodingTermMenuAccessor.java

@@ -7,9 +7,9 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(PatternEncodingTermMenu.class)
 public interface PatternEncodingTermMenuAccessor {
-    @Accessor("encodedPatternSlot")
+    @Accessor(value = "encodedPatternSlot",remap = false)
     RestrictedInputSlot eap$getEncodedPatternSlot();
 
-    @Accessor("blankPatternSlot")
+    @Accessor(value = "blankPatternSlot",remap = false)
     RestrictedInputSlot eap$getBlankPatternSlot();
 }

src/main/java/com/extendedae_plus/mixin/ae2/accessor/PatternProviderLogicAccessor.java

@@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(PatternProviderLogic.class)
 public interface PatternProviderLogicAccessor {
-    @Accessor("host")
+    @Accessor(value = "host", remap = false)
     PatternProviderLogicHost eap$host();
 
-    @Accessor("mainNode")
+    @Accessor(value = "mainNode", remap = false)
     IManagedGridNode eap$mainNode();
 }

src/main/java/com/extendedae_plus/mixin/ae2/accessor/PatternProviderLogicPatternInputsAccessor.java

@@ -9,6 +9,6 @@ import java.util.Set;
 
 @Mixin(PatternProviderLogic.class)
 public interface PatternProviderLogicPatternInputsAccessor {
-    @Accessor("patternInputs")
+    @Accessor(value = "patternInputs",remap = false)
     Set<AEKey> eap$patternInputs();
 }

src/main/java/com/extendedae_plus/mixin/ae2/accessor/PatternProviderMenuAdvancedAccessor.java

@@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(PatternProviderMenu.class)
 public interface PatternProviderMenuAdvancedAccessor {
-    @Accessor("logic")
+    @Accessor(value = "logic", remap = false)
     PatternProviderLogic eap$logic();
 }

src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeAccessor.java

@@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(CraftingTreeNode.class)
 public interface CraftingTreeNodeAccessor {
-    @Accessor("what")
+    @Accessor(value = "what", remap = false)
     AEKey eap$getWhat();
 }

src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java

@@ -33,7 +33,8 @@ public abstract class CraftingTreeProcessMixin {
     @ModifyVariable(
             method = "<init>(Lappeng/api/networking/crafting/ICraftingService;Lappeng/crafting/CraftingCalculation;Lappeng/api/crafting/IPatternDetails;Lappeng/crafting/CraftingTreeNode;)V",
             at = @At("HEAD"),
-            argsOnly = true
+            argsOnly = true,
+            remap = false
     )
     private static IPatternDetails eap$replaceDetailsAtHead(IPatternDetails original, ICraftingService cc, CraftingCalculation job, IPatternDetails details, CraftingTreeNode craftingTreeNode) {
         try {

src/main/java/com/extendedae_plus/mixin/ae2/client/gui/AEBaseScreenMixin.java

@@ -312,7 +312,7 @@ public abstract class AEBaseScreenMixin {
     }
 
 
-    @Shadow
+    @Shadow(remap = false)
     protected void setTextContent(String id, Component content) {};
 
     @Inject(method = "updateBeforeRender", at = @At("RETURN"), remap = false)

src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternEncodingTermMenuMixin.java

@@ -14,6 +14,7 @@ import appeng.menu.slot.RestrictedInputSlot;
 import com.extendedae_plus.mixin.ae2.accessor.MEStorageMenuAccessor;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -28,7 +29,8 @@ public abstract class PatternEncodingTermMenuMixin {
     @Unique
     private boolean eap$blankAutoFilled = false;
 
-    @Shadow
+    @Final
+    @Shadow(remap = false)
     private RestrictedInputSlot blankPatternSlot;
 
     @Unique
@@ -87,7 +89,7 @@ public abstract class PatternEncodingTermMenuMixin {
     }
 
     @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/IPatternTerminalMenuHost;Z)V",
-            at = @At("TAIL"))
+            at = @At("TAIL"), remap = false)
     private void eap$autoFillBlankPattern(MenuType<?> menuType, int id, Inventory ip,
                                           IPatternTerminalMenuHost host, boolean bindInventory,
                                           CallbackInfo ci) {
@@ -95,7 +97,7 @@ public abstract class PatternEncodingTermMenuMixin {
     }
 
     @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/IPatternTerminalMenuHost;)V",
-            at = @At("TAIL"))
+            at = @At("TAIL"), remap = false)
     private void eap$autoFillCtor3(int id, Inventory ip, IPatternTerminalMenuHost host, CallbackInfo ci) {
         eap$tryFill(host, ip);
     }

src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuAdvancedMixin.java

@@ -9,6 +9,7 @@ import com.extendedae_plus.api.AdvancedBlockingHolder;
 import com.extendedae_plus.api.PatternProviderMenuAdvancedSync;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -20,7 +21,8 @@ import static com.extendedae_plus.util.ExtendedAELogger.LOGGER;
 
 @Mixin(PatternProviderMenu.class)
 public abstract class PatternProviderMenuAdvancedMixin implements PatternProviderMenuAdvancedSync {
-    @Shadow
+    @Final
+    @Shadow(remap = false)
     protected PatternProviderLogic logic;
 
     // 选择一个未占用的 GUI 同步 id（AE2 已用到 7），这里使用 20 以避冲突
@@ -40,7 +42,7 @@ public abstract class PatternProviderMenuAdvancedMixin implements PatternProvide
     }
 
     // 构造器尾注入（public ctor）
-    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initAdvancedSync_Public(int id, Inventory playerInventory, PatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;
@@ -51,7 +53,7 @@ public abstract class PatternProviderMenuAdvancedMixin implements PatternProvide
     }
 
     // 构造器尾注入（protected ctor with MenuType）
-    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initAdvancedSync_Protected(MenuType<? extends PatternProviderMenu> menuType, int id, Inventory playerInventory, PatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;

src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuDoublingMixin.java

@@ -9,6 +9,7 @@ import com.extendedae_plus.api.PatternProviderMenuDoublingSync;
 import com.extendedae_plus.api.SmartDoublingHolder;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -20,7 +21,8 @@ import static com.extendedae_plus.util.ExtendedAELogger.LOGGER;
 
 @Mixin(PatternProviderMenu.class)
 public abstract class PatternProviderMenuDoublingMixin implements PatternProviderMenuDoublingSync {
-    @Shadow
+    @Final
+    @Shadow(remap = false)
     protected PatternProviderLogic logic;
 
     @Unique
@@ -37,7 +39,7 @@ public abstract class PatternProviderMenuDoublingMixin implements PatternProvide
         }
     }
 
-    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initSmartSync_Public(int id, Inventory playerInventory, PatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;
@@ -49,7 +51,7 @@ public abstract class PatternProviderMenuDoublingMixin implements PatternProvide
         }
     }
 
-    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"))
+    @Inject(method = "<init>(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/patternprovider/PatternProviderLogicHost;)V", at = @At("TAIL"), remap = false)
     private void eap$initSmartSync_Protected(MenuType<? extends PatternProviderMenu> menuType, int id, Inventory playerInventory, PatternProviderLogicHost host, CallbackInfo ci) {
         try {
             var l = this.logic;

src/main/java/com/extendedae_plus/mixin/extendedae/container/ContainerWirelessExPatternTerminalMixin.java

@@ -32,7 +32,7 @@ public abstract class ContainerWirelessExPatternTerminalMixin implements IAction
     private Player epp$player;
 
     // 明确目标构造签名：<init>(int, Inventory, HostWirelessExPAT)
-    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lcom/glodblock/github/extendedae/common/me/itemhost/HostWirelessExPAT;)V", at = @At("TAIL"), require = 0)
+    @Inject(method = "<init>(ILnet/minecraft/world/entity/player/Inventory;Lcom/glodblock/github/extendedae/common/me/itemhost/HostWirelessExPAT;)V", at = @At("TAIL"), require = 0, remap = false)
     private void init(int id, net.minecraft.world.entity.player.Inventory playerInventory, HostWirelessExPAT host, CallbackInfo ci) {
         this.epp$player = playerInventory.player;
         // 注册上传动作：参数顺序必须与客户端 CGenericPacket 保持一致

src/main/java/com/extendedae_plus/mixin/jei/accessor/BookmarkOverlayAccessor.java

@@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(BookmarkOverlay.class)
 public interface BookmarkOverlayAccessor {
-    @Accessor("bookmarkList")
+    @Accessor(value = "bookmarkList", remap = false)
     BookmarkList eap$getBookmarkList();
 }