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

getSlot() and found()

Browse Source
This commit is contained in:
StormyBytes
2021-06-07 21:21:58 +07:00
parent b21a0ee7f1
commit 48e19964f2
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ public class Auto32K extends Module {
}
phase += 1;
} else if (phase == 1) {
mc.player.inventory.selectedSlot = dispenserSlot.slot;
mc.player.inventory.selectedSlot = dispenserSlot.getSlot();
if (x == -1) {
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookOnly(-90f, mc.player.pitch, mc.player.isOnGround()));
} else if (x == 1) {
@@ -164,13 +164,13 @@ public class Auto32K extends Module {
phase += 1;
}else if (phase == 4 && mc.currentScreen instanceof Generic3x3ContainerScreen) {
mc.player.getSpeed();
InvUtils.move().from(shulkerSlot.slot).toId(4);
InvUtils.move().from(shulkerSlot.getSlot()).toId(4);
phase += 1;
}else if (phase == 5 && mc.currentScreen instanceof Generic3x3ContainerScreen) {
mc.player.closeHandledScreen();
phase += 1;
}else if (phase == 6) {
mc.player.inventory.selectedSlot = redstoneSlot.slot;
mc.player.inventory.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);
@@ -296,7 +296,7 @@ public class Auto32K extends Module {
}
private boolean isValidSlot(FindItemResult findItemResult){
return findItemResult.slot == -1 || findItemResult.slot >= 9;
return findItemResult.getSlot() == -1 || findItemResult.getSlot() >= 9;
}
private List<Block> setDefaultBlocks(){

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

@@ -92,7 +92,7 @@ public class AutoBedTrap extends Module {
}
FindItemResult findBlock = InvUtils.findInHotbar(Items.OBSIDIAN);
if (findBlock.slot == -1) {
if (!findBlock.found()) {
error("No specified blocks found. Disabling.");
toggle();
}

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

@@ -124,7 +124,7 @@ public class AutoTNT extends Module {
private void ignite(BlockPos pos, FindItemResult item) {
// Set slots
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));

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

@@ -207,7 +207,7 @@ public class Lavacast extends Module {
return;
}
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.player.inventory.selectedSlot = prevSlot;
}
@@ -220,7 +220,7 @@ public class Lavacast extends Module {
return;
}
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.player.inventory.selectedSlot = prevSlot;
}
@@ -233,7 +233,7 @@ public class Lavacast extends Module {
return;
}
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.player.inventory.selectedSlot = prevSlot;
}

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

@@ -95,7 +95,7 @@ public class Painter extends Module {
// Get slot
FindItemResult findItemResult = InvUtils.findInHotbar(itemStack -> block.get() == Block.getBlockFromItem(itemStack.getItem()));
if (findItemResult.slot == -1) {
if (!findItemResult.found()) {
error("No selected blocks in hotbar");
toggle();
return;

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.slot).getItem()))) {
if (isLightSource(Block.getBlockFromItem(mc.player.inventory.getStack(block.getSlot()).getItem()))) {
// Find lowest light level
int lowestLightLevel = 16;