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

Fixed Auto32k (#25)

Browse Source
This commit is contained in:
Cloudburst
2021-07-23 14:41:58 +02:00
parent e53679ae87
commit 44d12f2b2c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,7 @@ import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.player.*; import meteordevelopment.meteorclient.utils.player.*;
import meteordevelopment.meteorclient.utils.world.BlockUtils; import meteordevelopment.meteorclient.utils.world.BlockUtils;
import net.minecraft.block.Block; import net.minecraft.block.*;
import net.minecraft.block.Blocks;
import net.minecraft.client.gui.screen.ingame.Generic3x3ContainerScreen; import net.minecraft.client.gui.screen.ingame.Generic3x3ContainerScreen;
import net.minecraft.client.gui.screen.ingame.HopperScreen; import net.minecraft.client.gui.screen.ingame.HopperScreen;
import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentHelper;
@@ -103,7 +102,7 @@ public class Auto32K extends Module {
private void onTick(TickEvent.Post event) { private void onTick(TickEvent.Post event) {
if (phase <= 7) { if (phase <= 7) {
if (mode.get() == Mode.Hopper) { if (mode.get() == Mode.Hopper) {
FindItemResult findShulker = InvUtils.findInHotbar(Items.SHULKER_BOX); FindItemResult findShulker = InvUtils.findInHotbar(this::isShulkerBox);
FindItemResult findHopper = InvUtils.findInHotbar(Items.HOPPER); FindItemResult findHopper = InvUtils.findInHotbar(Items.HOPPER);
if (isValidSlot(findShulker) || isValidSlot(findHopper)) return; if (isValidSlot(findShulker) || isValidSlot(findHopper)) return;
List<BlockPos> sortedBlocks = findValidBlocksHopper(); List<BlockPos> sortedBlocks = findValidBlocksHopper();
@@ -129,7 +128,7 @@ public class Auto32K extends Module {
phase = 8; phase = 8;
} }
} else if (mode.get() == Mode.Dispenser) { } else if (mode.get() == Mode.Dispenser) {
FindItemResult shulkerSlot = InvUtils.find(Items.SHULKER_BOX); FindItemResult shulkerSlot = InvUtils.find(this::isShulkerBox);
FindItemResult hopperSlot = InvUtils.find(Items.HOPPER); FindItemResult hopperSlot = InvUtils.find(Items.HOPPER);
FindItemResult dispenserSlot = InvUtils.find(Items.DISPENSER); FindItemResult dispenserSlot = InvUtils.find(Items.DISPENSER);
FindItemResult redstoneSlot = InvUtils.find(Items.REDSTONE_BLOCK); FindItemResult redstoneSlot = InvUtils.find(Items.REDSTONE_BLOCK);
@@ -282,6 +281,13 @@ public class Auto32K extends Module {
return null; return null;
} }
private boolean isShulkerBox(ItemStack stack) {
Item item = stack.getItem();
if (!(item instanceof BlockItem)) return false;
Block block = ((BlockItem)item).getBlock();
return block instanceof ShulkerBoxBlock;
}
private List<BlockPos> getRange(BlockPos player, double range){ private List<BlockPos> getRange(BlockPos player, double range){
List<BlockPos> allBlocks = new ArrayList<>(); List<BlockPos> allBlocks = new ArrayList<>();
for(double i = player.getX() - range; i < player.getX() + range; i++){ for(double i = player.getX() - range; i < player.getX() + range; i++){