From 2c77c2ec1198c3bf16afc166f86d4c2792d81a16 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 26 Oct 2022 13:54:14 +0200 Subject: [PATCH 01/10] Change version to 7.30 --- gradle.properties | 2 +- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 878bf3fad3..c7e5afd387 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ loader_version=0.14.9 fabric_version=0.62.0+1.19.2 # Mod Properties -mod_version = v7.29-MC1.19.2 +mod_version = v7.30-MC1.19.2 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 4f8f330681..83672290cc 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static final MinecraftClient MC = MinecraftClient.getInstance(); public static final IMinecraftClient IMC = (IMinecraftClient)MC; - public static final String VERSION = "7.29"; + public static final String VERSION = "7.30"; public static final String MC_VERSION = "1.19.2"; private WurstAnalytics analytics; From da3a0547e68adc3c524a69185f559c959dc48a2a Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 26 Oct 2022 13:55:09 +0200 Subject: [PATCH 02/10] Add AntiHungerHack --- .../java/net/wurstclient/hack/HackList.java | 1 + .../net/wurstclient/hacks/AntiHungerHack.java | 72 +++++++++++++++++++ .../resources/assets/wurst/lang/de_de.json | 1 + .../resources/assets/wurst/lang/en_us.json | 1 + 4 files changed, 75 insertions(+) create mode 100644 src/main/java/net/wurstclient/hacks/AntiHungerHack.java diff --git a/src/main/java/net/wurstclient/hack/HackList.java b/src/main/java/net/wurstclient/hack/HackList.java index 5fa12d697c..4a7bf49027 100644 --- a/src/main/java/net/wurstclient/hack/HackList.java +++ b/src/main/java/net/wurstclient/hack/HackList.java @@ -32,6 +32,7 @@ public final class HackList implements UpdateListener public final AntiAfkHack antiAfkHack = new AntiAfkHack(); public final AntiBlindHack antiBlindHack = new AntiBlindHack(); public final AntiCactusHack antiCactusHack = new AntiCactusHack(); + public final AntiHungerHack antiHungerHack = new AntiHungerHack(); public final AntiKnockbackHack antiKnockbackHack = new AntiKnockbackHack(); public final AntiSpamHack antiSpamHack = new AntiSpamHack(); public final AntiWaterPushHack antiWaterPushHack = new AntiWaterPushHack(); diff --git a/src/main/java/net/wurstclient/hacks/AntiHungerHack.java b/src/main/java/net/wurstclient/hacks/AntiHungerHack.java new file mode 100644 index 0000000000..2ee4069eca --- /dev/null +++ b/src/main/java/net/wurstclient/hacks/AntiHungerHack.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2014-2022 Wurst-Imperium and contributors. + * + * This source code is subject to the terms of the GNU General Public + * License, version 3. If a copy of the GPL was not distributed with this + * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt + */ +package net.wurstclient.hacks; + +import net.minecraft.network.Packet; +import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; +import net.wurstclient.Category; +import net.wurstclient.SearchTags; +import net.wurstclient.events.PacketOutputListener; +import net.wurstclient.hack.Hack; + +@SearchTags({"anti hunger"}) +public final class AntiHungerHack extends Hack implements PacketOutputListener +{ + public AntiHungerHack() + { + super("AntiHunger"); + setCategory(Category.MOVEMENT); + } + + @Override + public void onEnable() + { + EVENTS.add(PacketOutputListener.class, this); + } + + @Override + public void onDisable() + { + EVENTS.remove(PacketOutputListener.class, this); + } + + @Override + public void onSentPacket(PacketOutputEvent event) + { + if(!(event.getPacket() instanceof PlayerMoveC2SPacket oldPacket)) + return; + + if(!MC.player.isOnGround() || MC.player.fallDistance > 0.5) + return; + + if(MC.interactionManager.isBreakingBlock()) + return; + + double x = oldPacket.getX(-1); + double y = oldPacket.getY(-1); + double z = oldPacket.getZ(-1); + float yaw = oldPacket.getYaw(-1); + float pitch = oldPacket.getPitch(-1); + + Packet newPacket; + if(oldPacket.changesPosition()) + if(oldPacket.changesLook()) + newPacket = + new PlayerMoveC2SPacket.Full(x, y, z, yaw, pitch, false); + else + newPacket = + new PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false); + else if(oldPacket.changesLook()) + newPacket = + new PlayerMoveC2SPacket.LookAndOnGround(yaw, pitch, false); + else + newPacket = new PlayerMoveC2SPacket.OnGroundOnly(false); + + event.setPacket(newPacket); + } +} diff --git a/src/main/resources/assets/wurst/lang/de_de.json b/src/main/resources/assets/wurst/lang/de_de.json index 6ec27c9d14..c3d4a65576 100644 --- a/src/main/resources/assets/wurst/lang/de_de.json +++ b/src/main/resources/assets/wurst/lang/de_de.json @@ -3,6 +3,7 @@ "description.wurst.hack.antiafk": "Läuft zufällig durch die Gegend, um dich vor Anti-AFK Plugins zu verstecken.\nBenötigt mindestens 3x3 Blöcke freien Platz.", "description.wurst.hack.antiblind": "Verhindert Blindheits- und Dunkelheitseffekte.\nNicht kompatibel mit OptiFine.", "description.wurst.hack.anticactus": "Schützt dich vor Kakteen.", + "description.wurst.hack.antihunger": "Verlangsamt deinen Hunger während du läufst.", "description.wurst.hack.antiknockback": "Verhindert dass du von Mobs und Spielern weggeschubst wirst.", "description.wurst.hack.antispam": "Blockiert Chat-Spam, indem es wiederholte Nachrichten durch einen Zähler ersetzt.", "description.wurst.hack.antiwaterpush": "Verhindert dass du von fließendem Wasser weggeschubst wirst.", diff --git a/src/main/resources/assets/wurst/lang/en_us.json b/src/main/resources/assets/wurst/lang/en_us.json index 9bf1f8e941..bad7f1b4fe 100644 --- a/src/main/resources/assets/wurst/lang/en_us.json +++ b/src/main/resources/assets/wurst/lang/en_us.json @@ -3,6 +3,7 @@ "description.wurst.hack.antiafk": "Walks around randomly to hide you from AFK detectors.\nNeeds at least 3x3 blocks of free space.", "description.wurst.hack.antiblind": "Prevents blindness and darkness effects.\nIncompatible with OptiFine.", "description.wurst.hack.anticactus": "Protects you from cactus damage.", + "description.wurst.hack.antihunger": "Slows down your hunger when you are walking.", "description.wurst.hack.antiknockback": "Prevents you from getting pushed by players and mobs.", "description.wurst.hack.antispam": "Blocks chat spam by adding a counter to repeated messages.", "description.wurst.hack.antiwaterpush": "Prevents you from getting pushed by water.", From 45d3dd571c328453876e0ef1f12bbc9db19548b8 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 1 Nov 2022 16:35:47 +0100 Subject: [PATCH 03/10] Add AirPlaceHack --- .../java/net/wurstclient/hack/HackList.java | 1 + .../net/wurstclient/hacks/AirPlaceHack.java | 55 +++++++++++++++++++ .../resources/assets/wurst/lang/de_de.json | 1 + .../resources/assets/wurst/lang/en_us.json | 1 + 4 files changed, 58 insertions(+) create mode 100644 src/main/java/net/wurstclient/hacks/AirPlaceHack.java diff --git a/src/main/java/net/wurstclient/hack/HackList.java b/src/main/java/net/wurstclient/hack/HackList.java index 4a7bf49027..cd658e1c5a 100644 --- a/src/main/java/net/wurstclient/hack/HackList.java +++ b/src/main/java/net/wurstclient/hack/HackList.java @@ -28,6 +28,7 @@ public final class HackList implements UpdateListener { + public final AirPlaceHack airPlaceHack = new AirPlaceHack(); public final AnchorAuraHack anchorAuraHack = new AnchorAuraHack(); public final AntiAfkHack antiAfkHack = new AntiAfkHack(); public final AntiBlindHack antiBlindHack = new AntiBlindHack(); diff --git a/src/main/java/net/wurstclient/hacks/AirPlaceHack.java b/src/main/java/net/wurstclient/hacks/AirPlaceHack.java new file mode 100644 index 0000000000..f6b9748f38 --- /dev/null +++ b/src/main/java/net/wurstclient/hacks/AirPlaceHack.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2014-2022 Wurst-Imperium and contributors. + * + * This source code is subject to the terms of the GNU General Public + * License, version 3. If a copy of the GPL was not distributed with this + * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt + */ +package net.wurstclient.hacks; + +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.wurstclient.Category; +import net.wurstclient.SearchTags; +import net.wurstclient.events.RightClickListener; +import net.wurstclient.hack.Hack; +import net.wurstclient.settings.SliderSetting; +import net.wurstclient.settings.SliderSetting.ValueDisplay; + +@SearchTags({"air place"}) +public final class AirPlaceHack extends Hack implements RightClickListener +{ + private final SliderSetting range = + new SliderSetting("Range", 5, 1, 6, 0.05, ValueDisplay.DECIMAL); + + public AirPlaceHack() + { + super("AirPlace"); + setCategory(Category.BLOCKS); + addSetting(range); + } + + @Override + public void onEnable() + { + EVENTS.add(RightClickListener.class, this); + } + + @Override + public void onDisable() + { + EVENTS.remove(RightClickListener.class, this); + } + + @Override + public void onRightClick(RightClickEvent event) + { + HitResult hitResult = MC.player.raycast(range.getValue(), 0, false); + if(!(hitResult instanceof BlockHitResult blockHitResult)) + return; + + IMC.getInteractionManager().rightClickBlock( + blockHitResult.getBlockPos(), blockHitResult.getSide(), + blockHitResult.getPos()); + } +} diff --git a/src/main/resources/assets/wurst/lang/de_de.json b/src/main/resources/assets/wurst/lang/de_de.json index c3d4a65576..5f7eb56aea 100644 --- a/src/main/resources/assets/wurst/lang/de_de.json +++ b/src/main/resources/assets/wurst/lang/de_de.json @@ -1,4 +1,5 @@ { + "description.wurst.hack.airplace": "Ermöglicht dir, Blöcke in der Luft zu platzieren.", "description.wurst.hack.anchoraura": "Platziert automatisch Seelenanker um dich herum, lädt diese mit Glowstone auf, und sprengt sie dann, um damit Mobs und Spieler um dich herum zu killen.", "description.wurst.hack.antiafk": "Läuft zufällig durch die Gegend, um dich vor Anti-AFK Plugins zu verstecken.\nBenötigt mindestens 3x3 Blöcke freien Platz.", "description.wurst.hack.antiblind": "Verhindert Blindheits- und Dunkelheitseffekte.\nNicht kompatibel mit OptiFine.", diff --git a/src/main/resources/assets/wurst/lang/en_us.json b/src/main/resources/assets/wurst/lang/en_us.json index bad7f1b4fe..64d1970655 100644 --- a/src/main/resources/assets/wurst/lang/en_us.json +++ b/src/main/resources/assets/wurst/lang/en_us.json @@ -1,4 +1,5 @@ { + "description.wurst.hack.airplace": "Allows you to place blocks in mid-air.", "description.wurst.hack.anchoraura": "Automatically places (optional), charges, and detonates respawn anchors to kill entities around you.", "description.wurst.hack.antiafk": "Walks around randomly to hide you from AFK detectors.\nNeeds at least 3x3 blocks of free space.", "description.wurst.hack.antiblind": "Prevents blindness and darkness effects.\nIncompatible with OptiFine.", From 959c319a5328961fd9829acb97418d2927c21a59 Mon Sep 17 00:00:00 2001 From: pcm1k Date: Wed, 2 Nov 2022 00:26:11 -0400 Subject: [PATCH 04/10] add CameraDistanceHack --- .../java/net/wurstclient/hack/HackList.java | 2 ++ .../wurstclient/hacks/CameraDistanceHack.java | 36 +++++++++++++++++++ .../net/wurstclient/mixin/CameraMixin.java | 12 +++++++ 3 files changed, 50 insertions(+) create mode 100644 src/main/java/net/wurstclient/hacks/CameraDistanceHack.java diff --git a/src/main/java/net/wurstclient/hack/HackList.java b/src/main/java/net/wurstclient/hack/HackList.java index 5fa12d697c..5383a93925 100644 --- a/src/main/java/net/wurstclient/hack/HackList.java +++ b/src/main/java/net/wurstclient/hack/HackList.java @@ -65,6 +65,8 @@ public final class HackList implements UpdateListener public final BowAimbotHack bowAimbotHack = new BowAimbotHack(); public final BuildRandomHack buildRandomHack = new BuildRandomHack(); public final BunnyHopHack bunnyHopHack = new BunnyHopHack(); + public final CameraDistanceHack cameraDistanceHack = + new CameraDistanceHack(); public final CameraNoClipHack cameraNoClipHack = new CameraNoClipHack(); public final CaveFinderHack caveFinderHack = new CaveFinderHack(); public final ChatTranslatorHack chatTranslatorHack = diff --git a/src/main/java/net/wurstclient/hacks/CameraDistanceHack.java b/src/main/java/net/wurstclient/hacks/CameraDistanceHack.java new file mode 100644 index 0000000000..e84884e8af --- /dev/null +++ b/src/main/java/net/wurstclient/hacks/CameraDistanceHack.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2014-2022 Wurst-Imperium and contributors. + * + * This source code is subject to the terms of the GNU General Public + * License, version 3. If a copy of the GPL was not distributed with this + * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt + */ +package net.wurstclient.hacks; + +import net.wurstclient.Category; +import net.wurstclient.SearchTags; +import net.wurstclient.hack.Hack; +import net.wurstclient.settings.SliderSetting; +import net.wurstclient.settings.SliderSetting.ValueDisplay; + +@SearchTags({"camera distance"}) +public final class CameraDistanceHack extends Hack +{ + private final SliderSetting distance = new SliderSetting("Distance", 4, -10, + 150, 0.5, ValueDisplay.DECIMAL); + + public CameraDistanceHack() + { + super("CameraDistance"); + + setCategory(Category.RENDER); + addSetting(distance); + } + + public double getDistance() + { + return isEnabled() ? distance.getValueF() : 4; + } + + // See CameraMixin.onClipToSpaceDistance() +} diff --git a/src/main/java/net/wurstclient/mixin/CameraMixin.java b/src/main/java/net/wurstclient/mixin/CameraMixin.java index 11d53dc338..4a23f99c00 100644 --- a/src/main/java/net/wurstclient/mixin/CameraMixin.java +++ b/src/main/java/net/wurstclient/mixin/CameraMixin.java @@ -10,6 +10,7 @@ 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.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.client.render.Camera; @@ -29,6 +30,17 @@ private void onClipToSpace(double desiredCameraDistance, cir.setReturnValue(desiredCameraDistance); } + @ModifyVariable(at = @At("HEAD"), + method = "clipToSpace(D)D", + argsOnly = true) + private double onClipToSpaceDistance(double desiredCameraDistance) + { + if(WurstClient.INSTANCE.getHax().cameraDistanceHack.isEnabled()) + return WurstClient.INSTANCE.getHax().cameraDistanceHack.getDistance(); + + return desiredCameraDistance; + } + @Inject(at = {@At("HEAD")}, method = { "getSubmersionType()Lnet/minecraft/client/render/CameraSubmersionType;"}, From 49e5b06bb0db77bc97349c2e234570431496afa8 Mon Sep 17 00:00:00 2001 From: pcm1k Date: Wed, 2 Nov 2022 00:32:00 -0400 Subject: [PATCH 05/10] add description for CameraDistanceHack --- src/main/resources/assets/wurst/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/assets/wurst/lang/en_us.json b/src/main/resources/assets/wurst/lang/en_us.json index 9bf1f8e941..f3618e6697 100644 --- a/src/main/resources/assets/wurst/lang/en_us.json +++ b/src/main/resources/assets/wurst/lang/en_us.json @@ -47,6 +47,7 @@ "description.wurst.hack.bowaimbot": "Automatically aims your bow or crossbow.", "description.wurst.hack.buildrandom": "Randomly places blocks around you.", "description.wurst.hack.bunnyhop": "Makes you jump automatically.", + "description.wurst.hack.cameradistance": "Allows changing the camera distance in 3rd person.", "description.wurst.hack.cameranoclip": "Allows the camera in 3rd person to go through walls.", "description.wurst.hack.cavefinder": "Helps you to find caves by highlighting them in the selected color.", "description.wurst.hack.chattranslator": "Translates incoming chat messages using Google Translate.", From 533c741321bc60d766a07fba635a52aadffc511e Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 4 Nov 2022 17:21:21 +0100 Subject: [PATCH 06/10] Fix incompatibility with CameraNoClip --- .../net/wurstclient/mixin/CameraMixin.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/CameraMixin.java b/src/main/java/net/wurstclient/mixin/CameraMixin.java index 4a23f99c00..b1bc507afc 100644 --- a/src/main/java/net/wurstclient/mixin/CameraMixin.java +++ b/src/main/java/net/wurstclient/mixin/CameraMixin.java @@ -20,30 +20,28 @@ @Mixin(Camera.class) public abstract class CameraMixin { - @Inject(at = {@At("HEAD")}, - method = {"clipToSpace(D)D"}, - cancellable = true) - private void onClipToSpace(double desiredCameraDistance, - CallbackInfoReturnable cir) - { - if(WurstClient.INSTANCE.getHax().cameraNoClipHack.isEnabled()) - cir.setReturnValue(desiredCameraDistance); - } - @ModifyVariable(at = @At("HEAD"), method = "clipToSpace(D)D", argsOnly = true) private double onClipToSpaceDistance(double desiredCameraDistance) { if(WurstClient.INSTANCE.getHax().cameraDistanceHack.isEnabled()) - return WurstClient.INSTANCE.getHax().cameraDistanceHack.getDistance(); + return WurstClient.INSTANCE.getHax().cameraDistanceHack + .getDistance(); return desiredCameraDistance; } - @Inject(at = {@At("HEAD")}, - method = { - "getSubmersionType()Lnet/minecraft/client/render/CameraSubmersionType;"}, + @Inject(at = @At("HEAD"), method = "clipToSpace(D)D", cancellable = true) + private void onClipToSpace(double desiredCameraDistance, + CallbackInfoReturnable cir) + { + if(WurstClient.INSTANCE.getHax().cameraNoClipHack.isEnabled()) + cir.setReturnValue(desiredCameraDistance); + } + + @Inject(at = @At("HEAD"), + method = "getSubmersionType()Lnet/minecraft/client/render/CameraSubmersionType;", cancellable = true) private void onGetSubmersionType( CallbackInfoReturnable cir) From 6ad0a3548b3eb7f1daecc25ddbe0efae072ef7ac Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 4 Nov 2022 17:45:18 +0100 Subject: [PATCH 07/10] Clean up --- .../net/wurstclient/hacks/CameraDistanceHack.java | 11 +++++------ src/main/java/net/wurstclient/mixin/CameraMixin.java | 10 ++++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/CameraDistanceHack.java b/src/main/java/net/wurstclient/hacks/CameraDistanceHack.java index e84884e8af..9e21442f90 100644 --- a/src/main/java/net/wurstclient/hacks/CameraDistanceHack.java +++ b/src/main/java/net/wurstclient/hacks/CameraDistanceHack.java @@ -13,24 +13,23 @@ import net.wurstclient.settings.SliderSetting; import net.wurstclient.settings.SliderSetting.ValueDisplay; -@SearchTags({"camera distance"}) +@SearchTags({"camera distance", "CamDistance", "cam distance"}) public final class CameraDistanceHack extends Hack { - private final SliderSetting distance = new SliderSetting("Distance", 4, -10, - 150, 0.5, ValueDisplay.DECIMAL); + private final SliderSetting distance = + new SliderSetting("Distance", 12, -0.5, 150, 0.5, ValueDisplay.DECIMAL); public CameraDistanceHack() { super("CameraDistance"); - setCategory(Category.RENDER); addSetting(distance); } public double getDistance() { - return isEnabled() ? distance.getValueF() : 4; + return distance.getValueF(); } - // See CameraMixin.onClipToSpaceDistance() + // See CameraMixin.changeClipToSpaceDistance() } diff --git a/src/main/java/net/wurstclient/mixin/CameraMixin.java b/src/main/java/net/wurstclient/mixin/CameraMixin.java index b1bc507afc..43098e51fc 100644 --- a/src/main/java/net/wurstclient/mixin/CameraMixin.java +++ b/src/main/java/net/wurstclient/mixin/CameraMixin.java @@ -16,6 +16,7 @@ import net.minecraft.client.render.Camera; import net.minecraft.client.render.CameraSubmersionType; import net.wurstclient.WurstClient; +import net.wurstclient.hacks.CameraDistanceHack; @Mixin(Camera.class) public abstract class CameraMixin @@ -23,11 +24,12 @@ public abstract class CameraMixin @ModifyVariable(at = @At("HEAD"), method = "clipToSpace(D)D", argsOnly = true) - private double onClipToSpaceDistance(double desiredCameraDistance) + private double changeClipToSpaceDistance(double desiredCameraDistance) { - if(WurstClient.INSTANCE.getHax().cameraDistanceHack.isEnabled()) - return WurstClient.INSTANCE.getHax().cameraDistanceHack - .getDistance(); + CameraDistanceHack cameraDistanceHack = + WurstClient.INSTANCE.getHax().cameraDistanceHack; + if(cameraDistanceHack.isEnabled()) + return cameraDistanceHack.getDistance(); return desiredCameraDistance; } From 24111a872f09718ea2df150345e03dff09e1b20b Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 4 Nov 2022 17:49:38 +0100 Subject: [PATCH 08/10] Improve CameraDistance description --- src/main/resources/assets/wurst/lang/de_de.json | 1 + src/main/resources/assets/wurst/lang/en_us.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/wurst/lang/de_de.json b/src/main/resources/assets/wurst/lang/de_de.json index 5f7eb56aea..4ea3868265 100644 --- a/src/main/resources/assets/wurst/lang/de_de.json +++ b/src/main/resources/assets/wurst/lang/de_de.json @@ -49,6 +49,7 @@ "description.wurst.hack.bowaimbot": "Zielt automatisch mit deinem Bogen oder deiner Armbrust.", "description.wurst.hack.buildrandom": "Platziert zufällig Blöcke um dich herum.", "description.wurst.hack.bunnyhop": "Lässt dich automatisch hüpfen.", + "description.wurst.hack.cameradistance": "Ermöglicht dir, den Kamera-Abstand in der 3rd-Person-Ansicht zu ändern.", "description.wurst.hack.cameranoclip": "Ermöglicht der Kamera in der 3rd-Person-Ansicht, durch Wände zu gehen.", "description.wurst.hack.cavefinder": "Markiert Höhlen in der ausgewählten Farbe, sodass du sie leichter finden kannst.", "description.wurst.hack.chattranslator": "Übersetzt eingehende Chat-Nachrichten mit dem Google-Übersetzer.", diff --git a/src/main/resources/assets/wurst/lang/en_us.json b/src/main/resources/assets/wurst/lang/en_us.json index 436981e9d6..0371e5381b 100644 --- a/src/main/resources/assets/wurst/lang/en_us.json +++ b/src/main/resources/assets/wurst/lang/en_us.json @@ -49,7 +49,7 @@ "description.wurst.hack.bowaimbot": "Automatically aims your bow or crossbow.", "description.wurst.hack.buildrandom": "Randomly places blocks around you.", "description.wurst.hack.bunnyhop": "Makes you jump automatically.", - "description.wurst.hack.cameradistance": "Allows changing the camera distance in 3rd person.", + "description.wurst.hack.cameradistance": "Allows you to change the camera distance in 3rd person.", "description.wurst.hack.cameranoclip": "Allows the camera in 3rd person to go through walls.", "description.wurst.hack.cavefinder": "Helps you to find caves by highlighting them in the selected color.", "description.wurst.hack.chattranslator": "Translates incoming chat messages using Google Translate.", From bb7cd73c1b86f47f82407561d5d6c37fbef576f6 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 4 Nov 2022 18:25:19 +0100 Subject: [PATCH 09/10] Add "Check line of sight" setting to KillauraHack --- .../net/wurstclient/hacks/KillauraHack.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/KillauraHack.java b/src/main/java/net/wurstclient/hacks/KillauraHack.java index 57519ce0ba..da8862dd77 100644 --- a/src/main/java/net/wurstclient/hacks/KillauraHack.java +++ b/src/main/java/net/wurstclient/hacks/KillauraHack.java @@ -23,8 +23,11 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.decoration.EndCrystalEntity; import net.minecraft.util.Hand; +import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.RaycastContext; import net.wurstclient.Category; import net.wurstclient.SearchTags; import net.wurstclient.events.PostMotionListener; @@ -73,6 +76,12 @@ public final class KillauraHack extends Hack private final PauseAttackOnContainersSetting pauseOnContainers = new PauseAttackOnContainersSetting(true); + private final CheckboxSetting checkLOS = + new CheckboxSetting("Check line of sight", + "Ensures that you don't reach through blocks when attacking.\n\n" + + "Slower but can help with anti-cheat plugins.", + false); + private final EntityFilterList entityFilters = EntityFilterList.genericCombat(); @@ -90,6 +99,7 @@ public KillauraHack() addSetting(fov); addSetting(damageIndicator); addSetting(pauseOnContainers); + addSetting(checkLOS); entityFilters.forEach(this::addSetting); } @@ -161,8 +171,19 @@ public void onUpdate() WURST.getHax().autoSwordHack.setSlot(); - WURST.getRotationFaker() - .faceVectorPacket(target.getBoundingBox().getCenter()); + Vec3d eyesPos = RotationUtils.getEyesPos(); + Vec3d hitVec = target.getBoundingBox().getCenter(); + if(checkLOS.isChecked() && MC.world + .raycast(new RaycastContext(eyesPos, hitVec, + RaycastContext.ShapeType.COLLIDER, + RaycastContext.FluidHandling.NONE, MC.player)) + .getType() != HitResult.Type.MISS) + { + target = null; + return; + } + + WURST.getRotationFaker().faceVectorPacket(hitVec); } @Override From 0a19ea955af816f9f75b06bb742b88a9395831a3 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Fri, 4 Nov 2022 18:53:50 +0100 Subject: [PATCH 10/10] Update Fabric stuff --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index c7e5afd387..448d1e7845 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.jvmargs=-Xmx1G # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.18 -loader_version=0.14.9 +yarn_mappings=1.19.2+build.28 +loader_version=0.14.10 #Fabric api -fabric_version=0.62.0+1.19.2 +fabric_version=0.64.0+1.19.2 # Mod Properties mod_version = v7.30-MC1.19.2