From 166d0886be424cbd0659d43cdc32a85954a9d3d1 Mon Sep 17 00:00:00 2001 From: Cloudburst Date: Tue, 13 Jul 2021 20:02:54 +0200 Subject: [PATCH] added to meteor in MeteorDevelopment/meteor-client#1214 --- README.md | 2 - .../rejects/MeteorRejectsAddon.java | 2 - .../cloudburst/rejects/modules/Glide.java | 109 ------------------ .../cloudburst/rejects/modules/Gravity.java | 38 ------ 4 files changed, 151 deletions(-) delete mode 100644 src/main/java/cloudburst/rejects/modules/Glide.java delete mode 100644 src/main/java/cloudburst/rejects/modules/Gravity.java diff --git a/README.md b/README.md index 4f265f4..e7ab9d2 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,7 @@ Also includes unmerged PRs. - ColorSigns - Confuse - Coord Logger (World events from [JexClient](https://github.com/DustinRepo/JexClient-main/blob/main/src/main/java/me/dustin/jex/feature/impl/misc/CoordFinder.java)) -- Gravity (Ported from [Cornos](https://github.com/cornos/Cornos/blob/master/src/main/java/me/zeroX150/cornos/features/module/impl/movement/MoonGravity.java)) - InteractionMenu (Ported from [BleachHack](https://github.com/BleachDrinker420/BleachHack/pull/211)) -- Glide - Lavacast - NewChunks (Ported from [BleackHack](https://github.com/BleachDrinker420/BleachHack/blob/master/BleachHack-Fabric-1.17/src/main/java/bleach/hack/module/mods/NewChunks.java)) - ObsidianFarm (Taken from [Meteor ObsidianFarm Addon](https://github.com/VoidCyborg/meteor-obsidian-farm)) diff --git a/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java b/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java index 92fcd17..3d5aebe 100644 --- a/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java +++ b/src/main/java/cloudburst/rejects/MeteorRejectsAddon.java @@ -53,9 +53,7 @@ public class MeteorRejectsAddon extends MeteorAddon { modules.add(new ColorSigns()); modules.add(new Confuse()); modules.add(new CoordLogger()); - modules.add(new Gravity()); modules.add(new InteractionMenu()); - modules.add(new Glide()); modules.add(new Lavacast()); modules.add(new NewChunks()); modules.add(new ObsidianFarm()); diff --git a/src/main/java/cloudburst/rejects/modules/Glide.java b/src/main/java/cloudburst/rejects/modules/Glide.java deleted file mode 100644 index dd36078..0000000 --- a/src/main/java/cloudburst/rejects/modules/Glide.java +++ /dev/null @@ -1,109 +0,0 @@ -package cloudburst.rejects.modules; - -import java.util.ArrayList; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; - -import cloudburst.rejects.MeteorRejectsAddon; -import net.minecraft.block.BlockState; -import net.minecraft.block.Material; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.Vec3d; - -import meteordevelopment.orbit.EventHandler; -import meteordevelopment.meteorclient.events.world.TickEvent; -import meteordevelopment.meteorclient.settings.DoubleSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; -import meteordevelopment.meteorclient.systems.modules.Module; - -public class Glide extends Module { - - private final SettingGroup sgGeneral = settings.getDefaultGroup(); - - private final Setting fallSpeed = sgGeneral.add(new DoubleSetting.Builder() - .name("fall-speed") - .description("Fall Speed") - .defaultValue(0.125) - .min(0.005) - .sliderMax(0.25) - .build() - ); - - private final Setting moveSpeed = sgGeneral.add(new DoubleSetting.Builder() - .name("move-speed") - .description("Horizontal movement factor.") - .defaultValue(1.2) - .min(0.75) - .sliderMax(5) - .build() - ); - - private final Setting minHeight = sgGeneral.add(new DoubleSetting.Builder() - .name("min-height") - .description("Won't glide when you are too close to the ground.") - .defaultValue(0) - .min(0) - .sliderMax(2) - .build() - ); - - public Glide() { - super(MeteorRejectsAddon.CATEGORY, "glide", "Makes you glide down slowly when falling."); - } - - @EventHandler - private void onTick(TickEvent.Pre event) { - Vec3d v = mc.player.getVelocity(); - - if(mc.player.isOnGround() || mc.player.isTouchingWater() || mc.player.isInLava() - || mc.player.isClimbing() || v.y >= 0) - return; - - if(minHeight.get() > 0) - { - Box box = mc.player.getBoundingBox(); - box = box.union(box.offset(0, -minHeight.get(), 0)); - if(!mc.world.isSpaceEmpty(box)) - return; - - BlockPos min = - new BlockPos(new Vec3d(box.minX, box.minY, box.minZ)); - BlockPos max = - new BlockPos(new Vec3d(box.maxX, box.maxY, box.maxZ)); - Stream stream = StreamSupport - .stream(getAllInBox(min, max).spliterator(), true); - - // manual collision check, since liquids don't have bounding boxes - if(stream.map(this::getState).map(BlockState::getMaterial) - .anyMatch(Material::isLiquid)) - return; - } - - mc.player.setVelocity(v.x, Math.max(v.y, -fallSpeed.get()), v.z); - mc.player.flyingSpeed *= moveSpeed.get(); - } - - public static ArrayList getAllInBox(BlockPos from, BlockPos to) - { - ArrayList blocks = new ArrayList<>(); - - BlockPos min = new BlockPos(Math.min(from.getX(), to.getX()), - Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ())); - BlockPos max = new BlockPos(Math.max(from.getX(), to.getX()), - Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ())); - - for(int x = min.getX(); x <= max.getX(); x++) - for(int y = min.getY(); y <= max.getY(); y++) - for(int z = min.getZ(); z <= max.getZ(); z++) - blocks.add(new BlockPos(x, y, z)); - - return blocks; - } - - public BlockState getState(BlockPos pos) - { - return mc.world.getBlockState(pos); - } -} diff --git a/src/main/java/cloudburst/rejects/modules/Gravity.java b/src/main/java/cloudburst/rejects/modules/Gravity.java deleted file mode 100644 index c231e46..0000000 --- a/src/main/java/cloudburst/rejects/modules/Gravity.java +++ /dev/null @@ -1,38 +0,0 @@ -package cloudburst.rejects.modules; - -import meteordevelopment.orbit.EventHandler; -import meteordevelopment.meteorclient.events.world.TickEvent; -import meteordevelopment.meteorclient.mixininterface.IVec3d; -import meteordevelopment.meteorclient.settings.BoolSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; -import meteordevelopment.meteorclient.systems.modules.Module; -import net.minecraft.util.math.Vec3d; - -import cloudburst.rejects.MeteorRejectsAddon; - -public class Gravity extends Module { - - public Gravity() { - super(MeteorRejectsAddon.CATEGORY, "gravity", "Modifies gravity."); - } - - private final SettingGroup sgGeneral = settings.getDefaultGroup(); - - private final Setting moon = sgGeneral.add(new BoolSetting.Builder() - .name("moon") - .description("Tired of being on earth?") - .defaultValue(true) - .build() - ); - - @EventHandler - private void onTick(TickEvent.Post event) { - if (mc.options.keySneak.isPressed()) return; - - if (moon.get()) { - Vec3d velocity = mc.player.getVelocity(); - ((IVec3d) velocity).set(velocity.x, velocity.y + 0.0568000030517578, velocity.z); - } - } -}