Remove unnecessary access transformer, rearrange some annotation values

62832 · May 13, 2024 · 90c555e · 90c555e
1 parent bcbdfb8
commit 90c555e
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -57,7 +57,6 @@ repositories {
 minecraft {
     mappings("parchment", "2023.09.03-1.20.1")
     copyIdeResources.set(true)
-    accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg"))
 
     runs {
         configureEach {

diff --git a/src/main/java/gripe/_90/appliede/client/screen/EMCInterfaceScreen.java b/src/main/java/gripe/_90/appliede/client/screen/EMCInterfaceScreen.java
@@ -27,7 +27,7 @@ public EMCInterfaceScreen(M menu, Inventory playerInventory, Component title, Sc
             var button = new SetAmountButton(btn -> {
                 var idx = amountButtons.indexOf(btn);
                 var configSlot = configSlots.get(idx);
-                menu.openSetAmountMenu(configSlot.slot);
+                menu.openSetAmountMenu(configSlot.getSlotIndex());
             });
 
             button.setDisableBackground(true);

diff --git a/src/main/java/gripe/_90/appliede/mixin/aecapfix/EMCInterfacePartMixin.java b/src/main/java/gripe/_90/appliede/mixin/aecapfix/EMCInterfacePartMixin.java
@@ -10,13 +10,13 @@
 import gripe._90.appliede.me.misc.EMCInterfaceLogic;
 import gripe._90.appliede.part.EMCInterfacePart;
 
-@Mixin(value = EMCInterfacePart.class, remap = false)
+@Mixin(EMCInterfacePart.class)
 public abstract class EMCInterfacePartMixin extends AEBasePart implements AECapFix.Invalidator {
     public EMCInterfacePartMixin(IPartItem<?> partItem) {
         super(partItem);
     }
 
-    @Shadow
+    @Shadow(remap = false)
     public abstract EMCInterfaceLogic getInterfaceLogic();
 
     @Override

diff --git a/src/main/java/gripe/_90/appliede/mixin/misc/MEStorageMenuMixin.java b/src/main/java/gripe/_90/appliede/mixin/misc/MEStorageMenuMixin.java
@@ -14,14 +14,15 @@
 
 import gripe._90.appliede.me.key.EMCKey;
 
-@Mixin(value = MEStorageMenu.class, remap = false)
+@Mixin(MEStorageMenu.class)
 public abstract class MEStorageMenuMixin {
     // spotless:off
     @Redirect(
             method = "lambda$tryFillContainerItem$2",
             at = @At(
                     value = "INVOKE",
-                    target = "Lappeng/api/storage/StorageHelper;poweredExtraction(Lappeng/api/networking/energy/IEnergySource;Lappeng/api/storage/MEStorage;Lappeng/api/stacks/AEKey;JLappeng/api/networking/security/IActionSource;Lappeng/api/config/Actionable;)J"))
+                    target = "Lappeng/api/storage/StorageHelper;poweredExtraction(Lappeng/api/networking/energy/IEnergySource;Lappeng/api/storage/MEStorage;Lappeng/api/stacks/AEKey;JLappeng/api/networking/security/IActionSource;Lappeng/api/config/Actionable;)J",
+                    remap = false))
     // spotless:on
     private long emcExtraction(
             IEnergySource powerSource,

diff --git a/src/main/java/gripe/_90/appliede/mixin/misc/P2PTunnelAttunementAccessor.java b/src/main/java/gripe/_90/appliede/mixin/misc/P2PTunnelAttunementAccessor.java
@@ -10,9 +10,9 @@
 
 import appeng.api.features.P2PTunnelAttunement;
 
-@Mixin(value = P2PTunnelAttunement.class, remap = false)
+@Mixin(P2PTunnelAttunement.class)
 public interface P2PTunnelAttunementAccessor {
-    @Accessor
+    @Accessor(remap = false)
     static Map<TagKey<Item>, Item> getTagTunnels() {
         throw new AssertionError();
     }

diff --git a/src/main/java/gripe/_90/appliede/mixin/misc/TransmutationOfflineAccessor.java b/src/main/java/gripe/_90/appliede/mixin/misc/TransmutationOfflineAccessor.java
@@ -8,9 +8,9 @@
 import moze_intel.projecte.api.capabilities.IKnowledgeProvider;
 import moze_intel.projecte.impl.TransmutationOffline;
 
-@Mixin(value = TransmutationOffline.class, remap = false)
+@Mixin(TransmutationOffline.class)
 public interface TransmutationOfflineAccessor {
-    @Invoker
+    @Invoker(remap = false)
     static IKnowledgeProvider invokeForPlayer(UUID uuid) {
         throw new AssertionError();
     }

diff --git a/src/main/java/gripe/_90/appliede/mixin/tooltip/BasePacketAccessor.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/BasePacketAccessor.java
@@ -7,8 +7,8 @@
 
 import appeng.core.sync.BasePacket;
 
-@Mixin(value = BasePacket.class, remap = false)
+@Mixin(BasePacket.class)
 public interface BasePacketAccessor {
-    @Invoker
+    @Invoker(remap = false)
     void invokeConfigureWrite(FriendlyByteBuf data);
 }
diff --git a/src/main/java/gripe/_90/appliede/mixin/tooltip/MEInventoryUpdatePacketMixin.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/MEInventoryUpdatePacketMixin.java
@@ -11,14 +11,15 @@
 
 import gripe._90.appliede.me.reporting.GridInventoryEMCEntry;
 
-@Mixin(value = MEInventoryUpdatePacket.class, remap = false)
+@Mixin(MEInventoryUpdatePacket.class)
 public abstract class MEInventoryUpdatePacketMixin {
     // spotless:off
     @Redirect(
             method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V",
             at = @At(
                     value = "INVOKE",
-                    target = "Lappeng/core/sync/packets/MEInventoryUpdatePacket;readEntry(Lnet/minecraft/network/FriendlyByteBuf;)Lappeng/menu/me/common/GridInventoryEntry;"))
+                    target = "Lappeng/core/sync/packets/MEInventoryUpdatePacket;readEntry(Lnet/minecraft/network/FriendlyByteBuf;)Lappeng/menu/me/common/GridInventoryEntry;",
+                    remap = false))
     // spotless:on
     private GridInventoryEntry readEntryWithEmc(FriendlyByteBuf buffer) {
         return GridInventoryEMCEntry.readEntry(buffer);

diff --git a/src/main/java/gripe/_90/appliede/mixin/tooltip/MEStorageScreenMixin.java b/src/main/java/gripe/_90/appliede/mixin/tooltip/MEStorageScreenMixin.java
@@ -34,8 +34,7 @@ public MEStorageScreenMixin(C menu, Inventory playerInventory, Component title,
             method = "renderGridInventoryEntryTooltip",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/Minecraft;getInstance()Lnet/minecraft/client/Minecraft;",
-                    remap = true),
+                    target = "Lnet/minecraft/client/Minecraft;getInstance()Lnet/minecraft/client/Minecraft;"),
             locals = LocalCapture.CAPTURE_FAILEXCEPTION,
             remap = false)
     // spotless:on

diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg