From 33169c16819fe82a31775255b148c87b12addfb0 Mon Sep 17 00:00:00 2001 From: Cloudburst Date: Wed, 2 Jun 2021 21:47:33 +0200 Subject: [PATCH] Fix #5, disable AutoTNT for now --- .../rejects/MeteorRejectsAddon.java | 2 +- .../cloudburst/rejects/modules/AutoTNT.java | 10 +- .../rejects/modules/SkeletonESP.java | 147 +++++++++--------- 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java b/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java index 11a010b..5cad279 100644 --- a/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java +++ b/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java @@ -29,7 +29,7 @@ public class MeteorRejectsAddon extends MeteorAddon { modules.add(new AutoExtinguish()); modules.add(new AutoHighway()); modules.add(new AutoPot()); - modules.add(new AutoTNT()); + //modules.add(new AutoTNT()); modules.add(new Confuse()); modules.add(new InteractionMenu()); modules.add(new Glide()); diff --git a/src/main/java/cloudburst/rejects/modules/AutoTNT.java b/src/main/java/cloudburst/rejects/modules/AutoTNT.java index 3cb7c1d..1ae8fc3 100644 --- a/src/main/java/cloudburst/rejects/modules/AutoTNT.java +++ b/src/main/java/cloudburst/rejects/modules/AutoTNT.java @@ -83,10 +83,11 @@ public class AutoTNT extends Module { if (ticks <= 0) { // Clear and get tnt blocks blocks.clear(); - for (BlockPos blockPos : BlockUtils.getSphere(mc.player.getBlockPos(), range.get(), range.get())) { - bp.set(blockPos); - if (mc.world.getBlockState(blockPos).getBlock() instanceof TntBlock) blocks.add(bp); - } + // TODO: Fix + // for (BlockPos blockPos : BlockUtils.getSphere(mc.player.getBlockPos(), range.get(), range.get())) { + // bp.set(blockPos); + // if (mc.world.getBlockState(blockPos).getBlock() instanceof TntBlock) blocks.add(bp); + // } // Make sure there are TNTs around us if (blocks.size() <= 0) { @@ -144,4 +145,5 @@ public class AutoTNT extends Module { private void setBpToVec3d(Vec3d pos) { bp.set(pos.getX(), pos.getY(), pos.getZ()); } + } \ No newline at end of file diff --git a/src/main/java/cloudburst/rejects/modules/SkeletonESP.java b/src/main/java/cloudburst/rejects/modules/SkeletonESP.java index 869b99d..7b3e445 100644 --- a/src/main/java/cloudburst/rejects/modules/SkeletonESP.java +++ b/src/main/java/cloudburst/rejects/modules/SkeletonESP.java @@ -6,15 +6,19 @@ import meteordevelopment.orbit.EventHandler; import minegame159.meteorclient.events.render.RenderEvent; import minegame159.meteorclient.settings.*; import minegame159.meteorclient.systems.modules.Module; +import minegame159.meteorclient.utils.player.PlayerUtils; import minegame159.meteorclient.utils.render.color.Color; import minegame159.meteorclient.utils.render.color.SettingColor; + import net.minecraft.client.model.ModelPart; +import net.minecraft.client.options.Perspective; import net.minecraft.client.render.*; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.PlayerEntityRenderer; import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Vector3f; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.*; @@ -37,94 +41,95 @@ public class SkeletonESP extends Module { MatrixStack matrixStack = event.matrices; float g = event.tickDelta; Render3DUtils.INSTANCE.setup3DRender(true); - Color skeletonColor = skeletonColorSetting.get(); mc.world.getEntities().forEach(entity -> { - if (entity instanceof PlayerEntity && entity.getUuid() != mc.player.getUuid()) { - PlayerEntity playerEntity = (PlayerEntity) entity; + if (!(entity instanceof PlayerEntity)) return; + if (mc.options.getPerspective() == Perspective.FIRST_PERSON && (Entity)mc.player == entity) return; + + Color skeletonColor = PlayerUtils.getPlayerColor((PlayerEntity)entity, skeletonColorSetting.get()); + PlayerEntity playerEntity = (PlayerEntity) entity; - Vec3d footPos = Render3DUtils.INSTANCE.getEntityRenderPosition(playerEntity, g); - PlayerEntityRenderer livingEntityRenderer = (PlayerEntityRenderer)(LivingEntityRenderer) mc.getEntityRenderDispatcher().getRenderer(playerEntity); - PlayerEntityModel playerEntityModel = (PlayerEntityModel)livingEntityRenderer.getModel(); + Vec3d footPos = Render3DUtils.INSTANCE.getEntityRenderPosition(playerEntity, g); + PlayerEntityRenderer livingEntityRenderer = (PlayerEntityRenderer)(LivingEntityRenderer) mc.getEntityRenderDispatcher().getRenderer(playerEntity); + PlayerEntityModel playerEntityModel = (PlayerEntityModel)livingEntityRenderer.getModel(); - float h = MathHelper.lerpAngleDegrees(g, playerEntity.prevBodyYaw, playerEntity.bodyYaw); - float j = MathHelper.lerpAngleDegrees(g, playerEntity.prevHeadYaw, playerEntity.headYaw); + float h = MathHelper.lerpAngleDegrees(g, playerEntity.prevBodyYaw, playerEntity.bodyYaw); + float j = MathHelper.lerpAngleDegrees(g, playerEntity.prevHeadYaw, playerEntity.headYaw); - float q = playerEntity.limbAngle - playerEntity.limbDistance * (1.0F - g); - float p = MathHelper.lerp(g, playerEntity.lastLimbDistance, playerEntity.limbDistance); - float o = (float)playerEntity.age + g; - float k = j - h; - float m = MathHelper.lerp(g, playerEntity.prevPitch, playerEntity.pitch); + float q = playerEntity.limbAngle - playerEntity.limbDistance * (1.0F - g); + float p = MathHelper.lerp(g, playerEntity.lastLimbDistance, playerEntity.limbDistance); + float o = (float)playerEntity.age + g; + float k = j - h; + float m = MathHelper.lerp(g, playerEntity.prevPitch, playerEntity.pitch); - playerEntityModel.setAngles(playerEntity, q, p, o, k, m); - boolean sneaking = playerEntity.isSneaking(); + playerEntityModel.setAngles(playerEntity, q, p, o, k, m); + boolean sneaking = playerEntity.isSneaking(); - ModelPart head = playerEntityModel.head; - ModelPart leftArm = playerEntityModel.leftArm; - ModelPart rightArm = playerEntityModel.rightArm; - ModelPart leftLeg = playerEntityModel.leftLeg; - ModelPart rightLeg = playerEntityModel.rightLeg; + ModelPart head = playerEntityModel.head; + ModelPart leftArm = playerEntityModel.leftArm; + ModelPart rightArm = playerEntityModel.rightArm; + ModelPart leftLeg = playerEntityModel.leftLeg; + ModelPart rightLeg = playerEntityModel.rightLeg; - matrixStack.translate(footPos.x, footPos.y, footPos.z); - matrixStack.multiply(new Quaternion(new Vector3f(0, -1, 0), playerEntity.bodyYaw + 180, true)); - BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); - bufferBuilder.begin(1, VertexFormats.POSITION_COLOR); + matrixStack.translate(footPos.x, footPos.y, footPos.z); + matrixStack.multiply(new Quaternion(new Vector3f(0, -1, 0), playerEntity.bodyYaw + 180, true)); + BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); + bufferBuilder.begin(1, VertexFormats.POSITION_COLOR); - Matrix4f matrix4f = matrixStack.peek().getModel(); - bufferBuilder.vertex(matrix4f, 0, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - bufferBuilder.vertex(matrix4f, 0, sneaking ? 1.05f : 1.4f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();//spine + Matrix4f matrix4f = matrixStack.peek().getModel(); + bufferBuilder.vertex(matrix4f, 0, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, 0, sneaking ? 1.05f : 1.4f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();//spine - bufferBuilder.vertex(matrix4f, -0.37f, sneaking ? 1.05f : 1.35f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();//shoulders - bufferBuilder.vertex(matrix4f, 0.37f, sneaking ? 1.05f : 1.35f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, -0.37f, sneaking ? 1.05f : 1.35f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();//shoulders + bufferBuilder.vertex(matrix4f, 0.37f, sneaking ? 1.05f : 1.35f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - bufferBuilder.vertex(matrix4f, -0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();//pelvis - bufferBuilder.vertex(matrix4f, 0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, -0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next();//pelvis + bufferBuilder.vertex(matrix4f, 0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - matrixStack.push();//head - matrixStack.translate(0, sneaking ? 1.05f : 1.4f, 0); - rotate(matrixStack, head); - matrix4f = matrixStack.peek().getModel(); - bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - bufferBuilder.vertex(matrix4f, 0, 0.15f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - matrixStack.pop(); + matrixStack.push();//head + matrixStack.translate(0, sneaking ? 1.05f : 1.4f, 0); + rotate(matrixStack, head); + matrix4f = matrixStack.peek().getModel(); + bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, 0, 0.15f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + matrixStack.pop(); - matrixStack.push();//right leg - matrixStack.translate(0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0); - rotate(matrixStack, rightLeg); - matrix4f = matrixStack.peek().getModel(); - bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - bufferBuilder.vertex(matrix4f, 0, -0.6f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - matrixStack.pop(); + matrixStack.push();//right leg + matrixStack.translate(0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0); + rotate(matrixStack, rightLeg); + matrix4f = matrixStack.peek().getModel(); + bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, 0, -0.6f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + matrixStack.pop(); - matrixStack.push();//left leg - matrixStack.translate(-0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0); - rotate(matrixStack, leftLeg); - matrix4f = matrixStack.peek().getModel(); - bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - bufferBuilder.vertex(matrix4f, 0, -0.6f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - matrixStack.pop(); + matrixStack.push();//left leg + matrixStack.translate(-0.15f, sneaking ? 0.6f : 0.7f, sneaking ? 0.23f : 0); + rotate(matrixStack, leftLeg); + matrix4f = matrixStack.peek().getModel(); + bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, 0, -0.6f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + matrixStack.pop(); - matrixStack.push();//right arm - matrixStack.translate(0.37f, sneaking ? 1.05f : 1.35f, 0); - rotate(matrixStack, rightArm); - matrix4f = matrixStack.peek().getModel(); - bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - bufferBuilder.vertex(matrix4f, 0, -0.55f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - matrixStack.pop(); + matrixStack.push();//right arm + matrixStack.translate(0.37f, sneaking ? 1.05f : 1.35f, 0); + rotate(matrixStack, rightArm); + matrix4f = matrixStack.peek().getModel(); + bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, 0, -0.55f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + matrixStack.pop(); - matrixStack.push();//left arm - matrixStack.translate(-0.37f, sneaking ? 1.05f : 1.35f, 0); - rotate(matrixStack, leftArm); - matrix4f = matrixStack.peek().getModel(); - bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - bufferBuilder.vertex(matrix4f, 0, -0.55f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); - matrixStack.pop(); + matrixStack.push();//left arm + matrixStack.translate(-0.37f, sneaking ? 1.05f : 1.35f, 0); + rotate(matrixStack, leftArm); + matrix4f = matrixStack.peek().getModel(); + bufferBuilder.vertex(matrix4f, 0, 0, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + bufferBuilder.vertex(matrix4f, 0, -0.55f, 0).color(skeletonColor.r, skeletonColor.g, skeletonColor.b, skeletonColor.a).next(); + matrixStack.pop(); - bufferBuilder.end(); - BufferRenderer.draw(bufferBuilder); + bufferBuilder.end(); + BufferRenderer.draw(bufferBuilder); - matrixStack.multiply(new Quaternion(new Vector3f(0, 1, 0), playerEntity.bodyYaw + 180, true)); - matrixStack.translate(-footPos.x, -footPos.y, -footPos.z); - } + matrixStack.multiply(new Quaternion(new Vector3f(0, 1, 0), playerEntity.bodyYaw + 180, true)); + matrixStack.translate(-footPos.x, -footPos.y, -footPos.z); }); Render3DUtils.INSTANCE.end3DRender(); }