Hide "Store EMC" tooltip on non-transmutation terminals

also some other slight rearrangement

src/main/java/gripe/_90/appliede/AppliedE.java

@@ -100,7 +100,7 @@ public final class AppliedE {
         // external storage strategy not provided so as not to clash with service's mounted EMC storage
         StackImportStrategy.register(EMCKeyType.TYPE, EMCImportStrategy::new);
         StackExportStrategy.register(EMCKeyType.TYPE, EMCExportStrategy::new);
-        ContainerItemStrategy.register(EMCKeyType.TYPE, EMCKey.class, new EMCContainerItemStrategy());
+        ContainerItemStrategy.register(EMCKeyType.TYPE, EMCKey.class, EMCContainerItemStrategy.INSTANCE);
 
         return part(EMCModulePart.class, EMCModulePart::new);
     });

src/main/java/gripe/_90/appliede/integration/Addons.java

@@ -2,7 +2,7 @@
 
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.LoadingModList;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
 
 public enum Addons {
     TEAMPE("teamprojecte"),
@@ -22,6 +22,8 @@ public String getModId() {
     public boolean isLoaded() {
         return ModList.get() != null
                 ? ModList.get().isLoaded(modId)
-                : LoadingModList.get().getMods().stream().map(ModInfo::getModId).anyMatch(modId::equals);
+                : LoadingModList.get().getMods().stream()
+                        .map(IModInfo::getModId)
+                        .anyMatch(modId::equals);
     }
 }

src/main/java/gripe/_90/appliede/me/service/EMCStorage.java

@@ -149,10 +149,6 @@ public long extract(AEKey what, long amount, Actionable mode, IActionSource sour
         return extracted.divide(multiplier).longValue();
     }
 
-    public long insertItem(AEItemKey what, long amount, Actionable mode, IActionSource source, boolean mayLearn) {
-        return insertItem(what, amount, mode, source, mayLearn, () -> {});
-    }
-
     public long insertItem(
             AEItemKey what, long amount, Actionable mode, IActionSource source, boolean mayLearn, Runnable onLearn) {
         if (service.getProviders().isEmpty()) {
@@ -215,8 +211,7 @@ public long insertItem(
             source.machine().ifPresent(host -> {
                 if (machineOwnerProvider != null) {
                     var node = Objects.requireNonNull(host.getActionableNode());
-                    var id = node.getOwningPlayerId();
-                    var player = IPlayerRegistry.getConnected(node.getLevel().getServer(), id);
+                    var player = IPlayerRegistry.getConnected(node.getLevel().getServer(), node.getOwningPlayerId());
                     addKnowledge(what, machineOwnerProvider.get(), player);
                 }
             });
@@ -226,6 +221,10 @@ public long insertItem(
         return totalInserted;
     }
 
+    public long insertItem(AEItemKey what, long amount, Actionable mode, IActionSource source, boolean mayLearn) {
+        return insertItem(what, amount, mode, source, mayLearn, () -> {});
+    }
+
     public long extractItem(AEItemKey what, long amount, Actionable mode, IActionSource source, boolean skipStored) {
         if (source.player().isPresent()
                 && !(source.player().get().containerMenu instanceof TransmutationTerminalMenu)) {

src/main/java/gripe/_90/appliede/me/strategy/EMCContainerItemStrategy.java

@@ -20,6 +20,10 @@
 
 @SuppressWarnings("UnstableApiUsage")
 public class EMCContainerItemStrategy implements ContainerItemStrategy<EMCKey, ItemStack> {
+    public static final EMCContainerItemStrategy INSTANCE = new EMCContainerItemStrategy();
+
+    private EMCContainerItemStrategy() {}
+
     @Nullable
     @Override
     public GenericStack getContainedStack(ItemStack stack) {

src/main/java/gripe/_90/appliede/me/strategy/EMCItemImportStrategy.java

@@ -25,7 +25,7 @@ public EMCItemImportStrategy(ServerLevel level, BlockPos fromPos, Direction from
 
     @Override
     public boolean transfer(StackTransferContext context) {
-        if (!(context instanceof EMCItemTransferContext emc)) {
+        if (!(context instanceof EMCItemTransferContext ctx)) {
             return false;
         }
 
@@ -36,7 +36,7 @@ public boolean transfer(StackTransferContext context) {
         }
 
         var adjacentStorage = ExternalStorageFacade.of(itemHandler);
-        var remaining = emc.getOperationsRemaining();
+        var remaining = ctx.getOperationsRemaining();
 
         for (var i = 0; i < adjacentStorage.getSlots() && remaining > 0; i++) {
             var resource = adjacentStorage.getStackInSlot(i);
@@ -52,8 +52,8 @@ public boolean transfer(StackTransferContext context) {
             var amount = adjacentStorage.extract(item, remaining, Actionable.SIMULATE, context.getActionSource());
 
             if (amount > 0) {
-                var inserted = emc.getEmcStorage()
-                        .insertItem(item, amount, Actionable.MODULATE, context.getActionSource(), emc.canLearn());
+                var inserted = ctx.getEmcStorage()
+                        .insertItem(item, amount, Actionable.MODULATE, context.getActionSource(), ctx.canLearn());
                 adjacentStorage.extract(item, inserted, Actionable.MODULATE, context.getActionSource());
                 context.reduceOperationsRemaining(inserted);
                 remaining -= (int) inserted;

src/main/java/gripe/_90/appliede/mixin/main/MEStorageScreenMixin.java

@@ -0,0 +1,27 @@
+package gripe._90.appliede.mixin.main;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import appeng.api.stacks.AEKey;
+import appeng.client.gui.me.common.MEStorageScreen;
+import appeng.menu.me.common.MEStorageMenu;
+
+import gripe._90.appliede.me.key.EMCKey;
+import gripe._90.appliede.menu.TransmutationTerminalMenu;
+
+@Mixin(MEStorageScreen.class)
+public abstract class MEStorageScreenMixin {
+    // spotless:off
+    @Redirect(
+            method = "renderTooltip",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lappeng/menu/me/common/MEStorageMenu;isKeyVisible(Lappeng/api/stacks/AEKey;)Z",
+                    remap = false))
+    // spotless:on
+    private boolean hideEmcKey(MEStorageMenu menu, AEKey what) {
+        return menu.isKeyVisible(what) && (!(what instanceof EMCKey) || menu instanceof TransmutationTerminalMenu);
+    }
+}

src/main/resources/appliede.mixins.json

@@ -16,5 +16,9 @@
     "tooltip.MEInventoryUpdatePacketMixin",
     "tooltip.MEStorageMenuMixin"
   ],
-  "client": ["tooltip.MEStorageScreenMixin", "tooltip.RepoMixin"]
+  "client": [
+    "main.MEStorageScreenMixin",
+    "tooltip.MEStorageScreenMixin",
+    "tooltip.RepoMixin"
+  ]
 }