getSlot() and found()
This commit is contained in:
@@ -145,7 +145,7 @@ public class Auto32K extends Module {
|
|||||||
}
|
}
|
||||||
phase += 1;
|
phase += 1;
|
||||||
} else if (phase == 1) {
|
} else if (phase == 1) {
|
||||||
mc.player.inventory.selectedSlot = dispenserSlot.slot;
|
mc.player.inventory.selectedSlot = dispenserSlot.getSlot();
|
||||||
if (x == -1) {
|
if (x == -1) {
|
||||||
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(-90f, mc.player.pitch, mc.player.isOnGround()));
|
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(-90f, mc.player.pitch, mc.player.isOnGround()));
|
||||||
} else if (x == 1) {
|
} else if (x == 1) {
|
||||||
@@ -164,13 +164,13 @@ public class Auto32K extends Module {
|
|||||||
phase += 1;
|
phase += 1;
|
||||||
}else if (phase == 4 && mc.currentScreen instanceof Generic3x3ContainerScreen) {
|
}else if (phase == 4 && mc.currentScreen instanceof Generic3x3ContainerScreen) {
|
||||||
mc.player.getSpeed();
|
mc.player.getSpeed();
|
||||||
InvUtils.move().from(shulkerSlot.slot).toId(4);
|
InvUtils.move().from(shulkerSlot.getSlot()).toId(4);
|
||||||
phase += 1;
|
phase += 1;
|
||||||
}else if (phase == 5 && mc.currentScreen instanceof Generic3x3ContainerScreen) {
|
}else if (phase == 5 && mc.currentScreen instanceof Generic3x3ContainerScreen) {
|
||||||
mc.player.closeHandledScreen();
|
mc.player.closeHandledScreen();
|
||||||
phase += 1;
|
phase += 1;
|
||||||
}else if (phase == 6) {
|
}else if (phase == 6) {
|
||||||
mc.player.inventory.selectedSlot = redstoneSlot.slot;
|
mc.player.inventory.selectedSlot = redstoneSlot.getSlot();
|
||||||
mc.player.setSneaking(true);
|
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.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);
|
mc.player.setSneaking(false);
|
||||||
@@ -296,7 +296,7 @@ public class Auto32K extends Module {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isValidSlot(FindItemResult findItemResult){
|
private boolean isValidSlot(FindItemResult findItemResult){
|
||||||
return findItemResult.slot == -1 || findItemResult.slot >= 9;
|
return findItemResult.getSlot() == -1 || findItemResult.getSlot() >= 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Block> setDefaultBlocks(){
|
private List<Block> setDefaultBlocks(){
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ public class AutoBedTrap extends Module {
|
|||||||
}
|
}
|
||||||
|
|
||||||
FindItemResult findBlock = InvUtils.findInHotbar(Items.OBSIDIAN);
|
FindItemResult findBlock = InvUtils.findInHotbar(Items.OBSIDIAN);
|
||||||
if (findBlock.slot == -1) {
|
if (!findBlock.found()) {
|
||||||
error("No specified blocks found. Disabling.");
|
error("No specified blocks found. Disabling.");
|
||||||
toggle();
|
toggle();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ public class AutoTNT extends Module {
|
|||||||
private void ignite(BlockPos pos, FindItemResult item) {
|
private void ignite(BlockPos pos, FindItemResult item) {
|
||||||
// Set slots
|
// Set slots
|
||||||
preSlot = mc.player.inventory.selectedSlot;
|
preSlot = mc.player.inventory.selectedSlot;
|
||||||
mc.player.inventory.selectedSlot = item.slot;
|
mc.player.inventory.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));
|
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));
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ public class Lavacast extends Module {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int prevSlot = mc.player.inventory.selectedSlot;
|
int prevSlot = mc.player.inventory.selectedSlot;
|
||||||
mc.player.inventory.selectedSlot = findItemResult.slot;
|
mc.player.inventory.selectedSlot = findItemResult.getSlot();
|
||||||
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
|
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
|
||||||
mc.player.inventory.selectedSlot = prevSlot;
|
mc.player.inventory.selectedSlot = prevSlot;
|
||||||
}
|
}
|
||||||
@@ -220,7 +220,7 @@ public class Lavacast extends Module {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int prevSlot = mc.player.inventory.selectedSlot;
|
int prevSlot = mc.player.inventory.selectedSlot;
|
||||||
mc.player.inventory.selectedSlot = findItemResult.slot;
|
mc.player.inventory.selectedSlot = findItemResult.getSlot();
|
||||||
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
|
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
|
||||||
mc.player.inventory.selectedSlot = prevSlot;
|
mc.player.inventory.selectedSlot = prevSlot;
|
||||||
}
|
}
|
||||||
@@ -233,7 +233,7 @@ public class Lavacast extends Module {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int prevSlot = mc.player.inventory.selectedSlot;
|
int prevSlot = mc.player.inventory.selectedSlot;
|
||||||
mc.player.inventory.selectedSlot = findItemResult.slot;
|
mc.player.inventory.selectedSlot = findItemResult.getSlot();
|
||||||
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
|
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
|
||||||
mc.player.inventory.selectedSlot = prevSlot;
|
mc.player.inventory.selectedSlot = prevSlot;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public class Painter extends Module {
|
|||||||
|
|
||||||
// Get slot
|
// Get slot
|
||||||
FindItemResult findItemResult = InvUtils.findInHotbar(itemStack -> block.get() == Block.getBlockFromItem(itemStack.getItem()));
|
FindItemResult findItemResult = InvUtils.findInHotbar(itemStack -> block.get() == Block.getBlockFromItem(itemStack.getItem()));
|
||||||
if (findItemResult.slot == -1) {
|
if (!findItemResult.found()) {
|
||||||
error("No selected blocks in hotbar");
|
error("No selected blocks in hotbar");
|
||||||
toggle();
|
toggle();
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ public class SpawnProofer extends Module {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
// Check if light source
|
// Check if light source
|
||||||
if (isLightSource(Block.getBlockFromItem(mc.player.inventory.getStack(block.slot).getItem()))) {
|
if (isLightSource(Block.getBlockFromItem(mc.player.inventory.getStack(block.getSlot()).getItem()))) {
|
||||||
|
|
||||||
// Find lowest light level
|
// Find lowest light level
|
||||||
int lowestLightLevel = 16;
|
int lowestLightLevel = 16;
|
||||||
|
|||||||
Reference in New Issue
Block a user