From 9fd6d7c281d64e254bab3b6fe53be37cf001c486 Mon Sep 17 00:00:00 2001 From: Arslaan Pathan Date: Fri, 10 Oct 2025 13:44:41 +1300 Subject: new mixins, fix critical Xray and Fullbright issues, add break ao renderer mode to Fullbright --- .../arslaansmagichax/mixin/AbstractBlockMixin.java | 33 ++++++++++++++++++++ .../mixin/AbstractBlockStateMixin.java | 9 +++++- .../mixin/ClientConnectionMixin.java | 36 ++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java create mode 100644 src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.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 new file mode 100644 index 0000000..c4da479 --- /dev/null +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockMixin.java @@ -0,0 +1,33 @@ +package net.justlearning.arslaan3102.arslaansmagichax.mixin; + +import net.justlearning.arslaan3102.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 index dfb6c7d..9595227 100644 --- a/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/AbstractBlockStateMixin.java @@ -1,8 +1,14 @@ +/* +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 net.justlearning.arslaan3102.arslaansmagichax.mixin; import net.justlearning.arslaan3102.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; @@ -10,12 +16,13 @@ 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 ((ArslaansMagicHaxClient.xray.isEnabled() && ArslaansMagicHaxClient.xray.isInterestingBlock((BlockState) state)) || ArslaansMagicHaxClient.fullbright.isEnabled()) { + 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/ClientConnectionMixin.java b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java new file mode 100644 index 0000000..549076c --- /dev/null +++ b/src/main/java/net/justlearning/arslaan3102/arslaansmagichax/mixin/ClientConnectionMixin.java @@ -0,0 +1,36 @@ +package net.justlearning.arslaan3102.arslaansmagichax.mixin; + +import io.netty.channel.ChannelHandlerContext; +import net.justlearning.arslaan3102.arslaansmagichax.events.PacketEvent; +import net.justlearning.arslaan3102.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(); + } + } +} + -- cgit v1.2.3