From 8be3cd4dadedc1aba8ef458f172205ae1380c0c5 Mon Sep 17 00:00:00 2001 From: noil755 Date: Fri, 29 Nov 2019 20:44:31 -0500 Subject: [PATCH] Player --- .../impl/module/player/FreeCamModule.java | 25 ++++++------ .../impl/module/player/GodModeModule.java | 39 +++++++++---------- .../impl/module/player/RotationLock.java | 10 ++--- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java index ff05b72..4906b03 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/FreeCamModule.java @@ -11,8 +11,7 @@ import me.rigamortis.seppuku.api.event.world.EventLiquidCollisionBB; import me.rigamortis.seppuku.api.event.world.EventSetOpaqueCube; import me.rigamortis.seppuku.api.module.Module; import me.rigamortis.seppuku.api.util.MathUtil; -import me.rigamortis.seppuku.api.value.old.BooleanValue; -import me.rigamortis.seppuku.api.value.old.NumberValue; +import me.rigamortis.seppuku.api.value.Value; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityOtherPlayerMP; @@ -35,11 +34,11 @@ public final class FreeCamModule extends Module { private float yaw; private float pitch; - public final NumberValue speed = new NumberValue("Speed", new String[]{"Spd"}, 0.1f, Float.class, 0.0f, 10.0f, 0.1f); + public final Value speed = new Value("Speed", new String[]{"Spd"}, "Speed of free-cam flight, higher number equals quicker motion.", 1.0f, 0.0f, 10.0f, 0.1f); - public final BooleanValue view = new BooleanValue("3D", new String[]{"View"}, true); + public final Value view = new Value("3D", new String[]{"View"}, "The old Nodus client style free-cam, kind of like an elytra. (Hold forward key & move the mouse to turn)", false); - public final BooleanValue packet = new BooleanValue("Packet", new String[]{"Pack"}, true); + public final Value packet = new Value("Packet", new String[]{"Pack"}, "Disables any player position or rotation packets from being sent during free-cam if enabled.", true); public FreeCamModule() { super("FreeCam", new String[]{"FreeCamera"}, "Out of body experience", "NONE", -1, ModuleType.PLAYER); @@ -98,9 +97,9 @@ public final class FreeCamModule extends Module { final Minecraft mc = Minecraft.getMinecraft(); mc.player.setVelocity(0, 0, 0); mc.player.renderArmPitch = 5000; - mc.player.jumpMovementFactor = speed.getFloat(); + mc.player.jumpMovementFactor = this.speed.getValue(); - final double[] dir = MathUtil.directionSpeed(speed.getFloat()); + final double[] dir = MathUtil.directionSpeed(this.speed.getValue()); if (mc.player.movementInput.moveStrafe != 0 || mc.player.movementInput.moveForward != 0) { mc.player.motionX = dir[0]; @@ -112,18 +111,18 @@ public final class FreeCamModule extends Module { mc.player.setSprinting(false); - if (this.view.getBoolean()) { + if (this.view.getValue()) { if (!mc.gameSettings.keyBindSneak.isKeyDown() && !mc.gameSettings.keyBindJump.isKeyDown()) { - mc.player.motionY = (speed.getFloat() * (-MathUtil.degToRad(mc.player.rotationPitch))) * mc.player.movementInput.moveForward; + mc.player.motionY = (this.speed.getValue() * (-MathUtil.degToRad(mc.player.rotationPitch))) * mc.player.movementInput.moveForward; } } if (mc.gameSettings.keyBindJump.isKeyDown()) { - mc.player.motionY += speed.getFloat(); + mc.player.motionY += this.speed.getValue(); } if (mc.gameSettings.keyBindSneak.isKeyDown()) { - mc.player.motionY -= speed.getFloat(); + mc.player.motionY -= this.speed.getValue(); } } } @@ -132,7 +131,7 @@ public final class FreeCamModule extends Module { public void sendPacket(EventSendPacket event) { if (event.getStage() == EventStageable.EventStage.PRE) { if (Minecraft.getMinecraft().world != null) { - if (this.packet.getBoolean()) { + if (this.packet.getValue()) { if (event.getPacket() instanceof CPacketPlayer) { event.setCanceled(true); } @@ -158,7 +157,7 @@ public final class FreeCamModule extends Module { } if (event.getPacket() instanceof SPacketPlayerPosLook) { final SPacketPlayerPosLook packet = (SPacketPlayerPosLook) event.getPacket(); - if (this.packet.getBoolean()) { + if (this.packet.getValue()) { if (this.entity != null) { this.entity.setPositionAndRotation(packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getPitch()); } diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java index 951a05b..98614de 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/GodModeModule.java @@ -6,8 +6,7 @@ import me.rigamortis.seppuku.api.event.network.EventSendPacket; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.event.player.EventUpdateWalkingPlayer; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.old.BooleanValue; -import me.rigamortis.seppuku.api.value.old.OptionalValue; +import me.rigamortis.seppuku.api.value.Value; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGameOver; import net.minecraft.entity.Entity; @@ -21,9 +20,13 @@ import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; */ public final class GodModeModule extends Module { - public final OptionalValue mode = new OptionalValue("Mode", new String[]{"Mode", "M"}, 0, new String[]{"Portal", "Riding", "Lock", "Packet"}); + public final Value mode = new Value("Mode", new String[]{"Mode", "M"}, "The mode of the god-mode exploit."); - public final BooleanValue footsteps = new BooleanValue("FootSteps", new String[]{"Foot"}, false); + private enum Mode { + PORTAL, RIDING, LOCK, PACKET + } + + public final Value footsteps = new Value("FootSteps", new String[]{"Foot"}, "If enabled, others will be able to see your foot-steps during god-mode. (Disable if having trouble getting god-mode to work)", false); private Entity riding; @@ -35,14 +38,13 @@ public final class GodModeModule extends Module { public void onEnable() { super.onEnable(); - if (this.mode.getInt() == 1) { + if (this.mode.getValue() == Mode.RIDING) { final Minecraft mc = Minecraft.getMinecraft(); - if (mc.player.getRidingEntity() != null) { this.riding = mc.player.getRidingEntity(); mc.player.dismountRidingEntity(); mc.world.removeEntity(this.riding); - mc.player.setPosition(mc.player.getPosition().getX(), mc.player.getPosition().getY() -1, mc.player.getPosition().getZ()); + mc.player.setPosition(mc.player.getPosition().getX(), mc.player.getPosition().getY() - 1, mc.player.getPosition().getZ()); } } } @@ -51,19 +53,19 @@ public final class GodModeModule extends Module { public void onDisable() { super.onDisable(); - if (this.mode.getInt() == 1) { + if (this.mode.getValue() == Mode.RIDING) { if (this.riding != null) { Minecraft.getMinecraft().player.connection.sendPacket(new CPacketUseEntity(this.riding, EnumHand.MAIN_HAND)); } } - if (this.mode.getInt() == 2) { + if (this.mode.getValue() == Mode.LOCK) { Minecraft.getMinecraft().player.respawnPlayer(); } } @Override public String getMetaData() { - return this.mode.getSelectedOption(); + return this.mode.getValue().name(); } @Listener @@ -71,11 +73,10 @@ public final class GodModeModule extends Module { if (event.getStage() == EventStageable.EventStage.PRE) { final Minecraft mc = Minecraft.getMinecraft(); - if (this.mode.getInt() == 1) { - + if (this.mode.getValue() == Mode.RIDING) { if (this.riding != null) { this.riding.posX = mc.player.posX; - this.riding.posY = mc.player.posY + (this.footsteps.getBoolean() ? 0.3f : 0.0f); + this.riding.posY = mc.player.posY + (this.footsteps.getValue() ? 0.3f : 0.0f); this.riding.posZ = mc.player.posZ; this.riding.rotationYaw = Minecraft.getMinecraft().player.rotationYaw; mc.player.connection.sendPacket(new CPacketPlayer.Rotation(mc.player.rotationYaw, mc.player.rotationPitch, true)); @@ -91,7 +92,7 @@ public final class GodModeModule extends Module { if (event.getStage() == EventStageable.EventStage.PRE) { final Minecraft mc = Minecraft.getMinecraft(); - if (this.mode.getInt() == 2) { + if (this.mode.getValue() == Mode.LOCK) { if (mc.currentScreen instanceof GuiGameOver) { mc.displayGuiScreen(null); } @@ -105,16 +106,14 @@ public final class GodModeModule extends Module { @Listener public void sendPacket(EventSendPacket event) { if (event.getStage() == EventStageable.EventStage.PRE) { - if (this.mode.getInt() == 0) { + if (this.mode.getValue() == Mode.PORTAL) { if (event.getPacket() instanceof CPacketConfirmTeleport) { event.setCanceled(true); } } - if (this.mode.getInt() == 1) { + if (this.mode.getValue() == Mode.RIDING) { if (event.getPacket() instanceof CPacketUseEntity) { - final Minecraft mc = Minecraft.getMinecraft(); - final CPacketUseEntity packet = (CPacketUseEntity) event.getPacket(); if (this.riding != null) { final Entity entity = packet.getEntityFromWorld(mc.world); @@ -134,7 +133,7 @@ public final class GodModeModule extends Module { event.setCanceled(true); } } - if (this.mode.getInt() == 3) { + if (this.mode.getValue() == Mode.PACKET) { if (event.getPacket() instanceof CPacketPlayer) { event.setCanceled(true); } @@ -144,7 +143,7 @@ public final class GodModeModule extends Module { @Listener public void displayGui(EventDisplayGui event) { - if (event.getScreen() != null && event.getScreen() instanceof GuiGameOver && this.mode.getInt() == 2) { + if (event.getScreen() != null && event.getScreen() instanceof GuiGameOver && this.mode.getValue() == Mode.LOCK) { event.setCanceled(true); } } diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java b/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java index 4418c8a..3e2c72f 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/player/RotationLock.java @@ -3,7 +3,7 @@ package me.rigamortis.seppuku.impl.module.player; import me.rigamortis.seppuku.Seppuku; import me.rigamortis.seppuku.api.event.player.EventPlayerUpdate; import me.rigamortis.seppuku.api.module.Module; -import me.rigamortis.seppuku.api.value.old.BooleanValue; +import me.rigamortis.seppuku.api.value.Value; import net.minecraft.client.Minecraft; import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; @@ -13,8 +13,8 @@ import team.stiff.pomelo.impl.annotated.handler.annotation.Listener; */ public final class RotationLock extends Module { - public final BooleanValue yawLock = new BooleanValue("Yaw", new String[]{"Y"}, true); - public final BooleanValue pitchLock = new BooleanValue("Pitch", new String[]{"P"}, false); + public final Value yawLock = new Value("Yaw", new String[]{"Y"}, "Lock the player's rotation yaw if enabled.", true); + public final Value pitchLock = new Value("Pitch", new String[]{"P"}, "Lock the player's rotation pitch if enabled.", false); private float yaw; private float pitch; @@ -35,10 +35,10 @@ public final class RotationLock extends Module { @Listener public void onUpdate(EventPlayerUpdate event) { Seppuku.INSTANCE.getRotationManager().updateRotations(); - if(this.yawLock.getBoolean()) { + if (this.yawLock.getValue()) { Seppuku.INSTANCE.getRotationManager().setPlayerYaw(this.yaw); } - if(this.pitchLock.getBoolean()) { + if (this.pitchLock.getValue()) { Seppuku.INSTANCE.getRotationManager().setPlayerPitch(this.pitch); } }