diff --git a/src/main/java/dev/resent/module/base/Mod.java b/src/main/java/dev/resent/module/base/Mod.java index 0819019b..d7726f73 100644 --- a/src/main/java/dev/resent/module/base/Mod.java +++ b/src/main/java/dev/resent/module/base/Mod.java @@ -32,17 +32,6 @@ public abstract class Mod { } } - public Mod(String name, Category cat) { - this.name = name; - this.category = cat; - } - - public Mod(String name, Category cat, boolean hasSetting) { - this.name = name; - this.category = cat; - this.hasSetting = hasSetting; - } - public void addSetting(Setting... settings) { this.settings.addAll(Arrays.asList(settings)); } diff --git a/src/main/java/dev/resent/module/base/ModManager.java b/src/main/java/dev/resent/module/base/ModManager.java index d35431fc..54538f2a 100644 --- a/src/main/java/dev/resent/module/base/ModManager.java +++ b/src/main/java/dev/resent/module/base/ModManager.java @@ -34,16 +34,12 @@ import dev.resent.module.impl.misc.NoRain; import dev.resent.module.impl.misc.NoSwingDelay; import dev.resent.module.impl.misc.Scoreboard; import dev.resent.module.impl.misc.SelfNametag; -import dev.resent.module.impl.misc.Test; import dev.resent.module.impl.misc.Tooltips; import dev.resent.module.impl.movement.Sprint; -import net.minecraft.client.Minecraft; public class ModManager { public List modules = new ArrayList<>(); - public Minecraft mc = Minecraft.getMinecraft(); - public static Test test; public static Cosmetics cosmetics = new Cosmetics(); public static Sprint sprint; public static CPS cps; @@ -81,8 +77,7 @@ public class ModManager { public static CrystalOptimizer crystalOptimizer = new CrystalOptimizer(); public ModManager() { - //Hud - register(test = new Test()); + //HudZ register(cosmetics); register(hotbar); register(crystalOptimizer); diff --git a/src/main/java/dev/resent/module/base/RenderMod.java b/src/main/java/dev/resent/module/base/RenderMod.java index 3cffd7ad..bf3b7555 100644 --- a/src/main/java/dev/resent/module/base/RenderMod.java +++ b/src/main/java/dev/resent/module/base/RenderMod.java @@ -25,19 +25,6 @@ public abstract class RenderMod extends Mod { this.y = modInfo.y(); } } - - public RenderMod(String name, Category cat, int x, int y) { - super(name, cat); - this.x = x; - this.y = y; - } - - public RenderMod(String name, Category cat, int x, int y, boolean hasSetting) { - super(name, cat, hasSetting); - this.x = x; - this.y = y; - this.hasSetting = hasSetting; - } public void draw() {} diff --git a/src/main/java/dev/resent/module/impl/hud/Freelook.java b/src/main/java/dev/resent/module/impl/hud/Freelook.java index e4ee4a72..e5c21c28 100644 --- a/src/main/java/dev/resent/module/impl/hud/Freelook.java +++ b/src/main/java/dev/resent/module/impl/hud/Freelook.java @@ -17,10 +17,6 @@ public class Freelook extends Mod { public static boolean perspectiveToggled = false; public static boolean returnOnRelease = false; - public Freelook() { - super("FreeLook", Category.HUD); - } - public void smh() { if (W.freelook().isEnabled()) perspectiveToggled = !perspectiveToggled; diff --git a/src/main/java/dev/resent/module/impl/misc/DynamicFOV.java b/src/main/java/dev/resent/module/impl/misc/DynamicFOV.java index 904fe59d..08714952 100644 --- a/src/main/java/dev/resent/module/impl/misc/DynamicFOV.java +++ b/src/main/java/dev/resent/module/impl/misc/DynamicFOV.java @@ -5,9 +5,4 @@ import dev.resent.module.base.Category; import dev.resent.module.base.Mod; @Module(name = "NoDynamicFOV", category = Category.MISC) -public class DynamicFOV extends Mod { - - public DynamicFOV() { - super("NoDynamicFOV", Category.MISC); - } -} +public class DynamicFOV extends Mod { } diff --git a/src/main/java/dev/resent/module/impl/misc/NoRain.java b/src/main/java/dev/resent/module/impl/misc/NoRain.java index 45c4311a..34f4a1b7 100644 --- a/src/main/java/dev/resent/module/impl/misc/NoRain.java +++ b/src/main/java/dev/resent/module/impl/misc/NoRain.java @@ -5,9 +5,4 @@ import dev.resent.module.base.Category; import dev.resent.module.base.Mod; @Module(name = "NoRain", category = Category.MISC) -public class NoRain extends Mod { - - public NoRain() { - super("NoRain", Category.MISC); - } -} +public class NoRain extends Mod { } diff --git a/src/main/java/dev/resent/module/impl/misc/SelfNametag.java b/src/main/java/dev/resent/module/impl/misc/SelfNametag.java index 66da5bf2..47353b42 100644 --- a/src/main/java/dev/resent/module/impl/misc/SelfNametag.java +++ b/src/main/java/dev/resent/module/impl/misc/SelfNametag.java @@ -5,9 +5,4 @@ import dev.resent.module.base.Category; import dev.resent.module.base.Mod; @Module(name = "Self Nametag", category = Category.MISC) -public class SelfNametag extends Mod { - - public SelfNametag() { - super("Self Nametag", Category.MISC); - } -} +public class SelfNametag extends Mod { } diff --git a/src/main/java/dev/resent/module/impl/misc/Test.java b/src/main/java/dev/resent/module/impl/misc/Test.java deleted file mode 100644 index bca119f9..00000000 --- a/src/main/java/dev/resent/module/impl/misc/Test.java +++ /dev/null @@ -1,8 +0,0 @@ -package dev.resent.module.impl.misc; - -import dev.resent.annotation.Module; -import dev.resent.module.base.Category; -import dev.resent.module.base.Mod; - -@Module(name = "Test", category = Category.MISC, hasSetting = false) -public class Test extends Mod{ } diff --git a/src/main/java/dev/resent/module/impl/misc/Tooltips.java b/src/main/java/dev/resent/module/impl/misc/Tooltips.java index 83269b0c..9a8e9199 100644 --- a/src/main/java/dev/resent/module/impl/misc/Tooltips.java +++ b/src/main/java/dev/resent/module/impl/misc/Tooltips.java @@ -1,14 +1,12 @@ package dev.resent.module.impl.misc; +import dev.resent.annotation.Module; import dev.resent.module.base.Category; import dev.resent.module.base.Mod; +@Module(name = "Tooltips", category = Category.MISC) public class Tooltips extends Mod { - public Tooltips() { - super("Tooltips", Category.MISC); - } - @Override public void onEnable() { if (mc.theWorld != null) mc.gameSettings.advancedItemTooltips = true; diff --git a/src/main/java/dev/resent/module/impl/movement/Sprint.java b/src/main/java/dev/resent/module/impl/movement/Sprint.java index 8fd28d39..997551a5 100644 --- a/src/main/java/dev/resent/module/impl/movement/Sprint.java +++ b/src/main/java/dev/resent/module/impl/movement/Sprint.java @@ -1,16 +1,17 @@ package dev.resent.module.impl.movement; +import dev.resent.annotation.RenderModule; import dev.resent.module.Theme; import dev.resent.module.base.Category; import dev.resent.module.base.RenderMod; import dev.resent.module.setting.BooleanSetting; +@RenderModule(name = "ToggleSprint", category = Category.MOVEMENT, x = 4, y = 122, hasSetting = true) public class Sprint extends RenderMod { public BooleanSetting drawn = new BooleanSetting("Text Drawn", "", true); public Sprint() { - super("ToggleSprint", Category.MOVEMENT, 4, 94, true); addSetting(drawn); }