diff --git a/src/main/java/net/shadow/client/feature/module/impl/crash/LoominaCrash.java b/src/main/java/net/shadow/client/feature/module/impl/crash/LoominaCrash.java new file mode 100644 index 0000000..ab7a3b0 --- /dev/null +++ b/src/main/java/net/shadow/client/feature/module/impl/crash/LoominaCrash.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) Shadow client, 0x150, Saturn5VFive 2022. All rights reserved. + */ + +package net.shadow.client.feature.module.impl.crash; + +import net.minecraft.client.util.math.MatrixStack; +import net.shadow.client.feature.module.Module; +import net.shadow.client.feature.module.ModuleType; + +public class LoominaCrash extends Module { + + public LoominaCrash() { + super("Loomina", "make infinitely big items with a loom", ModuleType.CRASH); + } + + @Override + public void tick() { + + } + + @Override + public void enable() { + } + + @Override + public void disable() { + } + + @Override + public String getContext() { + return null; + } + + @Override + public void onWorldRender(MatrixStack matrices) { + + } + + @Override + public void onHudRender() { + + } +} diff --git a/src/main/java/net/shadow/client/mixin/AEntityRendererMixin.java b/src/main/java/net/shadow/client/mixin/AEntityRendererMixin.java index 0e161ec..800ad25 100644 --- a/src/main/java/net/shadow/client/mixin/AEntityRendererMixin.java +++ b/src/main/java/net/shadow/client/mixin/AEntityRendererMixin.java @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public abstract class AEntityRendererMixin { @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true) - public void atomic_renderEntityLabel(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { + public void renderEntityLabel(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { if (entity.getCustomName() != null && entity.getCustomName().equals(Text.of("DoNotRenderThisUsernamePlease"))) { ci.cancel(); } diff --git a/src/main/java/net/shadow/client/mixin/AGenericContainerScreenMixin.java b/src/main/java/net/shadow/client/mixin/AGenericContainerScreenMixin.java index a085ddd..83170fe 100644 --- a/src/main/java/net/shadow/client/mixin/AGenericContainerScreenMixin.java +++ b/src/main/java/net/shadow/client/mixin/AGenericContainerScreenMixin.java @@ -42,7 +42,7 @@ public abstract class AGenericContainerScreenMixin { } @Inject(method = "tick", at = @At("HEAD")) - public void atomic_preTick(CallbackInfo ci) { + public void preTick(CallbackInfo ci) { if (!ModuleRegistry.getByClass(InventoryWalk.class).isEnabled()) { return; } diff --git a/src/main/java/net/shadow/client/mixin/AInGameHudMixin.java b/src/main/java/net/shadow/client/mixin/AInGameHudMixin.java index 094c7e8..26a9b08 100644 --- a/src/main/java/net/shadow/client/mixin/AInGameHudMixin.java +++ b/src/main/java/net/shadow/client/mixin/AInGameHudMixin.java @@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(InGameHud.class) public abstract class AInGameHudMixin extends DrawableHelper { @Inject(method = "render", at = @At("RETURN")) - public void atomic_postRender(MatrixStack matrices, float tickDelta, CallbackInfo ci) { + public void postRender(MatrixStack matrices, float tickDelta, CallbackInfo ci) { AccurateFrameRateCounter.globalInstance.recordFrame(); MSAAFramebuffer.use(MSAAFramebuffer.MAX_SAMPLES, () -> { for (Module module : ModuleRegistry.getModules()) { diff --git a/src/main/java/net/shadow/client/mixin/BlockEntityRenderDispatcherMixin.java b/src/main/java/net/shadow/client/mixin/BlockEntityRenderDispatcherMixin.java index 28de8d6..787f61a 100644 --- a/src/main/java/net/shadow/client/mixin/BlockEntityRenderDispatcherMixin.java +++ b/src/main/java/net/shadow/client/mixin/BlockEntityRenderDispatcherMixin.java @@ -21,7 +21,7 @@ public class BlockEntityRenderDispatcherMixin { @Inject(method = "render(Lnet/minecraft/block/entity/BlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;)V", at = @At("HEAD"), cancellable = true) - public void atomic_preRender(E blockEntity, float tickDelta, MatrixStack matrix, VertexConsumerProvider vertexConsumerProvider, CallbackInfo ci) { + public void preRender(E blockEntity, float tickDelta, MatrixStack matrix, VertexConsumerProvider vertexConsumerProvider, CallbackInfo ci) { if (Events.fireEvent(EventType.BLOCK_ENTITY_RENDER, new BlockEntityRenderEvent(matrix, blockEntity))) { ci.cancel(); } diff --git a/src/main/java/net/shadow/client/mixin/BlockMixin.java b/src/main/java/net/shadow/client/mixin/BlockMixin.java index 0c56efc..f7751b1 100644 --- a/src/main/java/net/shadow/client/mixin/BlockMixin.java +++ b/src/main/java/net/shadow/client/mixin/BlockMixin.java @@ -22,14 +22,14 @@ import java.util.Objects; public class BlockMixin { @Inject(method = "shouldDrawSide", at = @At("HEAD"), cancellable = true) - private static void atomic_overwriteShouldDrawSide(BlockState state, BlockView world, BlockPos pos, Direction side, BlockPos blockPos, CallbackInfoReturnable cir) { + private static void overwriteShouldDrawSide(BlockState state, BlockView world, BlockPos pos, Direction side, BlockPos blockPos, CallbackInfoReturnable cir) { if (Objects.requireNonNull(ModuleRegistry.getByClass(XRAY.class)).isEnabled()) { cir.setReturnValue(XRAY.blocks.contains(state.getBlock())); } } @Inject(method = "isTranslucent", at = @At("HEAD"), cancellable = true) - public void atomic_overwriteIsTranslucent(BlockState state, BlockView world, BlockPos pos, CallbackInfoReturnable cir) { + public void overwriteIsTranslucent(BlockState state, BlockView world, BlockPos pos, CallbackInfoReturnable cir) { if (Objects.requireNonNull(ModuleRegistry.getByClass(XRAY.class)).isEnabled()) { cir.setReturnValue(!XRAY.blocks.contains(state.getBlock())); } diff --git a/src/main/java/net/shadow/client/mixin/BlockRenderManagerMixin.java b/src/main/java/net/shadow/client/mixin/BlockRenderManagerMixin.java index f80de07..ebf990b 100644 --- a/src/main/java/net/shadow/client/mixin/BlockRenderManagerMixin.java +++ b/src/main/java/net/shadow/client/mixin/BlockRenderManagerMixin.java @@ -24,7 +24,7 @@ import java.util.Random; public class BlockRenderManagerMixin { @Inject(method = "renderBlock", at = @At("HEAD"), cancellable = true) - public void atomic_dispatchRenderBlock(BlockState state, BlockPos pos, BlockRenderView world, MatrixStack matrix, VertexConsumer vertexConsumer, boolean cull, Random random, CallbackInfoReturnable cir) { + public void dispatchRenderBlock(BlockState state, BlockPos pos, BlockRenderView world, MatrixStack matrix, VertexConsumer vertexConsumer, boolean cull, Random random, CallbackInfoReturnable cir) { if (Events.fireEvent(EventType.BLOCK_RENDER, new BlockRenderingEvent(matrix, pos, state))) { cir.setReturnValue(true); } diff --git a/src/main/java/net/shadow/client/mixin/ClientConnection1Mixin.java b/src/main/java/net/shadow/client/mixin/ClientConnection1Mixin.java index 63ab11a..2ce6263 100644 --- a/src/main/java/net/shadow/client/mixin/ClientConnection1Mixin.java +++ b/src/main/java/net/shadow/client/mixin/ClientConnection1Mixin.java @@ -19,7 +19,7 @@ import java.net.InetSocketAddress; public class ClientConnection1Mixin { @Inject(method = "initChannel(Lio/netty/channel/Channel;)V", at = @At("HEAD")) - public void atomic_applyProxy(Channel channel, CallbackInfo ci) { + public void applyProxy(Channel channel, CallbackInfo ci) { ProxyManagerScreen.Proxy currentProxy = ProxyManagerScreen.currentProxy; if (currentProxy != null) { if (currentProxy.socks4()) { diff --git a/src/main/java/net/shadow/client/mixin/ClientConnectionMixin.java b/src/main/java/net/shadow/client/mixin/ClientConnectionMixin.java index 27e66fe..589484c 100644 --- a/src/main/java/net/shadow/client/mixin/ClientConnectionMixin.java +++ b/src/main/java/net/shadow/client/mixin/ClientConnectionMixin.java @@ -22,21 +22,21 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class ClientConnectionMixin { @Inject(method = "handlePacket", at = @At("HEAD"), cancellable = true) - private static void atomic_dispatchPacketGet(Packet packet, PacketListener listener, CallbackInfo ci) { + private static void dispatchPacketGet(Packet packet, PacketListener listener, CallbackInfo ci) { if (Events.fireEvent(EventType.PACKET_RECEIVE, new PacketEvent(packet))) { ci.cancel(); } } @Inject(method = "exceptionCaught", at = @At("HEAD"), cancellable = true) - public void atomic_catchException(ChannelHandlerContext context, Throwable ex, CallbackInfo ci) { + public void catchException(ChannelHandlerContext context, Throwable ex, CallbackInfo ci) { if (ModuleRegistry.getByClass(AntiPacketKick.class).isEnabled()) { ci.cancel(); } } @Inject(method = "send(Lnet/minecraft/network/Packet;)V", cancellable = true, at = @At("HEAD")) - public void atomic_dispatchPacketSend(Packet packet, CallbackInfo ci) { + public void dispatchPacketSend(Packet packet, CallbackInfo ci) { if (Events.fireEvent(EventType.PACKET_SEND, new PacketEvent(packet))) { ci.cancel(); } diff --git a/src/main/java/net/shadow/client/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/shadow/client/mixin/ClientPlayerEntityMixin.java index 43f140b..b0ad475 100644 --- a/src/main/java/net/shadow/client/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/net/shadow/client/mixin/ClientPlayerEntityMixin.java @@ -25,7 +25,7 @@ import java.util.Objects; @Mixin(ClientPlayerEntity.class) public class ClientPlayerEntityMixin { @Inject(method = "tick", at = @At("HEAD")) - public void atomic_preTick(CallbackInfo ci) { + public void preTick(CallbackInfo ci) { Utils.TickManager.tick(); if (!ConfigManager.enabled) { ConfigManager.enableModules(); @@ -38,12 +38,12 @@ public class ClientPlayerEntityMixin { } @Redirect(method = "updateNausea", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;shouldPause()Z")) - public boolean atomic_overwriteIsPauseScreen(Screen screen) { + public boolean overwriteIsPauseScreen(Screen screen) { return Objects.requireNonNull(ModuleRegistry.getByClass(PortalGUI.class)).isEnabled() || screen.shouldPause(); } @Inject(method = "pushOutOfBlocks", at = @At("HEAD"), cancellable = true) - public void atomic_preventPushOutFromBlocks(double x, double z, CallbackInfo ci) { + public void preventPushOutFromBlocks(double x, double z, CallbackInfo ci) { if (Objects.requireNonNull(ModuleRegistry.getByClass(Freecam.class)).isEnabled() || Objects.requireNonNull(ModuleRegistry.getByClass(NoPush.class)) .isEnabled() || Objects.requireNonNull(ModuleRegistry.getByClass(Phase.class)).isEnabled()) { ci.cancel(); diff --git a/src/main/java/net/shadow/client/mixin/ClientPlayerInteractionManagerMixin.java b/src/main/java/net/shadow/client/mixin/ClientPlayerInteractionManagerMixin.java index ea458c3..e5186b7 100644 --- a/src/main/java/net/shadow/client/mixin/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/net/shadow/client/mixin/ClientPlayerInteractionManagerMixin.java @@ -22,7 +22,7 @@ public class ClientPlayerInteractionManagerMixin { @Redirect(method = "updateBlockBreakingProgress", at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;blockBreakingCooldown:I", opcode = Opcodes.GETFIELD, ordinal = 0)) - public int atomic_overwriteCooldown(ClientPlayerInteractionManager clientPlayerInteractionManager) { + public int overwriteCooldown(ClientPlayerInteractionManager clientPlayerInteractionManager) { int cd = this.blockBreakingCooldown; return Objects.requireNonNull(ModuleRegistry.getByClass(NoBreakDelay.class)).isEnabled() ? 0 : cd; } diff --git a/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java b/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java index 2b77276..499944f 100644 --- a/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java +++ b/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java @@ -18,7 +18,7 @@ public class Deadmau5FeatureRendererMixin { @Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/network/AbstractClientPlayerEntity;FFFFFF)V", at = @At(value = "INVOKE", target = "Ljava/lang/String;equals(Ljava/lang/Object;)Z")) - boolean atomic_overwriteNameMatcher(String s, Object anObject) { + boolean overwriteNameMatcher(String s, Object anObject) { if (ModuleRegistry.getByClass(MouseEars.class).isEnabled()) { return true; } @@ -27,7 +27,7 @@ public class Deadmau5FeatureRendererMixin { @Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/network/AbstractClientPlayerEntity;FFFFFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;hasSkinTexture()Z")) - boolean atomic_overwriteSkinTexture(AbstractClientPlayerEntity abstractClientPlayerEntity) { + boolean overwriteSkinTexture(AbstractClientPlayerEntity abstractClientPlayerEntity) { if (ModuleRegistry.getByClass(MouseEars.class).isEnabled()) { return true; } diff --git a/src/main/java/net/shadow/client/mixin/EntityMixin.java b/src/main/java/net/shadow/client/mixin/EntityMixin.java index 63f0222..a663dc5 100644 --- a/src/main/java/net/shadow/client/mixin/EntityMixin.java +++ b/src/main/java/net/shadow/client/mixin/EntityMixin.java @@ -26,7 +26,7 @@ public abstract class EntityMixin { } @Redirect(method = "updateVelocity", at = @At(value = "INVOKE", target = "net/minecraft/entity/Entity.getYaw()F")) - float atomic_overwriteFreelookYaw(Entity instance) { + float overwriteFreelookYaw(Entity instance) { return instance.equals(ShadowMain.client.player) && ModuleRegistry.getByClass(FreeLook.class).isEnabled() ? ModuleRegistry.getByClass(FreeLook.class).newyaw : instance.getYaw(); } } diff --git a/src/main/java/net/shadow/client/mixin/EntityRenderDispatcherMixin.java b/src/main/java/net/shadow/client/mixin/EntityRenderDispatcherMixin.java index d4cc7b4..7d3ad37 100644 --- a/src/main/java/net/shadow/client/mixin/EntityRenderDispatcherMixin.java +++ b/src/main/java/net/shadow/client/mixin/EntityRenderDispatcherMixin.java @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class EntityRenderDispatcherMixin { @Inject(method = "render", at = @At("HEAD"), cancellable = true) - public void atomic_dispatchEntityRender(E entity, double x, double y, double z, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { + public void dispatchEntityRender(E entity, double x, double y, double z, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { if (Events.fireEvent(EventType.ENTITY_RENDER, new EntityRenderEvent(matrices, entity))) { ci.cancel(); } diff --git a/src/main/java/net/shadow/client/mixin/GameRendererMixin.java b/src/main/java/net/shadow/client/mixin/GameRendererMixin.java index 79602b9..88a51b9 100644 --- a/src/main/java/net/shadow/client/mixin/GameRendererMixin.java +++ b/src/main/java/net/shadow/client/mixin/GameRendererMixin.java @@ -39,7 +39,7 @@ public class GameRendererMixin { private boolean dis; @Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/GameRenderer;renderHand:Z", opcode = Opcodes.GETFIELD, ordinal = 0), method = "renderWorld") - void atomic_dispatchWorldRender(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) { + void dispatchWorldRender(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) { if (vb) { ShadowMain.client.options.bobView = true; vb = false; @@ -76,12 +76,12 @@ public class GameRendererMixin { } @Inject(at = @At("HEAD"), method = "renderWorld") - private void atomic_preRenderWorld(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) { + private void preRenderWorld(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) { dis = true; } @Inject(at = @At("HEAD"), method = "bobView", cancellable = true) - private void atomic_stopCursorBob(MatrixStack matrices, float f, CallbackInfo ci) { + private void stopCursorBob(MatrixStack matrices, float f, CallbackInfo ci) { if (ShadowMain.client.options.bobView && dis) { vb = true; ShadowMain.client.options.bobView = false; @@ -91,7 +91,7 @@ public class GameRendererMixin { } @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;raycast(DFZ)Lnet/minecraft/util/hit/HitResult;"), method = "updateTargetedEntity") - HitResult atomic_replaceFreelookHitResult(Entity instance, double maxDistance, float tickDelta, boolean includeFluids) { + HitResult replaceFreelookHitResult(Entity instance, double maxDistance, float tickDelta, boolean includeFluids) { if (ModuleRegistry.getByClass(FreeLook.class).isEnabled()) { Vec3d vec3d = instance.getCameraPosVec(tickDelta); Vec3d vec3d2 = Utils.Math.getRotationVector(Rotations.getClientPitch(), Rotations.getClientYaw()); @@ -103,7 +103,7 @@ public class GameRendererMixin { } @Inject(method = "getFov", at = @At("RETURN"), cancellable = true) - public void atomic_overwriteFov(Camera camera, float tickDelta, boolean changingFov, CallbackInfoReturnable cir) { + public void overwriteFov(Camera camera, float tickDelta, boolean changingFov, CallbackInfoReturnable cir) { double zv = ModuleRegistry.getByClass(Zoom.class).getZoomValue(cir.getReturnValue()); cir.setReturnValue(zv); } diff --git a/src/main/java/net/shadow/client/mixin/ItemStackMixin.java b/src/main/java/net/shadow/client/mixin/ItemStackMixin.java index deb5ef1..4a85d32 100644 --- a/src/main/java/net/shadow/client/mixin/ItemStackMixin.java +++ b/src/main/java/net/shadow/client/mixin/ItemStackMixin.java @@ -22,7 +22,7 @@ import java.util.List; public class ItemStackMixin { @Inject(method = "getTooltip", at = @At("RETURN"), cancellable = true) - void atomic_dispatchTooltipRender(PlayerEntity player, TooltipContext context, CallbackInfoReturnable> cir) { + void dispatchTooltipRender(PlayerEntity player, TooltipContext context, CallbackInfoReturnable> cir) { List cval = cir.getReturnValue(); LoreQueryEvent event = new LoreQueryEvent((ItemStack) (Object) this, cval); Events.fireEvent(EventType.LORE_QUERY, event); diff --git a/src/main/java/net/shadow/client/mixin/KeyboardMixin.java b/src/main/java/net/shadow/client/mixin/KeyboardMixin.java index f95198a..ba0de36 100644 --- a/src/main/java/net/shadow/client/mixin/KeyboardMixin.java +++ b/src/main/java/net/shadow/client/mixin/KeyboardMixin.java @@ -28,7 +28,7 @@ public class KeyboardMixin { private MinecraftClient client; @Inject(method = "onKey", at = @At("RETURN")) - void atomic_postKeyPressed(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) { + void postKeyPressed(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) { if (window == this.client.getWindow() .getHandle() && ShadowMain.client.currentScreen == null && System.currentTimeMillis() - ShadowMain.lastScreenChange > 10) { // make sure we are in game and the screen has been there for at least 10 ms if (ShadowMain.client.player == null || ShadowMain.client.world == null) { diff --git a/src/main/java/net/shadow/client/mixin/LivingEntityMixin.java b/src/main/java/net/shadow/client/mixin/LivingEntityMixin.java index 3280738..e2c97d8 100644 --- a/src/main/java/net/shadow/client/mixin/LivingEntityMixin.java +++ b/src/main/java/net/shadow/client/mixin/LivingEntityMixin.java @@ -28,7 +28,7 @@ import java.util.Objects; @Mixin(LivingEntity.class) public class LivingEntityMixin { @Inject(method = "onAttacking", at = @At("HEAD")) - public void atomic_setLastAttacked(Entity target, CallbackInfo ci) { + public void setLastAttacked(Entity target, CallbackInfo ci) { if (this.equals(ShadowMain.client.player) && target instanceof LivingEntity entity) { AttackManager.registerLastAttacked(entity); } @@ -39,7 +39,7 @@ public class LivingEntityMixin { // instance.setVelocity(x,y,z); // } @Inject(method = "canWalkOnFluid", at = @At("HEAD"), cancellable = true) - public void atomic_overwriteCanWalkOnFluid(FluidState fluidState, CallbackInfoReturnable cir) { + public void overwriteCanWalkOnFluid(FluidState fluidState, CallbackInfoReturnable cir) { if (ShadowMain.client.player == null) { return; } @@ -53,7 +53,7 @@ public class LivingEntityMixin { } @Redirect(method = "travel", at = @At(value = "INVOKE", target = "net/minecraft/entity/LivingEntity.hasStatusEffect(Lnet/minecraft/entity/effect/StatusEffect;)Z")) - boolean atomic_stopLevitationEffect(LivingEntity instance, StatusEffect effect) { + boolean stopLevitationEffect(LivingEntity instance, StatusEffect effect) { if (instance.equals(ShadowMain.client.player) && ModuleRegistry.getByClass(NoLevitation.class).isEnabled() && effect == StatusEffects.LEVITATION) { return false; } else { @@ -62,7 +62,7 @@ public class LivingEntityMixin { } @Inject(method = "pushAwayFrom", at = @At("HEAD"), cancellable = true) - public void atomic_cancelPush(Entity entity, CallbackInfo ci) { + public void cancelPush(Entity entity, CallbackInfo ci) { if (this.equals(ShadowMain.client.player)) { if (Objects.requireNonNull(ModuleRegistry.getByClass(NoPush.class)).isEnabled()) { ci.cancel(); @@ -71,7 +71,7 @@ public class LivingEntityMixin { } @Redirect(method = "jump", at = @At(value = "INVOKE", target = "net/minecraft/entity/LivingEntity.getYaw()F")) - private float atomic_overwriteFreelookYaw(LivingEntity instance) { + private float overwriteFreelookYaw(LivingEntity instance) { if (instance.equals(ShadowMain.client.player) && ModuleRegistry.getByClass(FreeLook.class).isEnabled()) { return ModuleRegistry.getByClass(FreeLook.class).newyaw; } diff --git a/src/main/java/net/shadow/client/mixin/LivingEntityRendererMixin.java b/src/main/java/net/shadow/client/mixin/LivingEntityRendererMixin.java index 3862941..e0cca7f 100644 --- a/src/main/java/net/shadow/client/mixin/LivingEntityRendererMixin.java +++ b/src/main/java/net/shadow/client/mixin/LivingEntityRendererMixin.java @@ -17,7 +17,7 @@ public class LivingEntityRendererMixin { @ModifyVariable(method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", ordinal = 2, at = @At(value = "STORE", ordinal = 0)) - public float atomic_overwriteYaw(float oldValue, LivingEntity le) { + public float overwriteYaw(float oldValue, LivingEntity le) { if (Rotations.isEnabled() && le.equals(ShadowMain.client.player)) { return Rotations.getClientYaw(); } @@ -26,7 +26,7 @@ public class LivingEntityRendererMixin { @ModifyVariable(method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", ordinal = 3, at = @At(value = "STORE", ordinal = 0)) - public float atomic_overwriteHeadYaw(float oldValue, LivingEntity le) { + public float overwriteHeadYaw(float oldValue, LivingEntity le) { if (le.equals(ShadowMain.client.player) && Rotations.isEnabled()) { return Rotations.getClientYaw(); } @@ -35,7 +35,7 @@ public class LivingEntityRendererMixin { @ModifyVariable(method = "render(Lnet/minecraft/entity/LivingEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", ordinal = 5, at = @At(value = "STORE", ordinal = 3)) - public float atomic_overwritePitch(float oldValue, LivingEntity le) { + public float overwritePitch(float oldValue, LivingEntity le) { if (le.equals(ShadowMain.client.player) && Rotations.isEnabled()) { return Rotations.getClientPitch(); } diff --git a/src/main/java/net/shadow/client/mixin/MinecraftClientMixin.java b/src/main/java/net/shadow/client/mixin/MinecraftClientMixin.java index 5a99e0d..419bc19 100644 --- a/src/main/java/net/shadow/client/mixin/MinecraftClientMixin.java +++ b/src/main/java/net/shadow/client/mixin/MinecraftClientMixin.java @@ -32,17 +32,17 @@ public class MinecraftClientMixin { } @Inject(method = "", at = @At("TAIL")) - void atomic_postInit(RunArgs args, CallbackInfo ci) { + void postInit(RunArgs args, CallbackInfo ci) { ShadowMain.INSTANCE.postWindowInit(); } @Inject(method = "setScreen", at = @At("HEAD")) - void atomic_preSetScreen(Screen screen, CallbackInfo ci) { + void preSetScreen(Screen screen, CallbackInfo ci) { ShadowMain.lastScreenChange = System.currentTimeMillis(); } @Redirect(method = "handleInputEvents", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/client/MinecraftClient;itemUseCooldown:I")) - public int atomic_replaceItemUseCooldown(MinecraftClient minecraftClient) { + public int replaceItemUseCooldown(MinecraftClient minecraftClient) { if (Objects.requireNonNull(ModuleRegistry.getByClass(FastUse.class)).isEnabled()) { return 0; } else { diff --git a/src/main/java/net/shadow/client/mixin/MouseMixin.java b/src/main/java/net/shadow/client/mixin/MouseMixin.java index 918b3e4..8b912c5 100644 --- a/src/main/java/net/shadow/client/mixin/MouseMixin.java +++ b/src/main/java/net/shadow/client/mixin/MouseMixin.java @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MouseMixin { @Inject(method = "onMouseButton", at = @At("HEAD"), cancellable = true) - public void atomic_dispatchMouseEvent(long window, int button, int action, int mods, CallbackInfo ci) { + public void dispatchMouseEvent(long window, int button, int action, int mods, CallbackInfo ci) { if (window == ShadowMain.client.getWindow().getHandle()) { if (Events.fireEvent(EventType.MOUSE_EVENT, new MouseEvent(button, action))) { ci.cancel(); diff --git a/src/main/java/net/shadow/client/mixin/PlayerEntityMixin.java b/src/main/java/net/shadow/client/mixin/PlayerEntityMixin.java index 04ae79d..20f457a 100644 --- a/src/main/java/net/shadow/client/mixin/PlayerEntityMixin.java +++ b/src/main/java/net/shadow/client/mixin/PlayerEntityMixin.java @@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(PlayerEntity.class) public class PlayerEntityMixin { @Redirect(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/player/PlayerEntity;noClip:Z", opcode = Opcodes.PUTFIELD)) - void atomic_tickNoClip(PlayerEntity playerEntity, boolean value) { + void tickNoClip(PlayerEntity playerEntity, boolean value) { PlayerNoClipQueryEvent q = new PlayerNoClipQueryEvent(playerEntity); Events.fireEvent(EventType.NOCLIP_QUERY, q); playerEntity.noClip = q.getNoClip(); @@ -39,7 +39,7 @@ public class PlayerEntityMixin { } @Inject(method = "jump", at = @At("RETURN")) - void atomic_applyLongJump(CallbackInfo ci) { + void applyLongJump(CallbackInfo ci) { if (!this.equals(ShadowMain.client.player)) { return; } diff --git a/src/main/java/net/shadow/client/mixin/SharedConstantsMixin.java b/src/main/java/net/shadow/client/mixin/SharedConstantsMixin.java index f49129c..ed841e7 100644 --- a/src/main/java/net/shadow/client/mixin/SharedConstantsMixin.java +++ b/src/main/java/net/shadow/client/mixin/SharedConstantsMixin.java @@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public class SharedConstantsMixin { @Inject(method = "isValidChar", at = @At("HEAD"), cancellable = true) - private static void atomic_replaceValidChar(char chr, CallbackInfoReturnable cir) { + private static void replaceValidChar(char chr, CallbackInfoReturnable cir) { if (ModuleRegistry.getByClass(AllowFormatCodes.class).isEnabled() && chr == 'ยง') { cir.setReturnValue(true); }