migration to 26.2 - run migrateMappings with old loom then bring it back to new

12 files changed, 268 insertions, 0 deletions

diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockMixin.java
new file mode 100644
index 0000000..4a3ddc9
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockMixin.java
@@ -0,0 +1,33 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Objects;
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockState;
+
+@Mixin(BlockBehaviour.class)
+public class AbstractBlockMixin {
+    private static Minecraft mc = Minecraft.getInstance();
+
+    @Inject(method = "getShadeBrightness", at = @At("HEAD"), cancellable = true)
+    private void onGetAmbientOcclusionLightLevel(BlockState state, BlockGetter world, BlockPos pos, CallbackInfoReturnable<Float> cir) {
+        if (mc == null) mc = Minecraft.getInstance(); // just in case :)
+        if (mc != null) {
+            if (mc.level != null && (ArslaansMagicHaxClient.fullbright.isEnabled())) {
+                if (Objects.equals(ArslaansMagicHaxClient.fullbright.mode.getMode(), "Break AO Renderer")) {
+                    cir.setReturnValue(15.0F); // over the limit of 1.0F, breaks the ambient occlusion renderer and messes everything up :) yay
+                } else {
+                    cir.setReturnValue(1.0F);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockStateMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockStateMixin.java
new file mode 100644
index 0000000..cfdc76f
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/AbstractBlockStateMixin.java
@@ -0,0 +1,30 @@
+/*
+THIS FILE EXISTS AS AN ARCHIVE!!!!
+Injecting into getLuminance causes TONS of weird crashes and issues related to world rendering
+New logic is implemented in AbstractBlockMixin.java
+ */
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.level.block.state.BlockBehaviour.BlockStateBase;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BlockStateBase.class)
+public class AbstractBlockStateMixin {
+    private static Minecraft mc = Minecraft.getInstance();
+
+    @Inject(method = "getLightEmission", at = @At("HEAD"), cancellable = true)
+    private void onGetLuminance(CallbackInfoReturnable<Integer> cir) {
+        BlockStateBase state = (BlockStateBase)(Object)this;
+
+        if (mc.level != null && (ArslaansMagicHaxClient.xray.isEnabled() && ArslaansMagicHaxClient.xray.isInterestingBlock((BlockState) state) || ArslaansMagicHaxClient.fullbright.isEnabled())) {
+            cir.setReturnValue(15);
+        }
+    }
+}
+
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/BlockMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/BlockMixin.java
new file mode 100644
index 0000000..2a088c2
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/BlockMixin.java
@@ -0,0 +1,25 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Block.class)
+public class BlockMixin {
+
+    @Inject(method = "shouldRenderFace", at = @At("HEAD"), cancellable = true)
+    private static void onShouldDrawSide(BlockState state, BlockState otherState, Direction side, CallbackInfoReturnable<Boolean> cir) {
+        if (ArslaansMagicHaxClient.xray.isEnabled()) {
+            if (ArslaansMagicHaxClient.xray.isInterestingBlock(state)) {
+                cir.setReturnValue(true);
+                return;
+            }
+            cir.setReturnValue(false);
+        }
+    }
+}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java
new file mode 100644
index 0000000..30390ee
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java
@@ -0,0 +1,23 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.events.SendPacketEventBus;
+import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
+import net.minecraft.network.protocol.Packet;
+import com.arslaancodes.arslaansmagichax.events.PacketEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ClientCommonPacketListenerImpl.class)
+public class ClientCommonNetworkHandlerMixin {
+    @Inject(method = "send", at = @At("HEAD"), cancellable = true)
+    private void onSendPacket(Packet<?> packet, CallbackInfo ci) {
+        PacketEvent.Send ev = new PacketEvent.Send(packet);
+        SendPacketEventBus.post(ev);
+
+        if (ev.isCancelled()) {
+            ci.cancel();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientConnectionMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientConnectionMixin.java
new file mode 100644
index 0000000..320d627
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/ClientConnectionMixin.java
@@ -0,0 +1,36 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import io.netty.channel.ChannelHandlerContext;
+import com.arslaancodes.arslaansmagichax.events.PacketEvent;
+import com.arslaancodes.arslaansmagichax.events.ReceivePacketEventBus;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Iterator;
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
+import net.minecraft.network.protocol.game.ClientboundBundlePacket;
+
+@Mixin(Connection.class)
+public class ClientConnectionMixin {
+    @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/protocol/Packet;)V",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/network/Connection;genericsFtw(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketListener;)V", shift = At.Shift.BEFORE), cancellable = true)
+    private void onHandlePacket(ChannelHandlerContext channelHandlerContext, Packet<?> packet, CallbackInfo ci) {
+        if (packet instanceof ClientboundBundlePacket bundle) {
+            for (Iterator<Packet<? super ClientGamePacketListener>> it = bundle.subPackets().iterator(); it.hasNext(); ) {
+                Packet<? super ClientGamePacketListener> innerPacket = it.next();
+                PacketEvent.Receive ev = new PacketEvent.Receive(innerPacket);
+                ReceivePacketEventBus.post(ev);
+                if (ev.isCancelled()) it.remove();
+            }
+        } else {
+            PacketEvent.Receive ev = new PacketEvent.Receive(packet);
+            ReceivePacketEventBus.post(ev);
+            if (ev.isCancelled()) ci.cancel();
+        }
+    }
+}
+
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java
new file mode 100644
index 0000000..e868708
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java
@@ -0,0 +1,19 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Optional;
+
+@Mixin(targets = "net.minecraft.client.OptionInstance$UnitDouble")
+public class DoubleSliderCallbacksMixin {
+    @Inject(method = "validateValue", at = @At("HEAD"), cancellable = true)
+    private void allowHighGamma(Double value, CallbackInfoReturnable<Optional<Double>> cir) {
+        if (ArslaansMagicHaxClient.fullbright.isEnabled() || ArslaansMagicHaxClient.xray.isEnabled()) {
+            cir.setReturnValue(Optional.of(value));
+        }
+    }
+}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/MinecraftClientMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/MinecraftClientMixin.java
new file mode 100644
index 0000000..188ba27
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/MinecraftClientMixin.java
@@ -0,0 +1,15 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Minecraft.class)
+public class MinecraftClientMixin {
+    @Inject(method = "createTitle", at = @At("HEAD"), cancellable = true)
+    private void onGetWindowTitle(CallbackInfoReturnable<String> cir) {
+        cir.setReturnValue("Arslaan's Magic Hax | Minecraft 1.21.8");
+    }
+}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerEntityMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerEntityMixin.java
new file mode 100644
index 0000000..73583e9
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerEntityMixin.java
@@ -0,0 +1,17 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient;
+import com.arslaancodes.arslaansmagichax.modules.impl.NoAttackCooldown;
+import net.minecraft.world.entity.player.Player;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Player.class)
+public abstract class PlayerEntityMixin {
+    @Inject(method = "getAttackStrengthScale", at = @At("HEAD"), cancellable = true)
+    private void onGetAttackCooldownProgress(CallbackInfoReturnable<Float> cir) {
+        if (ArslaansMagicHaxClient.noAttackCooldown.isEnabled()) cir.setReturnValue(1.0F);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java
new file mode 100644
index 0000000..c2992fd
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java
@@ -0,0 +1,16 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(ServerboundPlayerInputPacket.class)
+public abstract class PlayerInputC2SPacketMixin implements IPacket {
+    private int tag = -1;
+
+    @Override
+    public void hax$setTag(int value) { tag = value; }
+
+    @Override
+    public int hax$getTag() { return tag; }
+}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java
new file mode 100644
index 0000000..f6253b3
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java
@@ -0,0 +1,16 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
+import net.minecraft.network.protocol.game.ServerboundInteractPacket;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(ServerboundInteractPacket.class)
+public abstract class PlayerInteractEntityC2SPacketMixin implements IPacket {
+    private int tag = -1;
+
+    @Override
+    public void hax$setTag(int value) { tag = value; }
+
+    @Override
+    public int hax$getTag() { return tag; }
+}
\ No newline at end of file
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java
new file mode 100644
index 0000000..18422a8
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java
@@ -0,0 +1,16 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import com.arslaancodes.arslaansmagichax.mixininterface.IPacket;
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(ServerboundMovePlayerPacket.class)
+public abstract class PlayerMoveC2SPacketMixin implements IPacket {
+    private int tag = -1;
+
+    @Override
+    public void hax$setTag(int value) { tag = value; }
+
+    @Override
+    public int hax$getTag() { return tag; }
+}
diff --git a/src/main/java/com/arslaancodes/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java
new file mode 100644
index 0000000..b927325
--- /dev/null
+++ b/src/main/java/com/arslaancodes/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java
@@ -0,0 +1,22 @@
+package com.arslaancodes.arslaansmagichax.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Random;
+import net.minecraft.client.gui.components.SplashRenderer;
+import net.minecraft.client.resources.SplashManager;
+
+@Mixin(SplashManager.class)
+public class SplashTextResourceSupplierMixin {
+    private static final Random RANDOM = new Random();
+
+    @Inject(method = "getSplash", at = @At("HEAD"), cancellable = true)
+    public void onGet(CallbackInfoReturnable<SplashRenderer> cir) {
+        String[] splashes = {"\"one can only hope.\"", "hackerman approved", "Cheater!", "totally not malware", "cheats for block game", "dont use /surprise"};
+        String selected = splashes[RANDOM.nextInt(splashes.length)];
+        cir.setReturnValue(new SplashRenderer(selected));
+    }
+}