Skip to content

Commit

Permalink
Improve Auto City (MeteorDevelopment#3050)
Browse files Browse the repository at this point in the history
  • Loading branch information
@machiecodes
machiecodes authored Dec 16, 2022
1 parent d8f48db commit 238401c
Show file tree
Hide file tree
Showing 5 changed files with 332 additions and 202 deletions.
386 changes: 240 additions & 146 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoCity.java
View file
Original file line number Diff line number Diff line change
@@ -1,146 +1,240 @@
/*
* This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
* Copyright (c) Meteor Development.
*/

package meteordevelopment.meteorclient.systems.modules.combat;

import meteordevelopment.meteorclient.events.world.TickEvent;
import meteordevelopment.meteorclient.settings.BoolSetting;
import meteordevelopment.meteorclient.settings.DoubleSetting;
import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.settings.SettingGroup;
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.entity.EntityUtils;
import meteordevelopment.meteorclient.utils.entity.SortPriority;
import meteordevelopment.meteorclient.utils.entity.TargetUtils;
import meteordevelopment.meteorclient.utils.player.FindItemResult;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.meteorclient.utils.player.PlayerUtils;
import meteordevelopment.meteorclient.utils.player.Rotations;
import meteordevelopment.meteorclient.utils.world.BlockUtils;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Items;
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;

public class AutoCity extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();

private final Setting<Double> targetRange = sgGeneral.add(new DoubleSetting.Builder()
.name("target-range")
.description("The radius in which players get targeted.")
.defaultValue(4)
.min(0)
.sliderMax(5)
.build()
);

private final Setting<Boolean> autoSwitch = sgGeneral.add(new BoolSetting.Builder()
.name("auto-switch")
.description("Auto switches to a pickaxe when AutoCity is enabled.")
.defaultValue(true)
.build()
);

private final Setting<Boolean> support = sgGeneral.add(new BoolSetting.Builder()
.name("support")
.description("If there is no block below a city block it will place one before mining.")
.defaultValue(true)
.build()
);

private final Setting<Boolean> rotate = sgGeneral.add(new BoolSetting.Builder()
.name("rotate")
.description("Automatically rotates you towards the city block.")
.defaultValue(true)
.build()
);

private final Setting<Boolean> selfToggle = sgGeneral.add(new BoolSetting.Builder()
.name("self-toggle")
.description("Automatically toggles off after activation.")
.defaultValue(true)
.build()
);

private PlayerEntity target;
private BlockPos blockPosTarget;
private boolean sentMessage;

public AutoCity() {
super(Categories.Combat, "auto-city", "Automatically cities a target by mining the nearest obsidian next to them.");
}

@EventHandler
private void onTick(TickEvent.Pre event) {
if (TargetUtils.isBadTarget(target, targetRange.get())) {
PlayerEntity search = TargetUtils.getPlayerTarget(targetRange.get(), SortPriority.LowestDistance);
if (search != target) sentMessage = false;
target = search;

if (TargetUtils.isBadTarget(target, targetRange.get())) {
target = null;
blockPosTarget = null;
if (selfToggle.get()) toggle();
return;
}
}

blockPosTarget = EntityUtils.getCityBlock(target);

if (blockPosTarget == null) {
if (selfToggle.get()) {
error("No target block found... disabling.");
toggle();
}
target = null;
return;
}

if (!PlayerUtils.isWithinReach(blockPosTarget) && selfToggle.get()) {
error("Target block out of reach... disabling.");
toggle();
return;
}

if (!sentMessage) {
info("Attempting to city %s.", target.getEntityName());
sentMessage = true;
}

FindItemResult pickaxe = InvUtils.find(itemStack -> itemStack.getItem() == Items.DIAMOND_PICKAXE || itemStack.getItem() == Items.NETHERITE_PICKAXE);

if (!pickaxe.isHotbar()) {
if (selfToggle.get()) {
error("No pickaxe found... disabling.");
toggle();
}
return;
}

if (support.get()) BlockUtils.place(blockPosTarget.down(1), InvUtils.findInHotbar(Items.OBSIDIAN), rotate.get(), 0, true);

if (autoSwitch.get()) InvUtils.swap(pickaxe.slot(), false);

if (rotate.get()) Rotations.rotate(Rotations.getYaw(blockPosTarget), Rotations.getPitch(blockPosTarget), () -> mine(blockPosTarget));
else mine(blockPosTarget);

if (selfToggle.get()) toggle();
}

private void mine(BlockPos blockPos) {
mc.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, blockPos, Direction.UP));
mc.player.swingHand(Hand.MAIN_HAND);
mc.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, blockPos, Direction.UP));
}

@Override
public String getInfoString() {
return EntityUtils.getName(target);
}
}
/*
* This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
* Copyright (c) Meteor Development.
*/

package meteordevelopment.meteorclient.systems.modules.combat;

import meteordevelopment.meteorclient.events.render.Render3DEvent;
import meteordevelopment.meteorclient.events.world.TickEvent;
import meteordevelopment.meteorclient.renderer.ShapeMode;
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.systems.modules.world.PacketMine;
import meteordevelopment.meteorclient.utils.entity.EntityUtils;
import meteordevelopment.meteorclient.utils.entity.SortPriority;
import meteordevelopment.meteorclient.utils.entity.TargetUtils;
import meteordevelopment.meteorclient.utils.player.FindItemResult;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.meteorclient.utils.player.PlayerUtils;
import meteordevelopment.meteorclient.utils.player.Rotations;
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
import meteordevelopment.meteorclient.utils.world.BlockUtils;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Items;
import net.minecraft.network.packet.c2s.play.HandSwingC2SPacket;
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;

public class AutoCity extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();
private final SettingGroup sgRender = settings.createGroup("Render");


private final Setting<Double> targetRange = sgGeneral.add(new DoubleSetting.Builder()
.name("target-range")
.description("The radius in which players get targeted.")
.defaultValue(5.5)
.min(0)
.sliderMax(7)
.build()
);

private final Setting<Double> breakRange = sgGeneral.add(new DoubleSetting.Builder()
.name("break-range")
.description("How close a block must be to you to be considered.")
.defaultValue(4.5)
.min(0)
.sliderMax(6)
.build()
);

private final Setting<SwitchMode> switchMode = sgGeneral.add(new EnumSetting.Builder<SwitchMode>()
.name("switch-mode")
.description("How to switch to a pickaxe.")
.defaultValue(SwitchMode.Normal)
.build()
);

private final Setting<Boolean> support = sgGeneral.add(new BoolSetting.Builder()
.name("support")
.description("If there is no block below a city block it will place one before mining.")
.defaultValue(true)
.build()
);

private final Setting<Double> placeRange = sgGeneral.add(new DoubleSetting.Builder()
.name("place-range")
.description("How far away to try and place a block.")
.defaultValue(4.5)
.min(0)
.sliderMax(6)
.visible(support::get)
.build()
);

private final Setting<Boolean> rotate = sgGeneral.add(new BoolSetting.Builder()
.name("rotate")
.description("Automatically rotates you towards the city block.")
.defaultValue(true)
.build()
);

private final Setting<Boolean> chatInfo = sgGeneral.add(new BoolSetting.Builder()
.name("chat-info")
.description("Whether the module should send messages in chat.")
.defaultValue(true)
.build()
);

// Render

private final Setting<Boolean> swingHand = sgRender.add(new BoolSetting.Builder()
.name("swing-hand")
.description("Whether to render your hand swinging.")
.defaultValue(false)
.build()
);

private final Setting<Boolean> renderBlock = sgRender.add(new BoolSetting.Builder()
.name("render-block")
.description("Whether to render the block being broken.")
.defaultValue(true)
.build()
);

private final Setting<ShapeMode> shapeMode = sgRender.add(new EnumSetting.Builder<ShapeMode>()
.name("shape-mode")
.description("How the shapes are rendered.")
.defaultValue(ShapeMode.Both)
.visible(renderBlock::get)
.build()
);

private final Setting<SettingColor> sideColor = sgRender.add(new ColorSetting.Builder()
.name("side-color")
.description("The side color of the rendering.")
.defaultValue(new SettingColor(225, 0, 0, 75))
.visible(() -> renderBlock.get() && shapeMode.get().sides())
.build()
);

private final Setting<SettingColor> lineColor = sgRender.add(new ColorSetting.Builder()
.name("line-color")
.description("The line color of the rendering.")
.defaultValue(new SettingColor(225, 0, 0, 255))
.visible(() -> renderBlock.get() && shapeMode.get().lines())
.build()
);

private PlayerEntity target;
private BlockPos targetPos;
private FindItemResult pick;
private float progress;

public AutoCity() {
super(Categories.Combat, "auto-city", "Automatically mine blocks next to someone's feet.");
}

@Override
public void onActivate() {
target = TargetUtils.getPlayerTarget(targetRange.get(), SortPriority.ClosestAngle);
if (TargetUtils.isBadTarget(target, targetRange.get())) {
if (chatInfo.get()) error("Couldn't find a target, disabling.");
toggle();
return;
}

targetPos = EntityUtils.getCityBlock(target);
if (targetPos == null || PlayerUtils.distanceTo(targetPos) > breakRange.get()) {
if (chatInfo.get()) error("Couldn't find a target, disabling.");
toggle();
return;
}

if (support.get()) {
BlockPos supportPos = targetPos.down();
if (!(PlayerUtils.distanceTo(supportPos) > placeRange.get())) {
BlockUtils.place(supportPos, InvUtils.findInHotbar(Items.OBSIDIAN), rotate.get(), 0, true);
}
}

pick = InvUtils.find(itemStack -> itemStack.getItem() == Items.DIAMOND_PICKAXE || itemStack.getItem() == Items.NETHERITE_PICKAXE);
if (!pick.isHotbar()) {
error("No pickaxe found... disabling.");
toggle();
return;
}

progress = 0.0f;
mine(false);
}

@Override
public void onDeactivate() {
target = null;
targetPos = null;
}

@EventHandler
private void onTick(TickEvent.Pre event) {
if (TargetUtils.isBadTarget(target, targetRange.get())) {
toggle();
return;
}

if (PlayerUtils.distanceTo(targetPos) > breakRange.get()) {
if (chatInfo.get()) error("Couldn't find a target, disabling.");
toggle();
return;
}

if (progress < 1.0f) {
pick = InvUtils.find(itemStack -> itemStack.getItem() == Items.DIAMOND_PICKAXE || itemStack.getItem() == Items.NETHERITE_PICKAXE);
if (!pick.isHotbar()) {
error("No pickaxe found... disabling.");
toggle();
return;
}
progress += BlockUtils.getBreakDelta(pick.slot(), mc.world.getBlockState(targetPos));
if (progress < 1.0f) return;
}

mine(true);
toggle();
}

public void mine(boolean done) {
InvUtils.swap(pick.slot(), switchMode.get() == SwitchMode.Silent);
if (rotate.get()) Rotations.rotate(Rotations.getYaw(targetPos), Rotations.getPitch(targetPos));

Direction direction = (mc.player.getY() > targetPos.getY()) ? Direction.UP : Direction.DOWN;
if (!done) mc.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, targetPos, direction));
mc.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, targetPos, direction));

if (swingHand.get()) mc.player.swingHand(Hand.MAIN_HAND);
else mc.getNetworkHandler().sendPacket(new HandSwingC2SPacket(Hand.MAIN_HAND));

if (switchMode.get() == SwitchMode.Silent) InvUtils.swapBack();
}

@EventHandler
private void onRender3D(Render3DEvent event) {
if (targetPos == null || !renderBlock.get()) return;
event.renderer.box(targetPos, sideColor.get(), lineColor.get(), shapeMode.get(), 0);
}

@Override
public String getInfoString() {
return EntityUtils.getName(target);
}

public enum SwitchMode {
Normal,
Silent
}
}
Loading

0 comments on commit 238401c

Please sign in to comment.