diff --git a/src/main/java/anticope/rejects/modules/AntiVanish.java b/src/main/java/anticope/rejects/modules/AntiVanish.java index 0591c18..ad555c4 100644 --- a/src/main/java/anticope/rejects/modules/AntiVanish.java +++ b/src/main/java/anticope/rejects/modules/AntiVanish.java @@ -2,21 +2,17 @@ package anticope.rejects.modules; import anticope.rejects.MeteorRejectsAddon; import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import meteordevelopment.orbit.EventHandler; import meteordevelopment.meteorclient.events.game.GameLeftEvent; import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.systems.modules.Module; +import meteordevelopment.meteorclient.utils.network.Http; + import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket; -import org.apache.commons.io.IOUtils; -import java.net.URL; -import java.nio.charset.StandardCharsets; import java.util.Queue; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; @@ -103,7 +99,7 @@ public class AntiVanish extends Module { @Override public void run() { - this.name = this.lookUpName(); + name = this.lookUpName(); } public String lookUpName() { @@ -112,17 +108,12 @@ public class AntiVanish extends Module { player = mc.world.getPlayerByUuid(uuid); } if (player == null) { - final String url = "https://api.mojang.com/user/profiles/" + this.uuidstr.replace("-", "") + "/names"; + final String url = "https://api.mojang.com/user/profiles/" + uuidstr.replace("-", "") + "/names"; try { - final JsonParser parser = new JsonParser(); - final String nameJson = IOUtils.toString(new URL(url), StandardCharsets.UTF_8); - final JsonElement nameElement = parser.parse(nameJson); - final JsonArray nameArray = nameElement.getAsJsonArray(); - final String playerSlot = nameArray.get(nameArray.size() - 1).toString(); - final JsonObject nameObject = parser.parse(playerSlot).getAsJsonObject(); - return nameObject.get("name").toString(); + JsonArray res = Http.get(url).sendJson(JsonArray.class); + return res.get(0).getAsJsonObject().get("name").getAsString(); } catch (Exception e) { - return null; + return uuidstr; } } return player.getName().asString(); diff --git a/src/main/java/anticope/rejects/modules/Auto32K.java b/src/main/java/anticope/rejects/modules/Auto32K.java index cc741d6..83f2f73 100644 --- a/src/main/java/anticope/rejects/modules/Auto32K.java +++ b/src/main/java/anticope/rejects/modules/Auto32K.java @@ -1,8 +1,3 @@ -/* - * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client/). - * Copyright (c) 2021 Meteor Development. - */ - package anticope.rejects.modules; //Created by squidoodly 13/07/2020 diff --git a/src/main/java/anticope/rejects/modules/AutoPot.java b/src/main/java/anticope/rejects/modules/AutoPot.java index f07fd45..e692f22 100644 --- a/src/main/java/anticope/rejects/modules/AutoPot.java +++ b/src/main/java/anticope/rejects/modules/AutoPot.java @@ -2,6 +2,7 @@ package anticope.rejects.modules; //import baritone.api.BaritoneAPI; import anticope.rejects.MeteorRejectsAddon; +import baritone.api.BaritoneAPI; import meteordevelopment.orbit.EventHandler; import meteordevelopment.meteorclient.events.entity.player.ItemUseCrosshairTargetEvent; import meteordevelopment.meteorclient.events.world.TickEvent; @@ -81,6 +82,7 @@ public class AutoPot extends Module { private boolean drinking, splashing; private final List> wasAura = new ArrayList<>(); private boolean wasBaritone; + public AutoPot() { super(MeteorRejectsAddon.CATEGORY, "auto-pot", "Automatically Drinks Potions"); } @@ -216,10 +218,10 @@ public class AutoPot extends Module { } // Pause baritone wasBaritone = false; - //if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) { - // wasBaritone = true; - // BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause"); - //} + if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) { + wasBaritone = true; + BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause"); + } } private void startSplashing() { prevSlot = mc.player.getInventory().selectedSlot; @@ -240,11 +242,11 @@ public class AutoPot extends Module { } } // Pause baritone - //wasBaritone = false; - //if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) { - // wasBaritone = true; - // BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause"); - //} + wasBaritone = false; + if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) { + wasBaritone = true; + BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause"); + } } private void drink() { changeSlot(slot); @@ -274,9 +276,9 @@ public class AutoPot extends Module { } } // Resume baritone - //if (pauseBaritone.get() && wasBaritone) { - // BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume"); - //} + if (pauseBaritone.get() && wasBaritone) { + BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume"); + } } private void stopSplashing() { changeSlot(prevSlot); @@ -295,9 +297,9 @@ public class AutoPot extends Module { } } // Resume baritone - //if (pauseBaritone.get() && wasBaritone) { - // BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume"); - //} + if (pauseBaritone.get() && wasBaritone) { + BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume"); + } } private double truehealth() { assert mc.player != null; diff --git a/src/main/java/anticope/rejects/modules/ChatBot.java b/src/main/java/anticope/rejects/modules/ChatBot.java index cc05c18..361c80f 100644 --- a/src/main/java/anticope/rejects/modules/ChatBot.java +++ b/src/main/java/anticope/rejects/modules/ChatBot.java @@ -32,7 +32,6 @@ public class ChatBot extends Module { put("ping", "Pong!"); put("tps", "Current TPS: {server.tps}"); put("time", "It's currently {server.time}"); - put("time", "It's currently {server.time}"); put("pos", "I am @ {player.pos}"); }}; diff --git a/src/main/java/anticope/rejects/modules/CustomPackets.java b/src/main/java/anticope/rejects/modules/CustomPackets.java index 060f44d..fb94267 100644 --- a/src/main/java/anticope/rejects/modules/CustomPackets.java +++ b/src/main/java/anticope/rejects/modules/CustomPackets.java @@ -80,10 +80,6 @@ public class CustomPackets extends Module { return text; } - private BaseText format(String type, String message) { - return format(type, new LiteralText(message)); - } - private String readString(PacketByteBuf data) { return data.readCharSequence( data.readableBytes(), diff --git a/src/main/java/anticope/rejects/modules/GhostMode.java b/src/main/java/anticope/rejects/modules/GhostMode.java index b16638a..4d28636 100644 --- a/src/main/java/anticope/rejects/modules/GhostMode.java +++ b/src/main/java/anticope/rejects/modules/GhostMode.java @@ -46,6 +46,7 @@ public class GhostMode extends Module { @EventHandler private void onTick(TickEvent.Pre event) { + if (!active) return; if (mc.player.getHealth() < 1f) mc.player.setHealth(20f); if (fullFood.get() && mc.player.getHungerManager().getFoodLevel() < 20) { mc.player.getHungerManager().setFoodLevel(20); diff --git a/src/main/java/anticope/rejects/modules/OreSim.java b/src/main/java/anticope/rejects/modules/OreSim.java index f8e64b3..f96a010 100755 --- a/src/main/java/anticope/rejects/modules/OreSim.java +++ b/src/main/java/anticope/rejects/modules/OreSim.java @@ -172,7 +172,7 @@ public class OreSim extends Module { } private ArrayList addToBaritone(int chunkX, int chunkZ) { - ArrayList baritoneGoals = new ArrayList(); + ArrayList baritoneGoals = new ArrayList<>(); long chunkKey = (long)chunkX + ((long)chunkZ << 32); if (!this.chunkRenderers.containsKey(chunkKey)) { return baritoneGoals; diff --git a/src/main/java/anticope/rejects/modules/PacketFly.java b/src/main/java/anticope/rejects/modules/PacketFly.java index cf3c765..bcdebcd 100644 --- a/src/main/java/anticope/rejects/modules/PacketFly.java +++ b/src/main/java/anticope/rejects/modules/PacketFly.java @@ -12,7 +12,6 @@ import meteordevelopment.meteorclient.utils.player.PlayerUtils; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.c2s.play.TeleportConfirmC2SPacket; import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import java.util.HashSet; @@ -154,7 +153,6 @@ public class PacketFly extends Module { @EventHandler public void onPacketReceive(PacketEvent.Receive event) { if (event.packet instanceof PlayerPositionLookS2CPacket && !(mc.player == null || mc.world == null)) { - BlockPos pos = new BlockPos(mc.player.getPos().x, mc.player.getPos().y, mc.player.getPos().z); PlayerPositionLookS2CPacket packet = (PlayerPositionLookS2CPacket) event.packet; if (setYaw.get()) { ((PlayerPositionLookS2CPacketAccessor) event.packet).setPitch(mc.player.getPitch()); diff --git a/src/main/java/anticope/rejects/utils/RejectsConfig.java b/src/main/java/anticope/rejects/utils/RejectsConfig.java index 4645483..9e6a6a6 100644 --- a/src/main/java/anticope/rejects/utils/RejectsConfig.java +++ b/src/main/java/anticope/rejects/utils/RejectsConfig.java @@ -51,6 +51,7 @@ public class RejectsConfig extends System { } hiddenModules.clear(); for (Module module : newList) { + if (module == null) continue; if (module.isActive()) module.toggle(); hiddenModules.add(module.name); }