diff --git a/README.md b/README.md index d2d975bc..395baabe 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,6 @@ - Coord Logger (World events from [JexClient](https://github.com/DustinRepo/JexClient-main/blob/main/src/main/java/me/dustin/jex/feature/mod/impl/misc/CoordFinder.java)) - Custom Packets - Extra Elytra (Ported from [Wurst](https://github.com/Wurst-Imperium/Wurst7/tree)) -- FullNoClip - FullFlight (Antikick bypasses by [CCblueX](https://github.com/CCblueX) and [LiveOverflow](https://github.com/LiveOverflow)) - Gamemode notifier - Ghost Mode (Taken from an [unmerged PR](https://github.com/MeteorDevelopment/meteor-client/pull/1932)) diff --git a/src/main/java/anticope/rejects/MeteorRejectsAddon.java b/src/main/java/anticope/rejects/MeteorRejectsAddon.java index fcfc2b12..41adcbef 100644 --- a/src/main/java/anticope/rejects/MeteorRejectsAddon.java +++ b/src/main/java/anticope/rejects/MeteorRejectsAddon.java @@ -57,7 +57,6 @@ public void onInitialize() { modules.add(new CoordLogger()); modules.add(new CustomPackets()); modules.add(new ExtraElytra()); - modules.add(new FullNoClip()); modules.add(new FullFlight()); modules.add(new GamemodeNotifier()); modules.add(new GhostMode()); diff --git a/src/main/java/anticope/rejects/mixin/EntityMixin.java b/src/main/java/anticope/rejects/mixin/EntityMixin.java deleted file mode 100644 index a7a5b5ae..00000000 --- a/src/main/java/anticope/rejects/mixin/EntityMixin.java +++ /dev/null @@ -1,20 +0,0 @@ -package anticope.rejects.mixin; - -import meteordevelopment.meteorclient.systems.modules.Modules; -import anticope.rejects.modules.FullFlight; -import anticope.rejects.modules.FullNoClip; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.Vec3d; -import net.minecraft.block.BlockState; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(Entity.class) -public abstract class EntityMixin { - @Inject(method = "slowMovement", at = @At("HEAD"), cancellable = true) - public void slowMovement(BlockState blockState, Vec3d multiplier, CallbackInfo ci) { - if (Modules.get().isActive(FullFlight.class) || Modules.get().isActive(FullNoClip.class)) ci.cancel(); - } -} \ No newline at end of file diff --git a/src/main/java/anticope/rejects/mixin/PlayerEntityMixin.java b/src/main/java/anticope/rejects/mixin/PlayerEntityMixin.java index d99cbc59..7d60641b 100644 --- a/src/main/java/anticope/rejects/mixin/PlayerEntityMixin.java +++ b/src/main/java/anticope/rejects/mixin/PlayerEntityMixin.java @@ -1,14 +1,11 @@ package anticope.rejects.mixin; import anticope.rejects.events.OffGroundSpeedEvent; -import anticope.rejects.modules.FullNoClip; -import meteordevelopment.meteorclient.systems.modules.Modules; import meteordevelopment.meteorclient.MeteorClient; import net.minecraft.entity.player.PlayerEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(PlayerEntity.class) @@ -17,8 +14,4 @@ public class PlayerEntityMixin { private void onGetOffGroundSpeed(CallbackInfoReturnable cir) { cir.setReturnValue(MeteorClient.EVENT_BUS.post(OffGroundSpeedEvent.get(cir.getReturnValueF())).speed); } - @Redirect(method = {"tick", "updatePose"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSpectator()Z")) - private boolean FullNoClip(PlayerEntity player) { - return player.isSpectator() || Modules.get().isActive(FullNoClip.class); - } } diff --git a/src/main/java/anticope/rejects/modules/FullNoClip.java b/src/main/java/anticope/rejects/modules/FullNoClip.java deleted file mode 100644 index 7dae6593..00000000 --- a/src/main/java/anticope/rejects/modules/FullNoClip.java +++ /dev/null @@ -1,39 +0,0 @@ -package anticope.rejects.modules; - -import anticope.rejects.MeteorRejectsAddon; -import anticope.rejects.utils.RejectsUtils; -import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent; -import meteordevelopment.meteorclient.settings.BoolSetting; -import meteordevelopment.meteorclient.settings.DoubleSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; -import meteordevelopment.meteorclient.systems.modules.Module; -import meteordevelopment.orbit.EventHandler; - -public class FullNoClip extends Module { - private final SettingGroup sgGeneral = settings.getDefaultGroup(); - private final Setting speed = sgGeneral.add(new DoubleSetting.Builder() - .name("speed") - .description("Your speed when noclipping.") - .defaultValue(0.3) - .min(0.0) - .sliderMax(10) - .build() - ); - - private final Setting verticalSpeedMatch = sgGeneral.add(new BoolSetting.Builder() - .name("vertical-speed-match") - .description("Matches your vertical speed to your horizontal speed, otherwise uses vanilla ratio.") - .defaultValue(false) - .build() - ); - - public FullNoClip() { - super(MeteorRejectsAddon.CATEGORY, "fullnoclip", "FullNoClip."); - } - - @EventHandler - private void onPlayerMove(PlayerMoveEvent event) { - RejectsUtils.fullFlightMove(event, speed.get(), verticalSpeedMatch.get()); - } -} \ No newline at end of file diff --git a/src/main/resources/meteor-rejects.mixins.json b/src/main/resources/meteor-rejects.mixins.json index b9b67750..9e7c58db 100644 --- a/src/main/resources/meteor-rejects.mixins.json +++ b/src/main/resources/meteor-rejects.mixins.json @@ -8,7 +8,6 @@ "CommandSuggestorMixin", "Deadmau5FeatureRendererMixin", "EntityAccessor", - "EntityMixin", "GameRendererMixin", "LivingEntityMixin", "LivingEntityRendererMixin",