morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

small tweaks & cleanup

Browse Source
This commit is contained in:
C10udburst
2022-02-19 15:37:14 +01:00
parent 370310b0a6
commit fce7e3a595
9 changed files with 27 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/anticope/rejects/modules/AntiVanish.java
View File

@@ -2,21 +2,17 @@ package anticope.rejects.modules;
import anticope.rejects.MeteorRejectsAddon; import anticope.rejects.MeteorRejectsAddon;
import com.google.gson.JsonArray; 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.orbit.EventHandler;
import meteordevelopment.meteorclient.events.game.GameLeftEvent; import meteordevelopment.meteorclient.events.game.GameLeftEvent;
import meteordevelopment.meteorclient.events.packets.PacketEvent; import meteordevelopment.meteorclient.events.packets.PacketEvent;
import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.events.world.TickEvent;
import meteordevelopment.meteorclient.systems.modules.Module; import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.network.Http;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket; 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.Queue;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
@@ -103,7 +99,7 @@ public class AntiVanish extends Module {
@Override @Override
public void run() { public void run() {
this.name = this.lookUpName(); name = this.lookUpName();
} }
public String lookUpName() { public String lookUpName() {
@@ -112,17 +108,12 @@ public class AntiVanish extends Module {
player = mc.world.getPlayerByUuid(uuid); player = mc.world.getPlayerByUuid(uuid);
} }
if (player == null) { 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 { try {
final JsonParser parser = new JsonParser(); JsonArray res = Http.get(url).sendJson(JsonArray.class);
final String nameJson = IOUtils.toString(new URL(url), StandardCharsets.UTF_8); return res.get(0).getAsJsonObject().get("name").getAsString();
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();
} catch (Exception e) { } catch (Exception e) {
return null; return uuidstr;
} }
} }
return player.getName().asString(); return player.getName().asString();

5
src/main/java/anticope/rejects/modules/Auto32K.java
View File

@@ -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; package anticope.rejects.modules;
//Created by squidoodly 13/07/2020 //Created by squidoodly 13/07/2020

32
src/main/java/anticope/rejects/modules/AutoPot.java
View File

@@ -2,6 +2,7 @@ package anticope.rejects.modules;
//import baritone.api.BaritoneAPI; //import baritone.api.BaritoneAPI;
import anticope.rejects.MeteorRejectsAddon; import anticope.rejects.MeteorRejectsAddon;
import baritone.api.BaritoneAPI;
import meteordevelopment.orbit.EventHandler; import meteordevelopment.orbit.EventHandler;
import meteordevelopment.meteorclient.events.entity.player.ItemUseCrosshairTargetEvent; import meteordevelopment.meteorclient.events.entity.player.ItemUseCrosshairTargetEvent;
import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.events.world.TickEvent;
@@ -81,6 +82,7 @@ public class AutoPot extends Module {
private boolean drinking, splashing; private boolean drinking, splashing;
private final List<Class<? extends Module>> wasAura = new ArrayList<>(); private final List<Class<? extends Module>> wasAura = new ArrayList<>();
private boolean wasBaritone; private boolean wasBaritone;
public AutoPot() { public AutoPot() {
super(MeteorRejectsAddon.CATEGORY, "auto-pot", "Automatically Drinks Potions"); super(MeteorRejectsAddon.CATEGORY, "auto-pot", "Automatically Drinks Potions");
} }
@@ -216,10 +218,10 @@ public class AutoPot extends Module {
} }
// Pause baritone // Pause baritone
wasBaritone = false; wasBaritone = false;
//if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) { if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) {
// wasBaritone = true; wasBaritone = true;
// BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause"); BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause");
//} }
} }
private void startSplashing() { private void startSplashing() {
prevSlot = mc.player.getInventory().selectedSlot; prevSlot = mc.player.getInventory().selectedSlot;
@@ -240,11 +242,11 @@ public class AutoPot extends Module {
} }
} }
// Pause baritone // Pause baritone
//wasBaritone = false; wasBaritone = false;
//if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) { if (pauseBaritone.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) {
// wasBaritone = true; wasBaritone = true;
// BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause"); BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("pause");
//} }
} }
private void drink() { private void drink() {
changeSlot(slot); changeSlot(slot);
@@ -274,9 +276,9 @@ public class AutoPot extends Module {
} }
} }
// Resume baritone // Resume baritone
//if (pauseBaritone.get() && wasBaritone) { if (pauseBaritone.get() && wasBaritone) {
// BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume"); BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume");
//} }
} }
private void stopSplashing() { private void stopSplashing() {
changeSlot(prevSlot); changeSlot(prevSlot);
@@ -295,9 +297,9 @@ public class AutoPot extends Module {
} }
} }
// Resume baritone // Resume baritone
//if (pauseBaritone.get() && wasBaritone) { if (pauseBaritone.get() && wasBaritone) {
// BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume"); BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute("resume");
//} }
} }
private double truehealth() { private double truehealth() {
assert mc.player != null; assert mc.player != null;

1
src/main/java/anticope/rejects/modules/ChatBot.java
View File

@@ -32,7 +32,6 @@ public class ChatBot extends Module {
put("ping", "Pong!"); put("ping", "Pong!");
put("tps", "Current TPS: {server.tps}"); put("tps", "Current TPS: {server.tps}");
put("time", "It's currently {server.time}"); put("time", "It's currently {server.time}");
put("time", "It's currently {server.time}");
put("pos", "I am @ {player.pos}"); put("pos", "I am @ {player.pos}");
}}; }};

4
src/main/java/anticope/rejects/modules/CustomPackets.java
View File

@@ -80,10 +80,6 @@ public class CustomPackets extends Module {
return text; return text;
} }
private BaseText format(String type, String message) {
return format(type, new LiteralText(message));
}
private String readString(PacketByteBuf data) { private String readString(PacketByteBuf data) {
return data.readCharSequence( return data.readCharSequence(
data.readableBytes(), data.readableBytes(),

1
src/main/java/anticope/rejects/modules/GhostMode.java
View File

@@ -46,6 +46,7 @@ public class GhostMode extends Module {
@EventHandler @EventHandler
private void onTick(TickEvent.Pre event) { private void onTick(TickEvent.Pre event) {
if (!active) return;
if (mc.player.getHealth() < 1f) mc.player.setHealth(20f); if (mc.player.getHealth() < 1f) mc.player.setHealth(20f);
if (fullFood.get() && mc.player.getHungerManager().getFoodLevel() < 20) { if (fullFood.get() && mc.player.getHungerManager().getFoodLevel() < 20) {
mc.player.getHungerManager().setFoodLevel(20); mc.player.getHungerManager().setFoodLevel(20);

2
src/main/java/anticope/rejects/modules/OreSim.java
View File

@@ -172,7 +172,7 @@ public class OreSim extends Module {
} }
private ArrayList<BlockPos> addToBaritone(int chunkX, int chunkZ) { private ArrayList<BlockPos> addToBaritone(int chunkX, int chunkZ) {
ArrayList<BlockPos> baritoneGoals = new ArrayList(); ArrayList<BlockPos> baritoneGoals = new ArrayList<>();
long chunkKey = (long)chunkX + ((long)chunkZ << 32); long chunkKey = (long)chunkX + ((long)chunkZ << 32);
if (!this.chunkRenderers.containsKey(chunkKey)) { if (!this.chunkRenderers.containsKey(chunkKey)) {
return baritoneGoals; return baritoneGoals;

2
src/main/java/anticope/rejects/modules/PacketFly.java
View File

@@ -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.PlayerMoveC2SPacket;
import net.minecraft.network.packet.c2s.play.TeleportConfirmC2SPacket; import net.minecraft.network.packet.c2s.play.TeleportConfirmC2SPacket;
import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import java.util.HashSet; import java.util.HashSet;
@@ -154,7 +153,6 @@ public class PacketFly extends Module {
@EventHandler @EventHandler
public void onPacketReceive(PacketEvent.Receive event) { public void onPacketReceive(PacketEvent.Receive event) {
if (event.packet instanceof PlayerPositionLookS2CPacket && !(mc.player == null || mc.world == null)) { 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; PlayerPositionLookS2CPacket packet = (PlayerPositionLookS2CPacket) event.packet;
if (setYaw.get()) { if (setYaw.get()) {
((PlayerPositionLookS2CPacketAccessor) event.packet).setPitch(mc.player.getPitch()); ((PlayerPositionLookS2CPacketAccessor) event.packet).setPitch(mc.player.getPitch());

1
src/main/java/anticope/rejects/utils/RejectsConfig.java
View File

@@ -51,6 +51,7 @@ public class RejectsConfig extends System<RejectsConfig> {
} }
hiddenModules.clear(); hiddenModules.clear();
for (Module module : newList) { for (Module module : newList) {
if (module == null) continue;
if (module.isActive()) module.toggle(); if (module.isActive()) module.toggle();
hiddenModules.add(module.name); hiddenModules.add(module.name);
} }