From 14c68eb5ba16774f581d95a39e64a7b303954ffc Mon Sep 17 00:00:00 2001 From: Arslaan Pathan Date: Sat, 26 Sep 2026 17:05:36 +1200 Subject: migration to 26.2 - run migrateMappings with old loom then bring it back to new --- .../arslaansmagichax/mixin/AbstractBlockMixin.java | 33 -------------------- .../mixin/AbstractBlockStateMixin.java | 30 ------------------ .../arslaansmagichax/mixin/BlockMixin.java | 26 ---------------- .../mixin/ClientCommonNetworkHandlerMixin.java | 23 -------------- .../mixin/ClientConnectionMixin.java | 36 ---------------------- .../mixin/DoubleSliderCallbacksMixin.java | 19 ------------ .../mixin/MinecraftClientMixin.java | 15 --------- .../arslaansmagichax/mixin/PlayerEntityMixin.java | 18 ----------- .../mixin/PlayerInputC2SPacketMixin.java | 16 ---------- .../mixin/PlayerInteractEntityC2SPacketMixin.java | 17 ---------- .../mixin/PlayerMoveC2SPacketMixin.java | 16 ---------- .../mixin/SplashTextResourceSupplierMixin.java | 22 ------------- 12 files changed, 271 deletions(-) delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/BlockMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/MinecraftClientMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerEntityMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java delete mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java (limited to 'src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin') diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java deleted file mode 100644 index 0556448..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.BlockState; -import net.minecraft.client.MinecraftClient; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -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; - -@Mixin(AbstractBlock.class) -public class AbstractBlockMixin { - private static MinecraftClient mc = MinecraftClient.getInstance(); - - @Inject(method = "getAmbientOcclusionLightLevel", at = @At("HEAD"), cancellable = true) - private void onGetAmbientOcclusionLightLevel(BlockState state, BlockView world, BlockPos pos, CallbackInfoReturnable cir) { - if (mc == null) mc = MinecraftClient.getInstance(); // just in case :) - if (mc != null) { - if (mc.world != 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/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java deleted file mode 100644 index cba7c24..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java +++ /dev/null @@ -1,30 +0,0 @@ -/* -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.block.AbstractBlock.AbstractBlockState; -import net.minecraft.block.BlockState; -import net.minecraft.client.MinecraftClient; -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(AbstractBlockState.class) -public class AbstractBlockStateMixin { - private static MinecraftClient mc = MinecraftClient.getInstance(); - - @Inject(method = "getLuminance", at = @At("HEAD"), cancellable = true) - private void onGetLuminance(CallbackInfoReturnable cir) { - AbstractBlockState state = (AbstractBlockState)(Object)this; - - if (mc.world != null && (ArslaansMagicHaxClient.xray.isEnabled() && ArslaansMagicHaxClient.xray.isInterestingBlock((BlockState) state) || ArslaansMagicHaxClient.fullbright.isEnabled())) { - cir.setReturnValue(15); - } - } -} - diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/BlockMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/BlockMixin.java deleted file mode 100644 index ed4b24e..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/BlockMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.Direction; -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 = "shouldDrawSide", at = @At("HEAD"), cancellable = true) - private static void onShouldDrawSide(BlockState state, BlockState otherState, Direction side, CallbackInfoReturnable cir) { - if (ArslaansMagicHaxClient.xray.isEnabled()) { - if (ArslaansMagicHaxClient.xray.isInterestingBlock(state)) { - cir.setReturnValue(true); - return; - } - cir.setReturnValue(false); - } - } -} diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java deleted file mode 100644 index 246ec30..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientCommonNetworkHandlerMixin.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import com.arslaancodes.arslaansmagichax.events.SendPacketEventBus; -import com.arslaancodes.arslaansmagichax.events.PacketEvent; -import net.minecraft.client.network.ClientCommonNetworkHandler; -import net.minecraft.network.packet.Packet; -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(ClientCommonNetworkHandler.class) -public class ClientCommonNetworkHandlerMixin { - @Inject(method = "sendPacket", 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/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java deleted file mode 100644 index 0eefb9d..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import io.netty.channel.ChannelHandlerContext; -import com.arslaancodes.arslaansmagichax.events.PacketEvent; -import com.arslaancodes.arslaansmagichax.events.ReceivePacketEventBus; -import net.minecraft.network.ClientConnection; -import net.minecraft.network.listener.ClientPlayPacketListener; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.s2c.play.BundleS2CPacket; -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; - -@Mixin(ClientConnection.class) -public class ClientConnectionMixin { - @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;handlePacket(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;)V", shift = At.Shift.BEFORE), cancellable = true) - private void onHandlePacket(ChannelHandlerContext channelHandlerContext, Packet packet, CallbackInfo ci) { - if (packet instanceof BundleS2CPacket bundle) { - for (Iterator> it = bundle.getPackets().iterator(); it.hasNext(); ) { - Packet 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/net/justlearning/arslaan3102/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java deleted file mode 100644 index 9e61561..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/DoubleSliderCallbacksMixin.java +++ /dev/null @@ -1,19 +0,0 @@ -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.option.SimpleOption$DoubleSliderCallbacks") -public class DoubleSliderCallbacksMixin { - @Inject(method = "validate", at = @At("HEAD"), cancellable = true) - private void allowHighGamma(Double value, CallbackInfoReturnable> cir) { - if (ArslaansMagicHaxClient.fullbright.isEnabled() || ArslaansMagicHaxClient.xray.isEnabled()) { - cir.setReturnValue(Optional.of(value)); - } - } -} diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/MinecraftClientMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/MinecraftClientMixin.java deleted file mode 100644 index f4d9c71..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/MinecraftClientMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import net.minecraft.client.MinecraftClient; -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(MinecraftClient.class) -public class MinecraftClientMixin { - @Inject(method = "getWindowTitle", at = @At("HEAD"), cancellable = true) - private void onGetWindowTitle(CallbackInfoReturnable cir) { - cir.setReturnValue("Arslaan's Magic Hax | Minecraft 1.21.8"); - } -} diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerEntityMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerEntityMixin.java deleted file mode 100644 index e844124..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerEntityMixin.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import com.arslaancodes.arslaansmagichax.ArslaansMagicHaxClient; -import com.arslaancodes.arslaansmagichax.modules.impl.NoAttackCooldown; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.entity.player.PlayerEntity; -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(PlayerEntity.class) -public abstract class PlayerEntityMixin { - @Inject(method = "getAttackCooldownProgress", at = @At("HEAD"), cancellable = true) - private void onGetAttackCooldownProgress(CallbackInfoReturnable cir) { - if (ArslaansMagicHaxClient.noAttackCooldown.isEnabled()) cir.setReturnValue(1.0F); - } -} \ No newline at end of file diff --git a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java deleted file mode 100644 index bc89acc..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInputC2SPacketMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import com.arslaancodes.arslaansmagichax.mixininterface.IPacket; -import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(PlayerInputC2SPacket.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/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java deleted file mode 100644 index 0c66b82..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerInteractEntityC2SPacketMixin.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import com.arslaancodes.arslaansmagichax.mixininterface.IPacket; -import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; -import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(PlayerInteractEntityC2SPacket.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/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java deleted file mode 100644 index 8a8bd0e..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/PlayerMoveC2SPacketMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import com.arslaancodes.arslaansmagichax.mixininterface.IPacket; -import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(PlayerMoveC2SPacket.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/net/justlearning/arslaan3102/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java deleted file mode 100644 index 8a6942e..0000000 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/SplashTextResourceSupplierMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.arslaancodes.arslaansmagichax.mixin; - -import net.minecraft.client.gui.screen.SplashTextRenderer; -import net.minecraft.client.resource.SplashTextResourceSupplier; -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; - -@Mixin(SplashTextResourceSupplier.class) -public class SplashTextResourceSupplierMixin { - private static final Random RANDOM = new Random(); - - @Inject(method = "get", at = @At("HEAD"), cancellable = true) - public void onGet(CallbackInfoReturnable 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 SplashTextRenderer(selected)); - } -} -- cgit v1.2.3