0
0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-20 01:12:13 +02:00

Update to 21w18a

This commit is contained in:
Alexander01998 2021-05-05 21:16:10 +02:00
parent 2a5cc67da2
commit 7c7e5586ec
14 changed files with 47 additions and 51 deletions

View File

@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://modmuss50.me/fabric.html and
# https://www.curseforge.com/minecraft/mc-mods/fabric-api
minecraft_version=21w17a
yarn_mappings=21w17a+build.2
minecraft_version=21w18a
yarn_mappings=21w18a+build.3
loader_version=0.11.3
#Fabric api
fabric_version=0.33.4+1.17
fabric_version=0.34.2+1.17
# Mod Properties
mod_version = v7.15-MC21w17a
mod_version = v7.15-MC21w18a
maven_group = net.wurstclient
archives_base_name = Wurst-Client

View File

@ -29,10 +29,10 @@ public final class RotationFaker
return;
ClientPlayerEntity player = WurstClient.MC.player;
realYaw = player.method_36454();
realPitch = player.method_36455();
player.method_36456(serverYaw);
player.method_36457(serverPitch);
realYaw = player.getYaw();
realPitch = player.getPitch();
player.setYaw(serverYaw);
player.setPitch(serverPitch);
}
@Override
@ -42,8 +42,8 @@ public final class RotationFaker
return;
ClientPlayerEntity player = WurstClient.MC.player;
player.method_36456(realYaw);
player.method_36457(realPitch);
player.setYaw(realYaw);
player.setPitch(realPitch);
fakeRotation = false;
}
@ -62,8 +62,8 @@ public final class RotationFaker
RotationUtils.Rotation rotations =
RotationUtils.getNeededRotations(vec);
WurstClient.MC.player.method_36456(rotations.getYaw());
WurstClient.MC.player.method_36457(rotations.getPitch());
WurstClient.MC.player.setYaw(rotations.getYaw());
WurstClient.MC.player.setPitch(rotations.getPitch());
}
public void faceVectorClientIgnorePitch(Vec3d vec)
@ -71,18 +71,17 @@ public final class RotationFaker
RotationUtils.Rotation rotations =
RotationUtils.getNeededRotations(vec);
WurstClient.MC.player.method_36456(rotations.getYaw());
WurstClient.MC.player.method_36457(0);
WurstClient.MC.player.setYaw(rotations.getYaw());
WurstClient.MC.player.setPitch(0);
}
public float getServerYaw()
{
return fakeRotation ? serverYaw : WurstClient.MC.player.method_36454();
return fakeRotation ? serverYaw : WurstClient.MC.player.getYaw();
}
public float getServerPitch()
{
return fakeRotation ? serverPitch
: WurstClient.MC.player.method_36455();
return fakeRotation ? serverPitch : WurstClient.MC.player.getPitch();
}
}

View File

@ -57,7 +57,7 @@ public enum WurstClient
public static final IMinecraftClient IMC = (IMinecraftClient)MC;
public static final String VERSION = "7.15";
public static final String MC_VERSION = "21w17a";
public static final String MC_VERSION = "21w18a";
private WurstAnalytics analytics;
private EventManager eventManager;

View File

@ -91,7 +91,7 @@ public final class RadarComponent extends Component
ClientPlayerEntity player = WurstClient.MC.player;
if(!hack.isRotateEnabled())
GL11.glRotated(180 + player.method_36454(), 0, 0, 1);
GL11.glRotated(180 + player.getYaw(), 0, 0, 1);
float xa1 = 0;
float xa2 = 2;
@ -147,8 +147,7 @@ public final class RadarComponent extends Component
double neededRotation = Math.toDegrees(Math.atan2(diffZ, diffX));
double angle;
if(hack.isRotateEnabled())
angle =
Math.toRadians(player.method_36454() - neededRotation - 90);
angle = Math.toRadians(player.getYaw() - neededRotation - 90);
else
angle = Math.toRadians(180 - neededRotation - 90);
double renderX = Math.sin(angle) * distance;

View File

@ -80,17 +80,16 @@ public final class AutoPotionHack extends Hack implements UpdateListener
// throw potion in hotbar
MC.player.getInventory().selectedSlot = potionInHotbar;
MC.player.networkHandler
.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(
MC.player.method_36454(), 90, MC.player.isOnGround()));
MC.player.networkHandler.sendPacket(
new PlayerMoveC2SPacket.LookAndOnGround(MC.player.getYaw(), 90,
MC.player.isOnGround()));
IMC.getInteractionManager().rightClickItem();
// reset slot and rotation
MC.player.getInventory().selectedSlot = oldSlot;
MC.player.networkHandler
.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(
MC.player.method_36454(), MC.player.method_36455(),
MC.player.isOnGround()));
MC.player.networkHandler.sendPacket(
new PlayerMoveC2SPacket.LookAndOnGround(MC.player.getYaw(),
MC.player.getPitch(), MC.player.isOnGround()));
// reset timer
timer = 10;

View File

@ -226,8 +226,7 @@ public final class BowAimbotHack extends Hack
- player.getZ();
// set yaw
MC.player
.method_36456((float)Math.toDegrees(Math.atan2(posZ, posX)) - 90);
MC.player.setYaw((float)Math.toDegrees(Math.atan2(posZ, posX)) - 90);
// calculate needed pitch
double hDistance = Math.sqrt(posX * posX + posZ * posZ);
@ -244,7 +243,7 @@ public final class BowAimbotHack extends Hack
WURST.getRotationFaker()
.faceVectorClient(target.getBoundingBox().getCenter());
else
MC.player.method_36457(neededPitch);
MC.player.setPitch(neededPitch);
}
private Entity filterEntities(Stream<Entity> s)

View File

@ -46,7 +46,7 @@ public final class DerpHack extends Hack implements UpdateListener
@Override
public void onUpdate()
{
float yaw = MC.player.method_36454() + random.nextFloat() * 360F - 180F;
float yaw = MC.player.getYaw() + random.nextFloat() * 360F - 180F;
float pitch = random.nextFloat() * 180F - 90F;
MC.player.networkHandler

View File

@ -117,7 +117,7 @@ public final class ExtraElytraHack extends Hack implements UpdateListener
if(!speedCtrl.isChecked())
return;
float yaw = (float)Math.toRadians(MC.player.method_36454());
float yaw = (float)Math.toRadians(MC.player.getYaw());
Vec3d forward = new Vec3d(-MathHelper.sin(yaw) * 0.05, 0,
MathHelper.cos(yaw) * 0.05);

View File

@ -47,7 +47,7 @@ public final class HeadRollHack extends Hack implements UpdateListener
float pitch = MathHelper.sin(timer * (float)Math.PI) * 90F;
MC.player.networkHandler.sendPacket(
new PlayerMoveC2SPacket.LookAndOnGround(MC.player.method_36454(),
pitch, MC.player.isOnGround()));
new PlayerMoveC2SPacket.LookAndOnGround(MC.player.getYaw(), pitch,
MC.player.isOnGround()));
}
}

View File

@ -285,8 +285,8 @@ public final class KillauraLegitHack extends Hack
float oldYaw = MC.player.prevYaw;
float oldPitch = MC.player.prevPitch;
MC.player.method_36456(limitAngleChange(oldYaw, rotation.getYaw(), 30));
MC.player.method_36457(rotation.getPitch());
MC.player.setYaw(limitAngleChange(oldYaw, rotation.getYaw(), 30));
MC.player.setPitch(rotation.getPitch());
return Math.abs(oldYaw - rotation.getYaw())
+ Math.abs(oldPitch - rotation.getPitch()) < 1F;

View File

@ -41,7 +41,7 @@ public final class TiredHack extends Hack implements UpdateListener
public void onUpdate()
{
MC.player.networkHandler.sendPacket(
new PlayerMoveC2SPacket.LookAndOnGround(MC.player.method_36454(),
new PlayerMoveC2SPacket.LookAndOnGround(MC.player.getYaw(),
MC.player.age % 100, MC.player.isOnGround()));
}
}

View File

@ -145,7 +145,7 @@ public final class TrajectoriesHack extends Hack implements RenderListener
// calculate starting position
double arrowPosX = player.lastRenderX
+ (player.getX() - player.lastRenderX) * partialTicks
- Math.cos(Math.toRadians(player.method_36454())) * 0.16;
- Math.cos(Math.toRadians(player.getYaw())) * 0.16;
double arrowPosY = player.lastRenderY
+ (player.getY() - player.lastRenderY) * partialTicks
@ -153,13 +153,13 @@ public final class TrajectoriesHack extends Hack implements RenderListener
double arrowPosZ = player.lastRenderZ
+ (player.getZ() - player.lastRenderZ) * partialTicks
- Math.sin(Math.toRadians(player.method_36454())) * 0.16;
- Math.sin(Math.toRadians(player.getYaw())) * 0.16;
// Motion factor. Arrows go faster than snowballs and all that...
double arrowMotionFactor = item instanceof RangedWeaponItem ? 1.0 : 0.4;
double yaw = Math.toRadians(player.method_36454());
double pitch = Math.toRadians(player.method_36455());
double yaw = Math.toRadians(player.getYaw());
double pitch = Math.toRadians(player.getPitch());
// calculate starting motion
double arrowMotionX =

View File

@ -71,7 +71,7 @@ public class FakePlayerEntity extends OtherClientPlayerEntity
public void resetPlayerPosition()
{
player.refreshPositionAndAngles(getX(), getY(), getZ(), method_36454(),
method_36455());
player.refreshPositionAndAngles(getX(), getY(), getZ(), getYaw(),
getPitch());
}
}

View File

@ -33,10 +33,10 @@ public enum RotationUtils
float f = 0.017453292F;
float pi = (float)Math.PI;
float f1 = MathHelper.cos(-player.method_36454() * f - pi);
float f2 = MathHelper.sin(-player.method_36454() * f - pi);
float f3 = -MathHelper.cos(-player.method_36455() * f);
float f4 = MathHelper.sin(-player.method_36455() * f);
float f1 = MathHelper.cos(-player.getYaw() * f - pi);
float f2 = MathHelper.sin(-player.getYaw() * f - pi);
float f3 = -MathHelper.cos(-player.getPitch() * f);
float f4 = MathHelper.sin(-player.getPitch() * f);
return new Vec3d(f2 * f3, f4, f1 * f3);
}
@ -75,8 +75,8 @@ public enum RotationUtils
Rotation needed = getNeededRotations(vec);
ClientPlayerEntity player = WurstClient.MC.player;
float currentYaw = MathHelper.wrapDegrees(player.method_36454());
float currentPitch = MathHelper.wrapDegrees(player.method_36455());
float currentYaw = MathHelper.wrapDegrees(player.getYaw());
float currentPitch = MathHelper.wrapDegrees(player.getPitch());
float diffYaw = currentYaw - needed.yaw;
float diffPitch = currentPitch - needed.pitch;
@ -101,7 +101,7 @@ public enum RotationUtils
public static float getHorizontalAngleToLookVec(Vec3d vec)
{
Rotation needed = getNeededRotations(vec);
return MathHelper.wrapDegrees(WurstClient.MC.player.method_36454())
return MathHelper.wrapDegrees(WurstClient.MC.player.getYaw())
- needed.yaw;
}