From 44d12f2b2c912c75e0ccffcc003ecedda6ca7a4b Mon Sep 17 00:00:00 2001 From: Cloudburst Date: Fri, 23 Jul 2021 14:41:58 +0200 Subject: [PATCH] Fixed Auto32k (#25) --- .../java/cloudburst/rejects/modules/Auto32K.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/cloudburst/rejects/modules/Auto32K.java b/src/main/java/cloudburst/rejects/modules/Auto32K.java index e34106e..6df1124 100644 --- a/src/main/java/cloudburst/rejects/modules/Auto32K.java +++ b/src/main/java/cloudburst/rejects/modules/Auto32K.java @@ -15,8 +15,7 @@ import meteordevelopment.meteorclient.systems.modules.Module; import meteordevelopment.meteorclient.utils.player.*; import meteordevelopment.meteorclient.utils.world.BlockUtils; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; +import net.minecraft.block.*; import net.minecraft.client.gui.screen.ingame.Generic3x3ContainerScreen; import net.minecraft.client.gui.screen.ingame.HopperScreen; import net.minecraft.enchantment.EnchantmentHelper; @@ -103,7 +102,7 @@ public class Auto32K extends Module { private void onTick(TickEvent.Post event) { if (phase <= 7) { if (mode.get() == Mode.Hopper) { - FindItemResult findShulker = InvUtils.findInHotbar(Items.SHULKER_BOX); + FindItemResult findShulker = InvUtils.findInHotbar(this::isShulkerBox); FindItemResult findHopper = InvUtils.findInHotbar(Items.HOPPER); if (isValidSlot(findShulker) || isValidSlot(findHopper)) return; List sortedBlocks = findValidBlocksHopper(); @@ -129,7 +128,7 @@ public class Auto32K extends Module { phase = 8; } } 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 dispenserSlot = InvUtils.find(Items.DISPENSER); FindItemResult redstoneSlot = InvUtils.find(Items.REDSTONE_BLOCK); @@ -282,6 +281,13 @@ public class Auto32K extends Module { 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 getRange(BlockPos player, double range){ List allBlocks = new ArrayList<>(); for(double i = player.getX() - range; i < player.getX() + range; i++){