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

fixing "small cleanup" issues

Browse Source
This commit is contained in:
C10udburst
2022-01-12 19:08:26 +01:00
parent f29e75c25e
commit 459b158cd8
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/anticope/rejects/gui/hud/AppleHud.java
View File

@@ -41,8 +41,8 @@ public class AppleHud extends HudElement {
if (isInEditor()) { if (isInEditor()) {
RenderUtils.drawItem(Items.GOLDEN_APPLE.getDefaultStack(), (int) x, (int) y, scale.get(), true); RenderUtils.drawItem(Items.GOLDEN_APPLE.getDefaultStack(), (int) x, (int) y, scale.get(), true);
} else { } else {
int count = InvUtils.find(Items.GOLDEN_APPLE).getCount(); int count = InvUtils.find(Items.GOLDEN_APPLE).count();
count += InvUtils.find(Items.ENCHANTED_GOLDEN_APPLE).getCount(); count += InvUtils.find(Items.ENCHANTED_GOLDEN_APPLE).count();
if (count > 0) if (count > 0)
RenderUtils.drawItem(new ItemStack(Items.GOLDEN_APPLE, count), (int) x, (int) y, scale.get(), true); RenderUtils.drawItem(new ItemStack(Items.GOLDEN_APPLE, count), (int) x, (int) y, scale.get(), true);
} }

4
src/main/java/anticope/rejects/gui/hud/CrystalHud.java
View File

@@ -42,8 +42,8 @@ public class CrystalHud extends HudElement {
if (isInEditor()) { if (isInEditor()) {
RenderUtils.drawItem(Items.END_CRYSTAL.getDefaultStack(), (int) x, (int) y, scale.get(), true); RenderUtils.drawItem(Items.END_CRYSTAL.getDefaultStack(), (int) x, (int) y, scale.get(), true);
} else if (InvUtils.find(Items.END_CRYSTAL).getCount() > 0) { } else if (InvUtils.find(Items.END_CRYSTAL).count() > 0) {
RenderUtils.drawItem(new ItemStack(Items.END_CRYSTAL, InvUtils.find(Items.END_CRYSTAL).getCount()), (int) x, (int) y, scale.get(), true); RenderUtils.drawItem(new ItemStack(Items.END_CRYSTAL, InvUtils.find(Items.END_CRYSTAL).count()), (int) x, (int) y, scale.get(), true);
} }
} }
} }

4
src/main/java/anticope/rejects/gui/hud/ExpHud.java
View File

@@ -40,8 +40,8 @@ public class ExpHud extends HudElement {
if (isInEditor()) { if (isInEditor()) {
RenderUtils.drawItem(Items.EXPERIENCE_BOTTLE.getDefaultStack(), (int) x, (int) y, scale.get(), true); RenderUtils.drawItem(Items.EXPERIENCE_BOTTLE.getDefaultStack(), (int) x, (int) y, scale.get(), true);
} else if (InvUtils.find(Items.EXPERIENCE_BOTTLE).getCount() > 0) { } else if (InvUtils.find(Items.EXPERIENCE_BOTTLE).count() > 0) {
RenderUtils.drawItem(new ItemStack(Items.EXPERIENCE_BOTTLE, InvUtils.find(Items.EXPERIENCE_BOTTLE).getCount()), (int) x, (int) y, scale.get(), true); RenderUtils.drawItem(new ItemStack(Items.EXPERIENCE_BOTTLE, InvUtils.find(Items.EXPERIENCE_BOTTLE).count()), (int) x, (int) y, scale.get(), true);
} }
} }
} }

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

@@ -144,7 +144,7 @@ public class Auto32K extends Module {
} }
phase += 1; phase += 1;
} else if (phase == 1) { } else if (phase == 1) {
mc.player.getInventory().selectedSlot = dispenserSlot.getSlot(); mc.player.getInventory().selectedSlot = dispenserSlot.slot();
if (x == -1) { if (x == -1) {
mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(-90f, mc.player.getPitch(), mc.player.isOnGround())); mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.LookAndOnGround(-90f, mc.player.getPitch(), mc.player.isOnGround()));
} else if (x == 1) { } else if (x == 1) {
@@ -163,13 +163,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.getSlot()).toId(4); InvUtils.move().from(shulkerSlot.slot()).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.getInventory().selectedSlot = redstoneSlot.getSlot(); mc.player.getInventory().selectedSlot = redstoneSlot.slot();
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);
@@ -302,7 +302,7 @@ public class Auto32K extends Module {
} }
private boolean isValidSlot(FindItemResult findItemResult){ private boolean isValidSlot(FindItemResult findItemResult){
return findItemResult.getSlot() == -1 || findItemResult.getSlot() >= 9; return findItemResult.slot() == -1 || findItemResult.slot() >= 9;
} }
private List<Block> setDefaultBlocks(){ private List<Block> setDefaultBlocks(){

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

@@ -195,7 +195,7 @@ public class AutoTNT extends Module {
} }
private void ignite(BlockPos pos, FindItemResult item) { private void ignite(BlockPos pos, FindItemResult item) {
InvUtils.swap(item.getSlot(), true); InvUtils.swap(item.slot(), true);
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)); 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/anticope/rejects/modules/Lavacast.java
View File

@@ -206,7 +206,7 @@ public class Lavacast extends Module {
return; return;
} }
int prevSlot = mc.player.getInventory().selectedSlot; int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.getSlot(); mc.player.getInventory().selectedSlot = findItemResult.slot();
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND); mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
mc.player.getInventory().selectedSlot = prevSlot; mc.player.getInventory().selectedSlot = prevSlot;
} }
@@ -219,7 +219,7 @@ public class Lavacast extends Module {
return; return;
} }
int prevSlot = mc.player.getInventory().selectedSlot; int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.getSlot(); mc.player.getInventory().selectedSlot = findItemResult.slot();
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND); mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
mc.player.getInventory().selectedSlot = prevSlot; mc.player.getInventory().selectedSlot = prevSlot;
} }
@@ -232,7 +232,7 @@ public class Lavacast extends Module {
return; return;
} }
int prevSlot = mc.player.getInventory().selectedSlot; int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.getSlot(); mc.player.getInventory().selectedSlot = findItemResult.slot();
mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND); mc.interactionManager.interactItem(mc.player,mc.world,Hand.MAIN_HAND);
mc.player.getInventory().selectedSlot = prevSlot; mc.player.getInventory().selectedSlot = prevSlot;
} }