remove "jump" mode from criticals

reported in #21
Team-Pepsi · Aug 5, 2021 · 1a464ee · 1a464ee
1 parent 43ad203
commit 1a464ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 87 deletions.
diff --git a/src/main/java/net/daporkchop/pepsimod/module/impl/combat/CriticalsMod.java b/src/main/java/net/daporkchop/pepsimod/module/impl/combat/CriticalsMod.java
@@ -1,7 +1,7 @@
 /*
  * Adapted from The MIT License (MIT)
  *
- * Copyright (c) 2016-2020 DaPorkchop_
+ * Copyright (c) 2016-2021 DaPorkchop_
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
@@ -23,8 +23,6 @@
 import net.daporkchop.pepsimod.module.ModuleCategory;
 import net.daporkchop.pepsimod.module.api.Module;
 import net.daporkchop.pepsimod.module.api.ModuleOption;
-import net.daporkchop.pepsimod.module.api.OptionCompletions;
-import net.daporkchop.pepsimod.util.config.impl.CriticalsTranslator;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.NetworkManager;
@@ -61,14 +59,7 @@ public void init() {
 
     @Override
     public ModuleOption[] getDefaultOptions() {
-        return new ModuleOption[]{new ModuleOption<>(true, "packet", OptionCompletions.BOOLEAN,
-                (value) -> {
-                    CriticalsTranslator.INSTANCE.packet = value;
-                    return true;
-                },
-                () -> {
-                    return CriticalsTranslator.INSTANCE.packet;
-                }, "Packet")};
+        return new ModuleOption[0];
     }
 
     @Override
@@ -92,34 +83,14 @@ public void doCrit() {
             return;
         }
 
-        if ((boolean) this.getOptionByName("packet").getValue()) {
-            double x = player.posX;
-            double y = player.posY;
-            double z = player.posZ;
-            NetworkManager manager = Minecraft.getMinecraft().getConnection().getNetworkManager();
-            manager.sendPacket(new CPacketPlayer.Position(x, y + 0.0625D, z, true));
-            manager.sendPacket(new CPacketPlayer.Position(x, y, z, false));
-            manager.sendPacket(new CPacketPlayer.Position(x, y + 1.1E-5D, z, false));
-            manager.sendPacket(new CPacketPlayer.Position(x, y, z, false));
-        } else {
-            player.motionY = 0.1F;
-            player.fallDistance = 0.1F;
-            player.onGround = false;
-        }
-    }
-
-    @Override
-    public boolean hasModeInName() {
-        return true;
-    }
-
-    @Override
-    public String getModeForName() {
-        if ((boolean) this.getOptionByName("packet").getValue()) {
-            return "Packet";
-        } else {
-            return "Jump";
-        }
+        double x = player.posX;
+        double y = player.posY;
+        double z = player.posZ;
+        NetworkManager manager = Minecraft.getMinecraft().getConnection().getNetworkManager();
+        manager.sendPacket(new CPacketPlayer.Position(x, y + 0.0625D, z, true));
+        manager.sendPacket(new CPacketPlayer.Position(x, y, z, false));
+        manager.sendPacket(new CPacketPlayer.Position(x, y + 1.1E-5D, z, false));
+        manager.sendPacket(new CPacketPlayer.Position(x, y, z, false));
     }
 
     public ModuleCategory getCategory() {

diff --git a/src/main/java/net/daporkchop/pepsimod/util/config/Config.java b/src/main/java/net/daporkchop/pepsimod/util/config/Config.java
@@ -1,7 +1,7 @@
 /*
  * Adapted from The MIT License (MIT)
  *
- * Copyright (c) 2016-2020 DaPorkchop_
+ * Copyright (c) 2016-2021 DaPorkchop_
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
@@ -30,7 +30,6 @@
 import net.daporkchop.pepsimod.util.config.impl.BedBomberTranslator;
 import net.daporkchop.pepsimod.util.config.impl.ClickGUITranslator;
 import net.daporkchop.pepsimod.util.config.impl.CpuLimitTranslator;
-import net.daporkchop.pepsimod.util.config.impl.CriticalsTranslator;
 import net.daporkchop.pepsimod.util.config.impl.CrystalAuraTranslator;
 import net.daporkchop.pepsimod.util.config.impl.ESPTranslator;
 import net.daporkchop.pepsimod.util.config.impl.ElytraFlyTranslator;
@@ -64,7 +63,6 @@ public class Config {
         registerConfigTranslator(BedBomberTranslator.INSTANCE);
         registerConfigTranslator(ClickGUITranslator.INSTANCE);
         registerConfigTranslator(CpuLimitTranslator.INSTANCE);
-        registerConfigTranslator(CriticalsTranslator.INSTANCE);
         registerConfigTranslator(CrystalAuraTranslator.INSTANCE);
         registerConfigTranslator(ElytraFlyTranslator.INSTANCE);
         registerConfigTranslator(EntitySpeedTranslator.INSTANCE);
@@ -89,6 +87,7 @@ public static void registerConfigTranslator(IConfigTranslator element) {
         TRANSLATORS.put(element.name(), element);
     }
 
+    @SuppressWarnings("deprecation")
     public static void loadConfig(String configJson) {
         System.out.println("Loading config!");
         System.out.println(configJson);

diff --git a/src/main/java/net/daporkchop/pepsimod/util/config/impl/CriticalsTranslator.java b/src/main/java/net/daporkchop/pepsimod/util/config/impl/CriticalsTranslator.java