diff --git a/README.md b/README.md index 65f9983d5..13fff913d 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ This will return the lowest block placed with AutoMountain until AutoLavacast is - **TrailMaker:** Leaves blocks behind you in a trail. Has a place delay option to spread placement further apart. Select the blocks you want to use in the block list setting for it to work. (Credits to etianl :D) - **TrouserBuild:** It can build either horizontally or vertically according to a 5x5 grid centered on the block you are aiming at. Right click to build at the targeted location. (Credits to etianl, and to Banana for the checkboxes and idea. :D) - **Voider+:** Replaces the world from the top down. (Credits to Allah-Hack) I added a 3x3 voiding script, a TP foward option for deleting strips, as well as options to set max and minimum height for voiding, and instead of just air it can do water and lava now too. -- **WorldBorderCoordsCommand** Type .wb in chat to tell you the precise coordinates of each of the world borders. (Credits to etianl :D) +- **WorldInfoCommand** Type .world in chat to tell you the precise coordinates of each of the world borders, as well as some other world info. (Credits to etianl :D) ## Known Bugs: - **AutoLavaCaster Bugs** @@ -125,8 +125,6 @@ This will return the lowest block placed with AutoMountain until AutoLavacast is ## Requirements: - If you are using Minecraft version **1.20.1**, then use the latest **MeteorClient Dev Build of v0.5.4** - If you are using Minecraft version **1.19.4**, then use **MeteorClient "Full Release" v0.5.3** -- If you are using Minecraft version **1.19.3**, then use **MeteorClient "Full Release" v0.5.2** (v0.5.2 NOT SUPPORTED BY METEOR OR AVAILABLE FOR DOWNLOAD) -- If you are using Minecraft version **1.19.2**, then use **MeteorClient "Full Release" v0.5.1** (v0.5.1 NOT SUPPORTED BY METEOR OR AVAILABLE FOR DOWNLOAD) - Please try [ViaFabricPlus](https://github.com/FlorianMichael/ViaFabricPlus), which will let you connect to almost any version from a new version client. - Don't forget to try updating any other mods you are using if your game is crashing. diff --git a/gradle.properties b/gradle.properties index ae68685e5..3dc54d945 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.20.1+build.10 loader_version=0.14.21 # Mod Properties -mod_version=0.6.5-1.20.1 +mod_version=0.6.6-1.20.1 maven_group=pwn.noobs archives_base_name=1trouser-streak diff --git a/src/main/java/pwn/noobs/trouserstreak/Trouser.java b/src/main/java/pwn/noobs/trouserstreak/Trouser.java index d5ab1fb03..5a1a2f617 100644 --- a/src/main/java/pwn/noobs/trouserstreak/Trouser.java +++ b/src/main/java/pwn/noobs/trouserstreak/Trouser.java @@ -47,7 +47,7 @@ public void onInitialize() { Commands.add(new CasterTimer()); Commands.add(new NewChunkCounter()); Commands.add(new BaseFinderCommands()); - Commands.add(new WorldBorderCoordsCommand()); + Commands.add(new WorldInfoCommand()); } @Override diff --git a/src/main/java/pwn/noobs/trouserstreak/commands/WorldInfoCommand.java b/src/main/java/pwn/noobs/trouserstreak/commands/WorldInfoCommand.java new file mode 100644 index 000000000..0ce1e6552 --- /dev/null +++ b/src/main/java/pwn/noobs/trouserstreak/commands/WorldInfoCommand.java @@ -0,0 +1,31 @@ +package pwn.noobs.trouserstreak.commands; + +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import meteordevelopment.meteorclient.commands.Command; +import meteordevelopment.meteorclient.utils.player.ChatUtils; +import net.minecraft.command.CommandSource; +import net.minecraft.network.packet.c2s.play.JigsawGeneratingC2SPacket; +import net.minecraft.network.packet.s2c.play.AdvancementUpdateS2CPacket; +import net.minecraft.text.Text; +import net.minecraft.world.GameRules; + +import static meteordevelopment.meteorclient.MeteorClient.mc; + +import static com.mojang.brigadier.Command.SINGLE_SUCCESS; + +public class WorldInfoCommand extends Command { + public WorldInfoCommand() { + super("world", "Tells you the coordinates of each world border, and the spawn location."); + } + + @Override + public void build(LiteralArgumentBuilder builder) { + builder.executes(context -> { + ChatUtils.sendMsg(Text.of("East World Border X: "+(int) mc.world.getWorldBorder().getBoundEast()+", West World Border X: "+(int) mc.world.getWorldBorder().getBoundWest()+", South World Border Z: "+(int) mc.world.getWorldBorder().getBoundSouth()+", North World Border Z: "+(int) mc.world.getWorldBorder().getBoundNorth())); + ChatUtils.sendMsg(Text.of("Default WorldSpawn Location (May be different if changed): "+mc.world.getSpawnPos())); + ChatUtils.sendMsg(Text.of("Difficulty: "+mc.world.getDifficulty().toString())); + ChatUtils.sendMsg(Text.of("DO_DAYLIGHT_CYCLE: "+mc.world.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE))); + return SINGLE_SUCCESS; + }); + } +} diff --git a/src/main/java/pwn/noobs/trouserstreak/modules/AutoMountain.java b/src/main/java/pwn/noobs/trouserstreak/modules/AutoMountain.java index a6ea8f82b..418e0da8a 100644 --- a/src/main/java/pwn/noobs/trouserstreak/modules/AutoMountain.java +++ b/src/main/java/pwn/noobs/trouserstreak/modules/AutoMountain.java @@ -246,6 +246,7 @@ public AutoMountain() { private int delayLeft = delay.get(); private int offLeft = offTime.get(); private BlockPos playerPos; + private BlockPos renderplayerPos; private int cookie=0; private int speed=0; private boolean go=true; @@ -280,12 +281,12 @@ public void onActivate() { groundY2=0; lowblockY=-1; highblockY=-1; - mc.player.setPos(mc.player.getX(),Math.round(mc.player.getY()),mc.player.getZ()); if (startPaused.get() == true){ pause = false; if (autolavamountain.get()) ChatUtils.sendMsg(Text.of("Press UseKey (RightClick) to Build a Mountain! Please wait while the bot works.")); else ChatUtils.sendMsg(Text.of("Press UseKey (RightClick) to Build Stairs!")); } else if (startPaused.get() == false){ + mc.player.setPos(mc.player.getX(),Math.ceil(mc.player.getY()),mc.player.getZ()); wasfacing=mc.player.getHorizontalFacing(); prevPitch=Math.round(mc.player.getPitch()); if (swap.get()){ @@ -302,6 +303,7 @@ public void onActivate() { } resetTimer = false; playerPos = mc.player.getBlockPos(); + renderplayerPos = mc.player.getBlockPos(); if (startPaused.get() || !(mc.player.getInventory().getMainHandStack().getItem() instanceof BlockItem) || mc.player.getInventory().getMainHandStack().getItem() instanceof BedItem || mc.player.getInventory().getMainHandStack().getItem() instanceof PowderSnowBucketItem || mc.player.getInventory().getMainHandStack().getItem() instanceof ScaffoldingItem || mc.player.getInventory().getMainHandStack().getItem() instanceof TallBlockItem || mc.player.getInventory().getMainHandStack().getItem() instanceof VerticallyAttachableBlockItem || mc.player.getInventory().getMainHandStack().getItem() instanceof PlaceableOnWaterItem || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof PlantBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TorchBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AbstractRedstoneGateBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof RedstoneWireBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FenceBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof WallBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FenceGateBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FallingBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AbstractRailBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AbstractSignBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof BellBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CarpetBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ConduitBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CoralParentBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TripwireHookBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof PointedDripstoneBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TripwireBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof SnowBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof PressurePlateBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof WallMountedBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ShulkerBoxBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AmethystClusterBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof BuddingAmethystBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ChorusFlowerBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ChorusPlantBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof LanternBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CandleBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TntBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CakeBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CobwebBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof SugarCaneBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof SporeBlossomBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof KelpBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof GlowLichenBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CactusBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof BambooBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FlowerPotBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof LadderBlock) return; BlockPos pos = playerPos.add(new Vec3i(0,-1,0)); if (mc.world.getBlockState(pos).isReplaceable()) { @@ -344,37 +346,37 @@ private void onRender(Render3DEvent event) { if (mc.options.jumpKey.isPressed() && !autolavamountain.get()){ if ((mouseT.get() && mc.player.getPitch() <= 40) || (!mouseT.get() && prevPitch <= 40)){ //UP if ((mouseT.get() && mc.player.getMovementDirection()==Direction.NORTH) || (!mouseT.get() && wasfacing==Direction.NORTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, +spcoffset.get(), -1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, +spcoffset.get(), -1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.SOUTH) || (!mouseT.get() && wasfacing==Direction.SOUTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, +spcoffset.get(), 1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, +spcoffset.get(), 1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.EAST) || (!mouseT.get() && wasfacing==Direction.EAST)) { - BlockPos pos1 = playerPos.add(new Vec3i(1, +spcoffset.get(), 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(1, +spcoffset.get(), 0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.WEST) || (!mouseT.get() && wasfacing==Direction.WEST)) { - BlockPos pos1 = playerPos.add(new Vec3i(-1, +spcoffset.get(), 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(-1, +spcoffset.get(), 0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } } else if ((mouseT.get() && mc.player.getPitch() > 40) || (!mouseT.get() && prevPitch > 40)){ //DOWN if ((mouseT.get() && mc.player.getMovementDirection()==Direction.NORTH) || (!mouseT.get() && wasfacing==Direction.NORTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, -spcoffset.get()-2, -1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, -spcoffset.get()-2, -1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.SOUTH) || (!mouseT.get() && wasfacing==Direction.SOUTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, -spcoffset.get()-2, 1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, -spcoffset.get()-2, 1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.EAST) || (!mouseT.get() && wasfacing==Direction.EAST)) { - BlockPos pos1 = playerPos.add(new Vec3i(1, -spcoffset.get()-2, 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(1, -spcoffset.get()-2, 0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.WEST) || (!mouseT.get() && wasfacing==Direction.WEST)) { - BlockPos pos1 = playerPos.add(new Vec3i(-1, -spcoffset.get()-2, 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(-1, -spcoffset.get()-2, 0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } } @@ -382,60 +384,60 @@ else if ((mouseT.get() && mc.player.getPitch() > 40) || (!mouseT.get() && prevPi else if (!mc.options.jumpKey.isPressed() || autolavamountain.get()) { if (((mouseT.get() && mc.player.getPitch() <= 40) || autolavamountain.get()) || (!mouseT.get() && prevPitch <= 40 && !autolavamountain.get())) { //UP if ((mouseT.get() && mc.player.getMovementDirection()==Direction.NORTH) || (!mouseT.get() && wasfacing==Direction.NORTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, 0, -1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, 0, -1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); if (autolavamountain.get() && pause==false){ - BlockPos pos2 = playerPos.add(new Vec3i(0, botlimit.get()-1, -botlimit.get())); - BlockPos pos3 = playerPos.add(new Vec3i(0, 1, -2)); + BlockPos pos2 = renderplayerPos.add(new Vec3i(0, botlimit.get()-1, -botlimit.get())); + BlockPos pos3 = renderplayerPos.add(new Vec3i(0, 1, -2)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } else if (autolavamountain.get() && pause==true){ BlockPos pos2 = lowestblock.add(new Vec3i(0, botlimit.get(), -botlimit.get())); - BlockPos pos3 = playerPos.add(new Vec3i(0, 1, -2)); + BlockPos pos3 = renderplayerPos.add(new Vec3i(0, 1, -2)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.SOUTH) || (!mouseT.get() && wasfacing==Direction.SOUTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, 0, 1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, 0, 1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); if (autolavamountain.get() && pause==false){ - BlockPos pos2 = playerPos.add(new Vec3i(0, botlimit.get()-1, botlimit.get())); - BlockPos pos3 = playerPos.add(new Vec3i(0, 1, 2)); + BlockPos pos2 = renderplayerPos.add(new Vec3i(0, botlimit.get()-1, botlimit.get())); + BlockPos pos3 = renderplayerPos.add(new Vec3i(0, 1, 2)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } else if (autolavamountain.get() && pause==true){ BlockPos pos2 = lowestblock.add(new Vec3i(0, botlimit.get(), botlimit.get())); - BlockPos pos3 = playerPos.add(new Vec3i(0, 1, 2)); + BlockPos pos3 = renderplayerPos.add(new Vec3i(0, 1, 2)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.EAST) || (!mouseT.get() && wasfacing==Direction.EAST)) { - BlockPos pos1 = playerPos.add(new Vec3i(1, 0, 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(1, 0, 0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); if (autolavamountain.get() && pause==false){ - BlockPos pos3 = playerPos.add(new Vec3i(2, 1, 0)); - BlockPos pos2 = playerPos.add(new Vec3i(botlimit.get(), botlimit.get()-1, 0)); + BlockPos pos3 = renderplayerPos.add(new Vec3i(2, 1, 0)); + BlockPos pos2 = renderplayerPos.add(new Vec3i(botlimit.get(), botlimit.get()-1, 0)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } else if (autolavamountain.get() && pause==true){ - BlockPos pos3 = playerPos.add(new Vec3i(2, 1, 0)); + BlockPos pos3 = renderplayerPos.add(new Vec3i(2, 1, 0)); BlockPos pos2 = lowestblock.add(new Vec3i(botlimit.get(), botlimit.get(), 0)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.WEST) || (!mouseT.get() && wasfacing==Direction.WEST)) { - BlockPos pos1 = playerPos.add(new Vec3i(-1, 0, 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(-1, 0, -0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); if (autolavamountain.get() && pause==false){ - BlockPos pos3 = playerPos.add(new Vec3i(-2, 1, 0)); - BlockPos pos2 = playerPos.add(new Vec3i(-botlimit.get(), botlimit.get()-1, 0)); + BlockPos pos3 = renderplayerPos.add(new Vec3i(-2, 1, 0)); + BlockPos pos2 = renderplayerPos.add(new Vec3i(-botlimit.get(), botlimit.get()-1, 0)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } else if (autolavamountain.get() && pause==true){ - BlockPos pos3 = playerPos.add(new Vec3i(-2, 1, 0)); + BlockPos pos3 = renderplayerPos.add(new Vec3i(-2, 1, 0)); BlockPos pos2 = lowestblock.add(new Vec3i(-botlimit.get(), botlimit.get(), 0)); event.renderer.box(pos2, sideColor.get(), lineColor.get(), shapeMode.get(), 0); event.renderer.box(pos3, sideColor.get(), lineColor.get(), shapeMode.get(), 0); @@ -443,19 +445,19 @@ else if (!mc.options.jumpKey.isPressed() || autolavamountain.get()) { } } else if ((mouseT.get() && mc.player.getPitch() > 40) || (!mouseT.get() && prevPitch > 40)) { //DOWN if ((mouseT.get() && mc.player.getMovementDirection()==Direction.NORTH) || (!mouseT.get() && wasfacing==Direction.NORTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, -2, -1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, -2, -1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.SOUTH) || (!mouseT.get() && wasfacing==Direction.SOUTH)) { - BlockPos pos1 = playerPos.add(new Vec3i(0, -2, 1)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(0, -2, 1)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.EAST) || (!mouseT.get() && wasfacing==Direction.EAST)) { - BlockPos pos1 = playerPos.add(new Vec3i(1, -2, 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(1, -2, 0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } if ((mouseT.get() && mc.player.getMovementDirection()==Direction.WEST) || (!mouseT.get() && wasfacing==Direction.WEST)) { - BlockPos pos1 = playerPos.add(new Vec3i(-1, -2, 0)); + BlockPos pos1 = renderplayerPos.add(new Vec3i(-1, -2, 0)); event.renderer.box(pos1, sideColor.get(), lineColor.get(), shapeMode.get(), 0); } } @@ -466,6 +468,13 @@ else if (!mc.options.jumpKey.isPressed() || autolavamountain.get()) { @EventHandler private void onMouseButton(MouseButtonEvent event) { if (mc.options.useKey.isPressed()){ + if (pause==true){ + BlockPos pos = playerPos.add(new Vec3i(0,-1,0)); + if (mc.world.getBlockState(pos).isReplaceable()) { + mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(Vec3d.of(pos), Direction.DOWN, pos, false)); + mc.player.swingHand(Hand.MAIN_HAND);} + } + if (pause==false)mc.player.setPos(mc.player.getX(),Math.ceil(mc.player.getY()),mc.player.getZ()); pause = pause ? false : true; mc.player.setVelocity(0,0,0); cookie=0; @@ -473,10 +482,6 @@ private void onMouseButton(MouseButtonEvent event) { Modules.get().get(Timer.class).setOverride(Timer.OFF); resetTimer = true; if (!(mc.player.getInventory().getMainHandStack().getItem() instanceof BlockItem) || mc.player.getInventory().getMainHandStack().getItem() instanceof BedItem || mc.player.getInventory().getMainHandStack().getItem() instanceof PowderSnowBucketItem || mc.player.getInventory().getMainHandStack().getItem() instanceof ScaffoldingItem || mc.player.getInventory().getMainHandStack().getItem() instanceof TallBlockItem || mc.player.getInventory().getMainHandStack().getItem() instanceof VerticallyAttachableBlockItem || mc.player.getInventory().getMainHandStack().getItem() instanceof PlaceableOnWaterItem || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof PlantBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TorchBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AbstractRedstoneGateBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof RedstoneWireBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FenceBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof WallBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FenceGateBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FallingBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AbstractRailBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AbstractSignBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof BellBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CarpetBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ConduitBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CoralParentBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TripwireHookBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof PointedDripstoneBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TripwireBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof SnowBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof PressurePlateBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof WallMountedBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ShulkerBoxBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof AmethystClusterBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof BuddingAmethystBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ChorusFlowerBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof ChorusPlantBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof LanternBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CandleBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof TntBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CakeBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CobwebBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof SugarCaneBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof SporeBlossomBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof KelpBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof GlowLichenBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof CactusBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof BambooBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof FlowerPotBlock || ((BlockItem) mc.player.getInventory().getMainHandStack().getItem()).getBlock() instanceof LadderBlock) return; - BlockPos pos = playerPos.add(new Vec3i(0,-1,0)); - if (mc.world.getBlockState(pos).isReplaceable()) { - mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(Vec3d.of(pos), Direction.DOWN, pos, false)); - mc.player.swingHand(Hand.MAIN_HAND);} if (isthisfirstblock==true){ highestblock=mc.player.getBlockPos().add(new Vec3i(0,-1,0)); lowestblock=mc.player.getBlockPos().add(new Vec3i(0,-1,0)); @@ -557,6 +562,9 @@ private void onSendPacket(PacketEvent.Send event) { @EventHandler private void onPreTick(TickEvent.Pre event) { playerPos = mc.player.getBlockPos(); + if (mc.player.getY() % 1 != 0 && pause != true){ + renderplayerPos = new BlockPos(mc.player.getBlockX(), mc.player.getBlockY()+1, mc.player.getBlockZ()); + } else renderplayerPos = mc.player.getBlockPos(); timeSinceLastTick = TickRate.INSTANCE.getTimeSinceLastTick(); if (speedoffTime.get()){ } mc.player.setVelocity(0,0,0); PlayerUtils.centerPlayer(); - mc.player.setPos(mc.player.getX(),Math.floor(mc.player.getY())+0.25,mc.player.getZ()); + mc.player.setPos(mc.player.getX(),Math.round(mc.player.getY())+0.25,mc.player.getZ()); if (Modules.get().get(Flight.class).isActive()) { Modules.get().get(Flight.class).toggle(); } diff --git a/src/main/java/pwn/noobs/trouserstreak/modules/NewerNewChunks.java b/src/main/java/pwn/noobs/trouserstreak/modules/NewerNewChunks.java index 254bb1ca9..9fbc31eeb 100644 --- a/src/main/java/pwn/noobs/trouserstreak/modules/NewerNewChunks.java +++ b/src/main/java/pwn/noobs/trouserstreak/modules/NewerNewChunks.java @@ -308,6 +308,14 @@ private void onGameLeft(GameLeftEvent event) { @EventHandler private void onPreTick(TickEvent.Pre event) { + if (mc.player.getHealth()==0) { + chunkcounterticks=0; + newchunksfound=0; + oldchunksfound=0; + olderoldchunksfound=0; + tickexploitchunksfound=0; + reloadworld=0; + } if (deletewarningTicks<=100) deletewarningTicks++; else deletewarning=0; if (deletewarning>=2){ @@ -436,7 +444,7 @@ private void onPreTick(TickEvent.Pre event) { if (reloadworld<10){ reloadworld++; } - if (reloadworld==3){ + if (reloadworld==5){ if (worldleaveremove.get()){ newChunks.clear(); oldChunks.clear(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9371e7818..5c55f99e0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "streak-addon", - "version": "0.6.5", + "version": "0.6.6", "name": "TrouserStreak", "description": "Trouser-Streak is a compilation of modules, updated to the latest version and optimized for maximum grief. I did not make all of these.", "authors": [