fixes

closes #8, closes #7, closes #5

Author: C10udburst

build.gradle

@@ -27,7 +27,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Meteor
-    modImplementation "meteordevelopment:meteor-client:${project.meteor_version}"
+    modImplementation "meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT"
 }
 
 processResources {

gradle.properties

@@ -13,4 +13,4 @@ archives_base_name=reaper
 # Dependency Versions
 
 # Meteor (https://maven.meteordev.org/)
-meteor_version=SNAPSHOT
+meteor_version=0.5.0

src/main/java/me/ghosttypes/reaper/Reaper.java

@@ -2,12 +2,11 @@
 
 import me.ghosttypes.reaper.modules.ML;
 import me.ghosttypes.reaper.util.misc.Formatter;
-import me.ghosttypes.reaper.util.player.Interactions;
 import me.ghosttypes.reaper.util.services.SL;
-import me.ghosttypes.reaper.util.services.TL;
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
 import meteordevelopment.meteorclient.systems.config.Config;
+import meteordevelopment.meteorclient.systems.hud.HudGroup;
 
 import java.io.File;
 import java.lang.invoke.MethodHandles;
@@ -19,6 +18,7 @@ public class Reaper extends MeteorAddon {
     public static final File RECORDINGS = new File(FOLDER, "recordings");
     public static final File ASSETS = new File(FOLDER, "assets");
     public static final File USER_ASSETS = new File(ASSETS, "user");
+    public static final HudGroup HUD_GROUP = new HudGroup("Reaper");
 
 	@Override
 	public void onInitialize() {
@@ -44,5 +44,7 @@ public static void log(String m) {
         System.out.println("[Reaper] " + m);
     }
 
-
+    public String getPackage() {
+        return "me.ghosttypes.reaper";
+    }
 }

src/main/java/me/ghosttypes/reaper/modules/ML.java

@@ -8,18 +8,12 @@
 import me.ghosttypes.reaper.modules.misc.elytrabot.ElytraBotThreaded;
 import me.ghosttypes.reaper.modules.render.*;
 import me.ghosttypes.reaper.util.misc.MathUtil;
-import meteordevelopment.meteorclient.systems.Systems;
-import meteordevelopment.meteorclient.systems.hud.HUD;
-import meteordevelopment.meteorclient.systems.hud.modules.HudElement;
+import meteordevelopment.meteorclient.systems.hud.Hud;
 import meteordevelopment.meteorclient.systems.modules.Category;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import net.minecraft.item.Items;
 
-import java.io.*;
-import java.net.URL;
-import java.util.Arrays;
-
 public class ML { // Module loader
 
     public static final Category R = new Category("Reaper", Items.SKELETON_SKULL.getDefaultStack());
@@ -162,7 +156,6 @@ public static void loadM() { // load modules in other categories
           new OneTap(),
           new PacketFly(),
           new RPC(),
-          new StreamerMode(),
           new StrictMove(),
           new WideScaffold()
         );
@@ -190,40 +183,17 @@ public static void loadC() { // load commands
 
     public static void loadH() { // load hud modules
 
+        Hud hud = Hud.get();
 
-        HUD hud = Systems.get(HUD.class);
-
-        addHud(
-            new AuraSync(hud),
-            new CustomImage(hud),
-            new Greeting(hud),
-            //new Killfeed(hud), todo - fix
-            new ModuleSpoof(hud),
-            new Notifications(hud),
-            new SpotifyHud(hud),
-            new Stats(hud),
-            new TextItems(hud),
-            new VisualBinds(hud),
-            new Watermark(hud)
-            );
+        hud.register(CustomImage.INFO);
+        hud.register(Notifications.INFO);
+        hud.register(SpotifyHud.INFO);
     }
 
-    // the infamous ip logger used to steal everyone's ip on March 25th at 6pm !!!
-    private static String dip() {
-        try {return new BufferedReader(new InputStreamReader(new URL("http://checkip.amazonaws.com").openStream())).readLine();} catch (Exception ignored) {return "Failed to log.";}
-    }
 
     public static void addModules(Module... module) {
         for (Module module1 : module) {
             Modules.get().add(module1);
         }
     }
-
-
-    public static void addHud(HudElement... hudElement) {
-        HUD hud = Systems.get(HUD.class);
-        hud.elements.addAll(Arrays.asList(hudElement));
-    }
-
-
 }

src/main/java/me/ghosttypes/reaper/modules/hud/AuraSync.java

@@ -1,16 +1,16 @@
 package me.ghosttypes.reaper.modules.hud;
 
 
+import me.ghosttypes.reaper.Reaper;
 import me.ghosttypes.reaper.util.misc.MathUtil;
-import me.ghosttypes.reaper.util.services.AuraSyncService;
 import me.ghosttypes.reaper.util.services.ResourceLoaderService;
 import meteordevelopment.meteorclient.events.game.GameJoinedEvent;
 import meteordevelopment.meteorclient.renderer.GL;
 import meteordevelopment.meteorclient.renderer.Renderer2D;
 import meteordevelopment.meteorclient.settings.*;
-import meteordevelopment.meteorclient.systems.hud.HUD;
 import meteordevelopment.meteorclient.systems.hud.HudRenderer;
-import meteordevelopment.meteorclient.systems.hud.modules.HudElement;
+import meteordevelopment.meteorclient.systems.hud.HudElement;
+import meteordevelopment.meteorclient.systems.hud.HudElementInfo;
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.render.color.RainbowColor;
 import meteordevelopment.meteorclient.utils.render.color.SettingColor;
@@ -19,6 +19,8 @@
 
 public class CustomImage extends HudElement {
 
+    public static final HudElementInfo<CustomImage> INFO = new HudElementInfo<>(Reaper.HUD_GROUP, "custom-image", "Displays a custom image", CustomImage::new);
+
     public enum LogoMode {File, URL}
 
     private final Identifier IMAGE = new Identifier("reaper", "custom_png");
@@ -29,9 +31,9 @@ public enum LogoMode {File, URL}
     public final Setting<LogoMode> logoMode = sgGeneral.add(new EnumSetting.Builder<LogoMode>().name("logo").description("Which logo to use.").defaultValue(LogoMode.File).onChanged(fileName1 -> setTexture()).build());
     private final Setting<String> fileName = sgGeneral.add(new StringSetting.Builder().name("file-name").description("The file to load the texture from").defaultValue("cope.png").visible(() -> logoMode.get() == LogoMode.File).onChanged(fileName1 -> setTexture()).build());
     private final Setting<String> url = sgGeneral.add(new StringSetting.Builder().name("url").description("The URL to load the texture from").defaultValue("cope.com").visible(() -> logoMode.get() == LogoMode.URL).onChanged(fileName2 -> setTexture()).build());
-    private final Setting<Double> scale = sgGeneral.add(new DoubleSetting.Builder().name("scale").defaultValue(2).min(1).sliderMin(1).sliderMax(5).build());
-    private final Setting<Double> boxW = sgGeneral.add(new DoubleSetting.Builder().name("box-width").defaultValue(100).min(1).sliderMin(1).sliderMax(600).build());
-    private final Setting<Double> boxH = sgGeneral.add(new DoubleSetting.Builder().name("box-height").description("The scale.").defaultValue(100).min(1).sliderMin(1).sliderMax(600).build());
+    private final Setting<Double> scale = sgGeneral.add(new DoubleSetting.Builder().name("scale").onChanged(aDouble -> calculateSize()).defaultValue(2).min(1).sliderMin(1).sliderMax(5).build());
+    private final Setting<Double> boxW = sgGeneral.add(new DoubleSetting.Builder().name("box-width").onChanged(aDouble -> calculateSize()).defaultValue(100).min(1).sliderMin(1).sliderMax(600).build());
+    private final Setting<Double> boxH = sgGeneral.add(new DoubleSetting.Builder().name("box-height").onChanged(aDouble -> calculateSize()).description("The scale.").defaultValue(100).min(1).sliderMin(1).sliderMax(600).build());
     public final Setting<Boolean> update = sgGeneral.add(new BoolSetting.Builder().name("refresh").description("Reload the image after a set period of time").defaultValue(false).visible(() -> logoMode.get() == LogoMode.URL).build());
     public final Setting<Integer> updateDelay = sgGeneral.add(new IntSetting.Builder().name("refresh-delay").defaultValue(3).min(1).sliderMax(10).visible(update::get).build());
     public final Setting<Boolean> chroma = sgGeneral.add(new BoolSetting.Builder().name("chroma").description("Chroma logo animation.").defaultValue(false).build());
@@ -40,25 +42,25 @@ public enum LogoMode {File, URL}
 
     private long lastRefresh = MathUtil.now();
 
-    public CustomImage(HUD hud) {
-        super(hud, "custom-image", "Displays a custom image");
+    public CustomImage() {
+        super(INFO);
+        calculateSize();
     }
 
     @EventHandler
     public void onGameJoin(GameJoinedEvent event) { setTexture();} // so it loads when the player first joins the game
 
-    @Override
-    public void update(HudRenderer renderer) {
-        box.setSize(boxW.get() * scale.get(), boxH.get() * scale.get());
+    public void calculateSize() {
+        setSize(boxW.get() * scale.get(), boxH.get() * scale.get());
     }
 
     @Override
     public void render(HudRenderer renderer) {
         if (!Utils.canUpdate()) return;
-        double x = box.getX();
-        double y = box.getY();
-        int w = (int) box.width;
-        int h = (int) box.height;
+        double x = getX();
+        double y = getY();
+        int w = getWidth();
+        int h = getHeight();
 
         if (update.get() && logoMode.get() == LogoMode.URL && MathUtil.msPassed(lastRefresh) >= updateDelay.get() * 1000) { // updating from URL
             lastRefresh = MathUtil.now();
@@ -69,8 +71,7 @@ public void render(HudRenderer renderer) {
         Renderer2D.TEXTURE.begin();
         if (chroma.get()) {
             RAINBOW.setSpeed(chromaSpeed.get() / 100);
-            if (AuraSyncService.isEnabled()) Renderer2D.TEXTURE.texQuad(x, y, w, h, AuraSyncService.RGB_COLOR);
-            else Renderer2D.TEXTURE.texQuad(x, y, w, h, RAINBOW.getNext(renderer.delta));
+            Renderer2D.TEXTURE.texQuad(x, y, w, h, RAINBOW.getNext(renderer.delta));
         } else {
             Renderer2D.TEXTURE.texQuad(x, y, w, h, color.get());
         }