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

new dev build compatibility

Browse Source
This commit is contained in:
Cloudburst
2021-05-19 21:06:46 +02:00
parent fe70571790
commit 003068277f
11 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cloudburst/rejects/modules/AntiVanish.java
View File

@@ -12,7 +12,6 @@ import minegame159.meteorclient.events.world.TickEvent;
import minegame159.meteorclient.systems.modules.Categories;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.utils.entity.EntityUtils;
import minegame159.meteorclient.utils.player.ChatUtils;
import net.minecraft.client.MinecraftClient;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
@@ -63,7 +62,7 @@ public class AntiVanish extends Module {
try {
String name = getPlayerNameFromUUID(lookup);
if (name != null) {
ChatUtils.moduleWarning(this, name + " has gone into vanish.");
warning(name + " has gone into vanish.");
}
} catch (Exception ignore) {}
lastTick = time;

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

@@ -15,6 +15,8 @@ import minegame159.meteorclient.systems.modules.Categories;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.utils.Utils;
import minegame159.meteorclient.utils.player.*;
import minegame159.meteorclient.utils.world.BlockUtils;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.client.gui.screen.ingame.Generic3x3ContainerScreen;
@@ -113,16 +115,14 @@ public class Auto32K extends Module {
if(sortedIterator.hasNext()) bestBlock = sortedIterator.next();
if (bestBlock != null) {
mc.player.inventory.selectedSlot = hopperSlot;
while (!PlayerUtils.placeBlock(bestBlock, Hand.MAIN_HAND)) {
while (!BlockUtils.place(bestBlock, Hand.MAIN_HAND,hopperSlot,true,100,false)) {
if(sortedIterator.hasNext()) {
bestBlock = sortedIterator.next().up();
}else break;
}
mc.player.setSneaking(true);
mc.player.inventory.selectedSlot = shulkerSlot;
if (!PlayerUtils.placeBlock(bestBlock.up(), Hand.MAIN_HAND)) {
ChatUtils.moduleError(this,"Failed to place.");
if (!BlockUtils.place(bestBlock.up(), Hand.MAIN_HAND, shulkerSlot,true,100,false)) {
error("Failed to place.");
this.toggle();
return;
}
@@ -139,10 +139,9 @@ public class Auto32K extends Module {
return;
if (phase == 0) {
bestBlock = findValidBlocksDispenser();
mc.player.inventory.selectedSlot = hopperSlot;
if(bestBlock == null) return;
if (!PlayerUtils.placeBlock(bestBlock.add(x, 0, z), Hand.MAIN_HAND)) {
ChatUtils.moduleError(this,"Failed to place.");
if (!BlockUtils.place(bestBlock.add(x, 0, z), Hand.MAIN_HAND, hopperSlot, true, 100, false)) {
error("Failed to place.");
this.toggle();
return;
}

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

@@ -7,10 +7,7 @@ import minegame159.meteorclient.settings.BoolSetting;
import minegame159.meteorclient.settings.IntSetting;
import minegame159.meteorclient.settings.Setting;
import minegame159.meteorclient.settings.SettingGroup;
import minegame159.meteorclient.systems.modules.Categories;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.utils.player.ChatUtils;
import minegame159.meteorclient.utils.player.InvUtils;
import minegame159.meteorclient.utils.player.PlayerUtils;
import minegame159.meteorclient.utils.player.RotationUtils;
import minegame159.meteorclient.utils.world.BlockIterator;
@@ -98,13 +95,13 @@ public class AutoExtinguish extends Module {
private void onTick(TickEvent.Pre event) {
if (mc.world.getDimension().isRespawnAnchorWorking()) {
if (doesWaterBucketWork) {
ChatUtils.warning("Water Buckets don't work in this dimension!");
warning("Water Buckets don't work in this dimension!");
doesWaterBucketWork = false;
}
} else {
if (!doesWaterBucketWork) {
ChatUtils.warning("Enabled Water Buckets!");
warning("Enabled Water Buckets!");
doesWaterBucketWork = true;
}
}

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

@@ -14,7 +14,6 @@ import minegame159.meteorclient.systems.modules.combat.CrystalAura;
import minegame159.meteorclient.systems.modules.combat.KillAura;
import minegame159.meteorclient.settings.*;
import minegame159.meteorclient.utils.Utils;
import minegame159.meteorclient.utils.player.ChatUtils;
import minegame159.meteorclient.utils.player.Rotations;
import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.entity.effect.StatusEffectInstance;
@@ -116,7 +115,7 @@ public class AutoPot extends Module {
if (isNotPotion(mc.player.inventory.getStack(slot))) {
slot = HealingpotionSlot();
if (slot == -1) {
ChatUtils.moduleInfo(this, "Ran out of Pots while drinking");
info("Ran out of Pots while drinking");
stopDrinking();
return;
}
@@ -124,7 +123,7 @@ public class AutoPot extends Module {
}
drink();
if (ShouldNotDrinkHealth()) {
ChatUtils.moduleInfo(this, "Health Full");
info("Health Full");
stopDrinking();
return;
}
@@ -134,14 +133,14 @@ public class AutoPot extends Module {
if (isNotSplashPotion(mc.player.inventory.getStack(slot))) {
slot = HealingSplashpotionSlot();
if (slot == -1) {
ChatUtils.moduleInfo(this, "Ran out of Pots while splashing");
info("Ran out of Pots while splashing");
stopSplashing();
return;
} else changeSlot(slot);
}
splash();
if (ShouldNotDrinkHealth()) {
ChatUtils.moduleInfo(this, "Health Full");
info("Health Full");
stopSplashing();
return;
}
@@ -169,7 +168,7 @@ public class AutoPot extends Module {
slot = StrengthpotionSlot();
if (slot == -1) {
stopDrinking();
ChatUtils.moduleInfo(this, "Out of Pots");
info("Out of Pots");
return;
} else changeSlot(slot);
}
@@ -183,7 +182,7 @@ public class AutoPot extends Module {
if (isNotSplashPotion(mc.player.inventory.getStack(slot))) {
slot = StrengthSplashpotionSlot();
if (slot == -1) {
ChatUtils.moduleInfo(this, "Ran out of Pots while splashing");
info("Ran out of Pots while splashing");
stopSplashing();
return;
} else changeSlot(slot);

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

@@ -4,15 +4,12 @@ import cloudburst.rejects.MeteorRejectsAddon;
import meteordevelopment.orbit.EventHandler;
import minegame159.meteorclient.events.render.RenderEvent;
import minegame159.meteorclient.events.world.TickEvent;
import minegame159.meteorclient.systems.modules.Categories;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.rendering.Renderer;
import minegame159.meteorclient.rendering.ShapeMode;
import minegame159.meteorclient.settings.EnumSetting;
import minegame159.meteorclient.settings.IntSetting;
import minegame159.meteorclient.settings.Setting;
import minegame159.meteorclient.settings.SettingGroup;
import minegame159.meteorclient.utils.player.ChatUtils;
import minegame159.meteorclient.utils.player.InvUtils;
import minegame159.meteorclient.utils.player.Rotations;
import minegame159.meteorclient.utils.render.color.SettingColor;
@@ -116,11 +113,11 @@ public class Lavacast extends Module {
getDistance(new Vec3i(0,0,1));
getDistance(new Vec3i(1,0,-1));
if (dist<1) {
ChatUtils.moduleError(this,"Couldn't locate bottom.");
error("Couldn't locate bottom.");
toggle();
return;
}
ChatUtils.moduleInfo(this,"Distance: (highlight)%d(default).", dist);
info("Distance: (highlight)%d(default).", dist);
}
@EventHandler
@@ -204,7 +201,7 @@ public class Lavacast extends Module {
private void placeLava() {
int slot = InvUtils.findItemInHotbar(Items.LAVA_BUCKET);
if (slot == -1) {
ChatUtils.moduleError(this,"No lava bucket found.");
error("No lava bucket found.");
toggle();
return;
}
@@ -217,7 +214,7 @@ public class Lavacast extends Module {
private void placeWater() {
int slot = InvUtils.findItemInHotbar(Items.WATER_BUCKET);
if (slot == -1) {
ChatUtils.moduleError(this,"No water bucket found.");
error("No water bucket found.");
toggle();
return;
}
@@ -230,7 +227,7 @@ public class Lavacast extends Module {
private void pickupLiquid() {
int slot = InvUtils.findItemInHotbar(Items.BUCKET);
if (slot == -1) {
ChatUtils.moduleError(this,"No bucket found.");
error("No bucket found.");
toggle();
return;
}

3
src/main/java/cloudburst/rejects/modules/SoundLocator.java
View File

@@ -9,6 +9,7 @@ import minegame159.meteorclient.settings.SoundEventListSetting;
import minegame159.meteorclient.systems.modules.Categories;
import minegame159.meteorclient.systems.modules.Module;
import minegame159.meteorclient.utils.player.ChatUtils;
import net.minecraft.client.sound.SoundInstance;
import net.minecraft.client.sound.WeightedSoundSet;
import net.minecraft.sound.SoundEvent;
@@ -51,6 +52,6 @@ public class SoundLocator extends Module {
Vec3d pos = new Vec3d(sound.getX(), sound.getY(), sound.getZ());
text.append(ChatUtils.formatCoords(pos));
text.append(String.format("%s.", Formatting.RESET));
ChatUtils.moduleInfo(this,text);
info(text);
}
}