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

1.17 pog (#12)

Browse Source 
* 1.17?

* event bus monke

* coding on da github

* fixes fixes bruh

* fixes again

* lazy fix to worklow actions

* fix gradle.yml
This commit is contained in:
Cloudburst
2021-06-12 09:10:19 +02:00
committed by GitHub
parent 12c2049b8b
commit e81df336f6
38 changed files with 210 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cloudburst/rejects/modules/AntiBot.java
View File

@@ -69,7 +69,7 @@ public class AntiBot extends Module {
{
if (removeInvisible.get() && !entity.isInvisible()) continue;
if (isBot(entity)) entity.remove();
if (isBot(entity)) entity.remove(Entity.RemovalReason.DISCARDED);
}
}

18
src/main/java/cloudburst/rejects/modules/Auto32K.java
View File

@@ -145,15 +145,15 @@ public class Auto32K extends Module {
}
phase += 1;
} else if (phase == 1) {
mc.player.inventory.selectedSlot = dispenserSlot.getSlot();
mc.player.getInventory().selectedSlot = dispenserSlot.getSlot();
if (x == -1) {
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(-90f, mc.player.pitch, mc.player.isOnGround()));
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(-90f, mc.player.getPitch(), mc.player.isOnGround()));
} else if (x == 1) {
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(90f, mc.player.pitch, mc.player.isOnGround()));
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(90f, mc.player.getPitch(), mc.player.isOnGround()));
} else if (z == -1) {
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(1f, mc.player.pitch, mc.player.isOnGround()));
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(1f, mc.player.getPitch(), mc.player.isOnGround()));
} else if (z == 1) {
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(179f, mc.player.pitch, mc.player.isOnGround()));
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(179f, mc.player.getPitch(), mc.player.isOnGround()));
}
phase += 1;
} else if (phase == 2) {
@@ -170,7 +170,7 @@ public class Auto32K extends Module {
mc.player.closeHandledScreen();
phase += 1;
}else if (phase == 6) {
mc.player.inventory.selectedSlot = redstoneSlot.getSlot();
mc.player.getInventory().selectedSlot = redstoneSlot.getSlot();
mc.player.setSneaking(true);
mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.up(2), false));
mc.player.setSneaking(false);
@@ -188,7 +188,7 @@ public class Auto32K extends Module {
Iterator<Block> blocks = throwawayItems.get().iterator();
for (Item item = blocks.next().asItem(); blocks.hasNext(); item = blocks.next().asItem()) {
for (int i = 5; i <= 40; i++) {
ItemStack stack = mc.player.inventory.getStack(i);
ItemStack stack = mc.player.getInventory().getStack(i);
if (stack.getItem() == item && stack.getCount() >= 4) {
slot = i;
count = stack.getCount();
@@ -218,7 +218,7 @@ public class Auto32K extends Module {
}
if (dropSlot != -1) InvUtils.drop().slot(dropSlot);
if(autoMove.get() && manage){
int slot2 = mc.player.inventory.getEmptySlot();
int slot2 = mc.player.getInventory().getEmptySlot();
if (slot2 < 9 && slot2 != -1 && EnchantmentHelper.getLevel(Enchantments.SHARPNESS, mc.player.currentScreenHandler.getSlot(0).getStack()) > 5) {
InvUtils.move().fromId(0).to(slot2 - 4);
} else if (EnchantmentHelper.getLevel(Enchantments.SHARPNESS, mc.player.currentScreenHandler.getSlot(0).getStack()) <= 5 && mc.player.currentScreenHandler.getSlot(0).getStack().getItem() != Items.AIR) {
@@ -226,7 +226,7 @@ public class Auto32K extends Module {
}
}
if(slot != -1) {
mc.player.inventory.selectedSlot = slot - 32;
mc.player.getInventory().selectedSlot = slot - 32;
}
}else this.toggle();
}

8
src/main/java/cloudburst/rejects/modules/AutoExtinguish.java
View File

@@ -150,17 +150,17 @@ public class AutoExtinguish extends Module {
private void place(int slot) {
if (slot != -1) {
final int preSlot = mc.player.inventory.selectedSlot;
final int preSlot = mc.player.getInventory().selectedSlot;
if (center.get()) {
PlayerUtils.centerPlayer();
}
mc.player.inventory.selectedSlot = slot;
mc.player.getInventory().selectedSlot = slot;
float yaw = mc.gameRenderer.getCamera().getYaw() % 360;
float pitch = mc.gameRenderer.getCamera().getPitch() % 360;
Rotations.rotate(yaw, 90);
mc.interactionManager.interactItem(mc.player, mc.player.world, Hand.MAIN_HAND);
mc.player.inventory.selectedSlot = preSlot;
mc.player.getInventory().selectedSlot = preSlot;
Rotations.rotate(yaw, pitch);
}
@@ -175,7 +175,7 @@ public class AutoExtinguish extends Module {
private int findSlot(Item item) {
int slot = -1;
for (int i = 0; i < 9; i++) {
ItemStack block = mc.player.inventory.getStack(i);
ItemStack block = mc.player.getInventory().getStack(i);
if (block.getItem() == item) {
slot = i;
break;

2
src/main/java/cloudburst/rejects/modules/AutoHighway.java
View File

@@ -604,7 +604,7 @@ public class AutoHighway extends Module {
}
private Direction getDirection(PlayerEntity player){
double yaw = player.yaw;
double yaw = player.getYaw();
if(yaw==0) return Direction.SOUTH;
if(yaw<0){
yaw = yaw - MathHelper.ceil(yaw / 360) * 360;

64
src/main/java/cloudburst/rejects/modules/AutoPot.java
View File

@@ -1,6 +1,6 @@
package cloudburst.rejects.modules;
import baritone.api.BaritoneAPI;
//import baritone.api.BaritoneAPI;
import cloudburst.rejects.MeteorRejectsAddon;
import meteordevelopment.orbit.EventHandler;
import minegame159.meteorclient.events.entity.player.ItemUseCrosshairTargetEvent;
@@ -110,7 +110,7 @@ public class AutoPot extends Module {
}
if (drinking) {
if (ShouldDrinkHealth()) {
if (isNotPotion(mc.player.inventory.getStack(slot))) {
if (isNotPotion(mc.player.getInventory().getStack(slot))) {
slot = HealingpotionSlot();
if (slot == -1) {
info("Ran out of Pots while drinking");
@@ -128,7 +128,7 @@ public class AutoPot extends Module {
}
if (splashing) {
if (ShouldDrinkHealth()) {
if (isNotSplashPotion(mc.player.inventory.getStack(slot))) {
if (isNotSplashPotion(mc.player.getInventory().getStack(slot))) {
slot = HealingSplashpotionSlot();
if (slot == -1) {
info("Ran out of Pots while splashing");
@@ -162,7 +162,7 @@ public class AutoPot extends Module {
}
if (drinking) {
if (ShouldDrinkStrength()) {
if (isNotPotion(mc.player.inventory.getStack(slot))) {
if (isNotPotion(mc.player.getInventory().getStack(slot))) {
slot = StrengthpotionSlot();
if (slot == -1) {
stopDrinking();
@@ -177,7 +177,7 @@ public class AutoPot extends Module {
}
if (splashing) {
if (ShouldDrinkStrength()) {
if (isNotSplashPotion(mc.player.inventory.getStack(slot))) {
if (isNotSplashPotion(mc.player.getInventory().getStack(slot))) {
slot = StrengthSplashpotionSlot();
if (slot == -1) {
info("Ran out of Pots while splashing");
@@ -200,7 +200,7 @@ public class AutoPot extends Module {
mc.options.keyUse.setPressed(pressed);
}
private void startDrinking() {
prevSlot = mc.player.inventory.selectedSlot;
prevSlot = mc.player.getInventory().selectedSlot;
drink();
// Pause auras
wasAura.clear();
@@ -216,15 +216,15 @@ 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.inventory.selectedSlot;
prevSlot = mc.player.getInventory().selectedSlot;
if (lookDown.get()){
Rotations.rotate(mc.player.yaw, 90); splash();
Rotations.rotate(mc.player.getYaw(), 90); splash();
}
splash();
// Pause auras
@@ -240,11 +240,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 +274,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,16 +295,16 @@ 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;
return mc.player.getHealth();
}
private void changeSlot(int slot) {
mc.player.inventory.selectedSlot = slot;
mc.player.getInventory().selectedSlot = slot;
this.slot = slot;
}
//Sunk 7 hours into these checks, if i die blame checks
@@ -313,11 +313,11 @@ public class AutoPot extends Module {
int slot = -1;
for (int i = 0; i < 9; i++) {
// Skip if item stack is empty
ItemStack stack = mc.player.inventory.getStack(i);
ItemStack stack = mc.player.getInventory().getStack(i);
if (stack.isEmpty()) continue;
if (stack.getItem() != Items.POTION) continue;
if (stack.getItem() == Items.POTION) {
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.inventory.getStack(i)).getEffects();
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.getInventory().getStack(i)).getEffects();
if (effects.size() > 0) {
StatusEffectInstance effect = effects.get(0);
if (effect.getTranslationKey().equals("effect.minecraft.instant_health")) {
@@ -333,11 +333,11 @@ public class AutoPot extends Module {
int slot = -1;
for (int i = 0; i < 9; i++) {
// Skip if item stack is empty
ItemStack stack = mc.player.inventory.getStack(i);
ItemStack stack = mc.player.getInventory().getStack(i);
if (stack.isEmpty()) continue;
if (stack.getItem() != Items.SPLASH_POTION) continue;
if (stack.getItem() == Items.SPLASH_POTION) {
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.inventory.getStack(i)).getEffects();
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.getInventory().getStack(i)).getEffects();
if (effects.size() > 0) {
StatusEffectInstance effect = effects.get(0);
if (effect.getTranslationKey().equals("effect.minecraft.instant_health")) {
@@ -354,11 +354,11 @@ public class AutoPot extends Module {
int slot = -1;
for (int i = 0; i < 9; i++) {
// Skip if item stack is empty
ItemStack stack = mc.player.inventory.getStack(i);
ItemStack stack = mc.player.getInventory().getStack(i);
if (stack.isEmpty()) continue;
if (stack.getItem() != Items.SPLASH_POTION) continue;
if (stack.getItem() == Items.SPLASH_POTION) {
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.inventory.getStack(i)).getEffects();
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.getInventory().getStack(i)).getEffects();
if (effects.size() > 0) {
StatusEffectInstance effect = effects.get(0);
if (effect.getTranslationKey().equals("effect.minecraft.strength")) {
@@ -375,11 +375,11 @@ public class AutoPot extends Module {
int slot = -1;
for (int i = 0; i < 9; i++) {
// Skip if item stack is empty
ItemStack stack = mc.player.inventory.getStack(i);
ItemStack stack = mc.player.getInventory().getStack(i);
if (stack.isEmpty()) continue;
if (stack.getItem() != Items.POTION) continue;
if (stack.getItem() == Items.POTION) {
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.inventory.getStack(i)).getEffects();
List<StatusEffectInstance> effects = PotionUtil.getPotion(mc.player.getInventory().getStack(i)).getEffects();
if (effects.size() > 0) {
StatusEffectInstance effect = effects.get(0);
if (effect.getTranslationKey().equals("effect.minecraft.strength")) {

6
src/main/java/cloudburst/rejects/modules/AutoTNT.java
View File

@@ -123,8 +123,8 @@ public class AutoTNT extends Module {
private void ignite(BlockPos pos, FindItemResult item) {
// Set slots
preSlot = mc.player.inventory.selectedSlot;
mc.player.inventory.selectedSlot = item.getSlot();
preSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = item.getSlot();
ActionResult result = mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5), Direction.UP, pos, true));
@@ -132,7 +132,7 @@ public class AutoTNT extends Module {
if (result == ActionResult.CONSUME || result == ActionResult.SUCCESS) ignited = true;
// Reset slot
mc.player.inventory.selectedSlot = preSlot;
mc.player.getInventory().selectedSlot = preSlot;
}
private FindItemResult getFlintAndSteelSlot() {

4
src/main/java/cloudburst/rejects/modules/BoatGlitch.java
View File

@@ -86,7 +86,7 @@ public class BoatGlitch extends Module {
}
if (boat != null) {
boat.noClip = true;
boat.pushSpeedReduction = 1;
//boat.pushSpeedReduction = 1;
dismountTicks = 5;
}
}
@@ -112,7 +112,7 @@ public class BoatGlitch extends Module {
if (remountTicks > 0) {
remountTicks--;
if (remountTicks == 0) {
mc.getNetworkHandler().sendPacket(new PlayerInteractEntityC2SPacket(boat, Hand.MAIN_HAND, false));
mc.getNetworkHandler().sendPacket( PlayerInteractEntityC2SPacket.interact(boat, false, Hand.MAIN_HAND));
if (toggleAfter.get()) {
toggle();
}

4
src/main/java/cloudburst/rejects/modules/BoatPhase.java
View File

@@ -107,10 +107,10 @@ public class BoatPhase extends Module {
if (boat != null) {
boat.noClip = true;
boat.pushSpeedReduction = 1;
//boat.pushSpeedReduction = 1;
if (lockYaw.get()) {
boat.yaw = mc.player.yaw;
boat.setYaw(mc.player.getYaw());
}
Vec3d vel;

10
src/main/java/cloudburst/rejects/modules/Confuse.java
View File

@@ -12,7 +12,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.RaycastContext;
import meteordevelopment.orbit.EventHandler;
import minegame159.meteorclient.events.render.RenderEvent;
import minegame159.meteorclient.events.render.Render3DEvent;
import minegame159.meteorclient.events.world.TickEvent;
import minegame159.meteorclient.settings.BoolSetting;
import minegame159.meteorclient.settings.EnumSetting;
@@ -122,10 +122,10 @@ public class Confuse extends Module {
double z = r.nextDouble() * 6 - 3;
Vec3d addend = new Vec3d(x, y, z);
Vec3d goal = entityPos.add(addend);
if (!mc.world.getBlockState(new BlockPos(goal.x, goal.y, goal.z)).getBlock().is(Blocks.AIR)) {
if (mc.world.getBlockState(new BlockPos(goal.x, goal.y, goal.z)).getBlock() != Blocks.AIR) {
goal = new Vec3d(x, playerPos.y, z);
}
if (mc.world.getBlockState(new BlockPos(goal.x, goal.y, goal.z)).getBlock().is(Blocks.AIR)) {
if (mc.world.getBlockState(new BlockPos(goal.x, goal.y, goal.z)).getBlock() == Blocks.AIR) {
hit = mc.world.raycast(new RaycastContext(
mc.player.getPos(),goal, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.ANY, mc.player
));
@@ -170,7 +170,7 @@ public class Confuse extends Module {
}
@EventHandler
private void onRender(RenderEvent event) {
private void onRender(Render3DEvent event) {
if (target == null) return;
boolean flag = budgetGraphics.get();
@@ -194,7 +194,7 @@ public class Confuse extends Module {
double sin = Math.sin(rad) * 3;
double cos = Math.cos(rad) * 3;
Vec3d c = new Vec3d(tp.x + sin, tp.y + target.getHeight() / 2, tp.z + cos);
if (last != null) RenderUtils.drawLine(last, c.x, c.y, c.z, c1, event);
if (last != null) event.renderer.line(last.x, last.y, last.z, c.x, c.y, c.z, c1);
last = c;
}
}

16
src/main/java/cloudburst/rejects/modules/InteractionMenu.java
View File

@@ -16,8 +16,8 @@ import minegame159.meteorclient.utils.misc.Keybind;
import net.minecraft.client.render.debug.DebugRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.StringTag;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtString;
import java.util.HashMap;
import java.util.Optional;
@@ -98,12 +98,12 @@ public class InteractionMenu extends Module {
}
@Override
public CompoundTag toTag() {
CompoundTag tag = super.toTag();
public NbtCompound toTag() {
NbtCompound tag = super.toTag();
CompoundTag messTag = new CompoundTag();
NbtCompound messTag = new NbtCompound();
messages.keySet().forEach((key) -> {
messTag.put(key, StringTag.of(messages.get(key)));
messTag.put(key, NbtString.of(messages.get(key)));
});
tag.put("messages", messTag);
@@ -111,10 +111,10 @@ public class InteractionMenu extends Module {
}
@Override
public Module fromTag(CompoundTag tag) {
public Module fromTag(NbtCompound tag) {
if (tag.contains("messages")) {
CompoundTag msgs = tag.getCompound("messages");
NbtCompound msgs = tag.getCompound("messages");
msgs.getKeys().forEach((key) -> {
messages.put(key, msgs.getString(key));
});

27
src/main/java/cloudburst/rejects/modules/Lavacast.java
View File

@@ -2,11 +2,10 @@ package cloudburst.rejects.modules;
import cloudburst.rejects.MeteorRejectsAddon;
import meteordevelopment.orbit.EventHandler;
import minegame159.meteorclient.events.render.RenderEvent;
import minegame159.meteorclient.events.render.Render3DEvent;
import minegame159.meteorclient.events.world.TickEvent;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.rendering.Renderer;
import minegame159.meteorclient.rendering.ShapeMode;
import minegame159.meteorclient.renderer.ShapeMode;
import minegame159.meteorclient.settings.IntSetting;
import minegame159.meteorclient.settings.Setting;
import minegame159.meteorclient.settings.SettingGroup;
@@ -179,7 +178,7 @@ public class Lavacast extends Module {
}
@EventHandler
private void onRender(RenderEvent event) {
private void onRender(Render3DEvent event) {
if (placeFluidPos == null) return;
double x1 = placeFluidPos.getX();
double y1 = placeFluidPos.getY();
@@ -196,7 +195,7 @@ public class Lavacast extends Module {
SettingColor color1 = color;
color1.a = 75;
Renderer.boxWithLines(Renderer.NORMAL, Renderer.LINES, x1, y1, z1, x2, y2, z2, color1, color, ShapeMode.Both, 0);
event.renderer.box(x1, y1, z1, x2, y2, z2, color1, color, ShapeMode.Both, 0);
}
private void placeLava() {
@@ -206,10 +205,10 @@ public class Lavacast extends Module {
toggle();
return;
}
int prevSlot = mc.player.inventory.selectedSlot;
mc.player.inventory.selectedSlot = findItemResult.getSlot();
int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.getSlot();
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
mc.player.inventory.selectedSlot = prevSlot;
mc.player.getInventory().selectedSlot = prevSlot;
}
private void placeWater() {
@@ -219,10 +218,10 @@ public class Lavacast extends Module {
toggle();
return;
}
int prevSlot = mc.player.inventory.selectedSlot;
mc.player.inventory.selectedSlot = findItemResult.getSlot();
int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.getSlot();
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
mc.player.inventory.selectedSlot = prevSlot;
mc.player.getInventory().selectedSlot = prevSlot;
}
private void pickupLiquid() {
@@ -232,10 +231,10 @@ public class Lavacast extends Module {
toggle();
return;
}
int prevSlot = mc.player.inventory.selectedSlot;
mc.player.inventory.selectedSlot = findItemResult.getSlot();
int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.getSlot();
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
mc.player.inventory.selectedSlot = prevSlot;
mc.player.getInventory().selectedSlot = prevSlot;
}
private void updateBlockBreakingProgress() {

19
src/main/java/cloudburst/rejects/modules/NewChunks.java
View File

@@ -3,15 +3,14 @@ package cloudburst.rejects.modules;
import cloudburst.rejects.MeteorRejectsAddon;
import meteordevelopment.orbit.EventHandler;
import minegame159.meteorclient.events.packets.PacketEvent;
import minegame159.meteorclient.events.render.RenderEvent;
import minegame159.meteorclient.rendering.Renderer;
import minegame159.meteorclient.rendering.ShapeMode;
import minegame159.meteorclient.events.render.Render3DEvent;
import minegame159.meteorclient.renderer.ShapeMode;
import minegame159.meteorclient.settings.*;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.utils.render.color.Color;
import minegame159.meteorclient.utils.render.color.SettingColor;
import net.minecraft.fluid.FluidState;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.network.packet.s2c.play.*;
import net.minecraft.util.math.*;
import net.minecraft.world.chunk.WorldChunk;
@@ -61,12 +60,12 @@ public class NewChunks extends Module {
}
@EventHandler
private void onRender(RenderEvent event) {
private void onRender(Render3DEvent event) {
if (newChunksColor.get().a>3) {
synchronized (newChunks) {
for (ChunkPos c : newChunks) {
if (mc.getCameraEntity().getBlockPos().isWithinDistance(c.getStartPos(), 1024)) {
drawBoxOutline(new Box(c.getStartPos(), c.getStartPos().add(16, 0, 16)), newChunksColor.get());
drawBoxOutline(new Box(c.getStartPos(), c.getStartPos().add(16, 0, 16)), newChunksColor.get(), event);
}
}
}
@@ -76,15 +75,15 @@ public class NewChunks extends Module {
synchronized (oldChunks) {
for (ChunkPos c : oldChunks) {
if (mc.getCameraEntity().getBlockPos().isWithinDistance(c.getStartPos(), 1024)) {
drawBoxOutline(new Box(c.getStartPos(), c.getStartPos().add(16, 0, 16)), oldChunksColor.get());
drawBoxOutline(new Box(c.getStartPos(), c.getStartPos().add(16, 0, 16)), oldChunksColor.get(), event);
}
}
}
}
}
private void drawBoxOutline(Box box, Color color) {
Renderer.boxWithLines(Renderer.NORMAL, Renderer.LINES,
private void drawBoxOutline(Box box, Color color, Render3DEvent event) {
event.renderer.box(
box.minX, box.minY, box.minZ, box.maxX, box.maxY, box.maxZ,
new Color(0,0,0,0), color, ShapeMode.Lines, 0
);
@@ -131,7 +130,7 @@ public class NewChunks extends Module {
if (!newChunks.contains(pos) && mc.world.getChunkManager().getChunk(packet.getX(), packet.getZ()) == null) {
WorldChunk chunk = new WorldChunk(mc.world, pos, null);
chunk.loadFromPacket(null, packet.getReadBuffer(), new CompoundTag(), packet.getVerticalStripBitmask());
chunk.loadFromPacket(null, packet.getReadBuffer(), new NbtCompound(), packet.getVerticalStripBitmask());
for (int x = 0; x < 16; x++) {
for (int y = 0; y < mc.world.getHeight(); y++) {

6
src/main/java/cloudburst/rejects/modules/ObsidianFarm.java
View File

@@ -50,7 +50,7 @@ public class ObsidianFarm extends Module {
return;
}
}
mc.player.inventory.selectedSlot = pickAxe;
mc.player.getInventory().selectedSlot = pickAxe;
}
BlockPos obsidian = findObsidian();
@@ -109,8 +109,8 @@ public class ObsidianFarm extends Module {
private int findPickAxe() {
int result = -1;
for (int i = 0; i < 9; i++) {
if (mc.player.inventory.getStack(i).getItem() == Items.NETHERITE_PICKAXE) return i;
if (mc.player.inventory.getStack(i).getItem() == Items.DIAMOND_PICKAXE) result = i;
if (mc.player.getInventory().getStack(i).getItem() == Items.NETHERITE_PICKAXE) return i;
if (mc.player.getInventory().getStack(i).getItem() == Items.DIAMOND_PICKAXE) result = i;
}
return result;
}

8
src/main/java/cloudburst/rejects/modules/PacketFly.java
View File

@@ -169,8 +169,8 @@ public class PacketFly extends Module {
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.pitch);
((PlayerPositionLookS2CPacketAccessor) event.packet).setYaw(mc.player.yaw);
((PlayerPositionLookS2CPacketAccessor) event.packet).setPitch(mc.player.getPitch());
((PlayerPositionLookS2CPacketAccessor) event.packet).setYaw(mc.player.getYaw());
}
if (setID.get()) {
teleportID = packet.getTeleportId();
@@ -194,9 +194,9 @@ public class PacketFly extends Module {
Vec3d vec = new Vec3d(x, y, z);
Vec3d position = mc.player.getPos().add(vec);
Vec3d outOfBoundsVec = outOfBoundsVec(vec, position);
packetSender(new PlayerMoveC2SPacket.PositionOnly(position.x, position.y, position.z, mc.player.isOnGround()));
packetSender(new PlayerMoveC2SPacket.PositionAndOnGround(position.x, position.y, position.z, mc.player.isOnGround()));
if (invalidPacket.get()) {
packetSender(new PlayerMoveC2SPacket.PositionOnly(outOfBoundsVec.x, outOfBoundsVec.y, outOfBoundsVec.z, mc.player.isOnGround()));
packetSender(new PlayerMoveC2SPacket.PositionAndOnGround(outOfBoundsVec.x, outOfBoundsVec.y, outOfBoundsVec.z, mc.player.isOnGround()));
}
if (setPos.get()) {
mc.player.setPos(position.x, position.y, position.z);

22
src/main/java/cloudburst/rejects/modules/SkeletonESP.java
View File

@@ -3,7 +3,7 @@ package cloudburst.rejects.modules;
import cloudburst.rejects.MeteorRejectsAddon;
import cloudburst.rejects.utils.Render3DUtils;
import meteordevelopment.orbit.EventHandler;
import minegame159.meteorclient.events.render.RenderEvent;
import minegame159.meteorclient.events.render.Render3DEvent;
import minegame159.meteorclient.settings.*;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.systems.modules.Modules;
@@ -13,13 +13,13 @@ 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.option.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.util.math.Vec3f;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.*;
@@ -42,7 +42,7 @@ public class SkeletonESP extends Module {
}
@EventHandler
private void onRender(RenderEvent event) {
private void onRender(Render3DEvent event) {
MatrixStack matrixStack = event.matrices;
float g = event.tickDelta;
Render3DUtils.setup3DRender(true);
@@ -64,7 +64,7 @@ public class SkeletonESP extends Module {
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 m = MathHelper.lerp(g, playerEntity.prevPitch, playerEntity.getPitch());
playerEntityModel.setAngles(playerEntity, q, p, o, k, m);
boolean sneaking = playerEntity.isSneaking();
@@ -76,9 +76,9 @@ public class SkeletonESP extends Module {
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));
matrixStack.multiply(new Quaternion(new Vec3f(0, -1, 0), playerEntity.bodyYaw + 180, true));
BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer();
bufferBuilder.begin(1, VertexFormats.POSITION_COLOR);
bufferBuilder.begin(VertexFormat.DrawMode.LINES, 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();
@@ -133,7 +133,7 @@ public class SkeletonESP extends Module {
bufferBuilder.end();
BufferRenderer.draw(bufferBuilder);
matrixStack.multiply(new Quaternion(new Vector3f(0, 1, 0), playerEntity.bodyYaw + 180, true));
matrixStack.multiply(new Quaternion(new Vec3f(0, 1, 0), playerEntity.bodyYaw + 180, true));
matrixStack.translate(-footPos.x, -footPos.y, -footPos.z);
});
Render3DUtils.end3DRender();
@@ -141,15 +141,15 @@ public class SkeletonESP extends Module {
private void rotate(MatrixStack matrix, ModelPart modelPart) {
if (modelPart.roll != 0.0F) {
matrix.multiply(Vector3f.POSITIVE_Z.getRadialQuaternion(modelPart.roll));
matrix.multiply(Vec3f.POSITIVE_Z.getRadialQuaternion(modelPart.roll));
}
if (modelPart.yaw != 0.0F) {
matrix.multiply(Vector3f.NEGATIVE_Y.getRadialQuaternion(modelPart.yaw));
matrix.multiply(Vec3f.NEGATIVE_Y.getRadialQuaternion(modelPart.yaw));
}
if (modelPart.pitch != 0.0F) {
matrix.multiply(Vector3f.NEGATIVE_X.getRadialQuaternion(modelPart.pitch));
matrix.multiply(Vec3f.NEGATIVE_X.getRadialQuaternion(modelPart.pitch));
}
}
}

2
src/main/java/cloudburst/rejects/modules/SpawnProofer.java
View File

@@ -119,7 +119,7 @@ public class SpawnProofer extends Module {
} else {
// Check if light source
if (isLightSource(Block.getBlockFromItem(mc.player.inventory.getStack(block.getSlot()).getItem()))) {
if (isLightSource(Block.getBlockFromItem(mc.player.getInventory().getStack(block.getSlot()).getItem()))) {
// Find lowest light level
int lowestLightLevel = 16;