Merge pull request #15 from Ambossmann/1.20.1

fix inserting/extracting only taking 16/32 items

Author: Hexeption

src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessTerminalMenuHost.java

@@ -2,17 +2,13 @@
 
 import appeng.api.implementations.blockentities.IWirelessAccessPoint;
 import appeng.api.implementations.menuobjects.ItemMenuHost;
-import appeng.api.networking.IGrid;
 import appeng.blockentity.networking.WirelessAccessPointBlockEntity;
 import appeng.helpers.WirelessTerminalMenuHost;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import uk.co.hexeption.aeinfinitybooster.setup.ModItems;
 
@@ -25,11 +21,6 @@
 @Mixin(value = WirelessTerminalMenuHost.class, remap = false)
 public class MixinWirelessTerminalMenuHost extends ItemMenuHost {
 
-    @Shadow
-    private double currentDistanceFromGrid;
-
-    @Shadow @Final private IGrid targetGrid;
-
     public MixinWirelessTerminalMenuHost(Player player, int slot, ItemStack itemStack) {
         super(player, slot, itemStack);
     }
@@ -40,33 +31,16 @@ private void testWap(IWirelessAccessPoint wirelessAccessPoint, CallbackInfoRetur
         wirelessAccessPoint.getGrid().getMachines(WirelessAccessPointBlockEntity.class).forEach(wirelessBlockEntity -> {
 
             if (wirelessBlockEntity.getInternalInventory().getStackInSlot(0).is(ModItems.DIMENSION_CARD.get())) {
-                currentDistanceFromGrid = 32;
-                cir.setReturnValue(Double.MAX_VALUE / 2);
+                cir.setReturnValue(1024.0D);
             }
 
             if (!this.getPlayer().level().dimension().location().toString().equals(wirelessAccessPoint.getLocation().getLevel().dimension().location().toString())) {
                 return;
             }
 
             if (wirelessBlockEntity.getInternalInventory().getStackInSlot(0).is(ModItems.INFINITY_CARD.get())) {
-                currentDistanceFromGrid = 16;
-                cir.setReturnValue(Double.MAX_VALUE / 2);
+                cir.setReturnValue(256.0D);
             }
         });
     }
-
-    // Make sure we don't use more power than we should
-    @Redirect(method = "extractAEPower", at = @At(value = "INVOKE", target = "Ljava/lang/Math;min(DD)D"))
-    private double testPowerMultiplier(double a, double b) {
-        for (var wap : this.targetGrid.getMachines(WirelessAccessPointBlockEntity.class)) {
-            if (wap.getInternalInventory().getStackInSlot(0).is(ModItems.INFINITY_CARD.get())) {
-                return 16;
-            }
-            if (wap.getInternalInventory().getStackInSlot(0).is(ModItems.DIMENSION_CARD.get())) {
-                return 32;
-            }
-        }
-        return Math.min(a, b);
-    }
-
 }