From 90ad5a4b5da7d1e7c652044f34da350f16cad7f5 Mon Sep 17 00:00:00 2001 From: C10udburst <18114966+C10udburst@users.noreply.github.com> Date: Tue, 1 Feb 2022 12:53:27 +0100 Subject: [PATCH] use orion for item counters --- README.md | 1 - .../anticope/rejects/MeteorRejectsAddon.java | 3 -- .../anticope/rejects/gui/hud/AppleHud.java | 50 ------------------- .../anticope/rejects/gui/hud/CrystalHud.java | 49 ------------------ .../java/anticope/rejects/gui/hud/ExpHud.java | 47 ----------------- 5 files changed, 150 deletions(-) delete mode 100644 src/main/java/anticope/rejects/gui/hud/AppleHud.java delete mode 100644 src/main/java/anticope/rejects/gui/hud/CrystalHud.java delete mode 100644 src/main/java/anticope/rejects/gui/hud/ExpHud.java diff --git a/README.md b/README.md index f2d8d01..ef91938 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,6 @@ ## HUD - Baritone process HUD -- Apple, Exp & Crystal HUD (Taken from an [unmerged PR](https://github.com/MeteorDevelopment/meteor-client/pull/757)) - CPS HUD (Ported from [AuroraKeystrokes](https://github.com/LambdAurora/AuroraKeystrokes/tree/1.16/src/main/java/me/lambdaurora/keystrokes)) ## Config diff --git a/src/main/java/anticope/rejects/MeteorRejectsAddon.java b/src/main/java/anticope/rejects/MeteorRejectsAddon.java index 3e70646..8521064 100644 --- a/src/main/java/anticope/rejects/MeteorRejectsAddon.java +++ b/src/main/java/anticope/rejects/MeteorRejectsAddon.java @@ -92,10 +92,7 @@ public class MeteorRejectsAddon extends MeteorAddon { // HUD HUD hud = Systems.get(HUD.class); - hud.elements.add(new AppleHud(hud)); hud.elements.add(new BaritoneHud(hud)); - hud.elements.add(new CrystalHud(hud)); - hud.elements.add(new ExpHud(hud)); hud.elements.add(new CpsHud(hud)); // Themes diff --git a/src/main/java/anticope/rejects/gui/hud/AppleHud.java b/src/main/java/anticope/rejects/gui/hud/AppleHud.java deleted file mode 100644 index dd58fde..0000000 --- a/src/main/java/anticope/rejects/gui/hud/AppleHud.java +++ /dev/null @@ -1,50 +0,0 @@ -package anticope.rejects.gui.hud; - -import meteordevelopment.meteorclient.settings.DoubleSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; -import meteordevelopment.meteorclient.systems.hud.HUD; -import meteordevelopment.meteorclient.systems.hud.HudRenderer; -import meteordevelopment.meteorclient.systems.hud.modules.HudElement; -import meteordevelopment.meteorclient.utils.player.InvUtils; -import meteordevelopment.meteorclient.utils.render.RenderUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; - -public class AppleHud extends HudElement { - private final SettingGroup sgGeneral = settings.getDefaultGroup(); - - private final Setting scale = sgGeneral.add(new DoubleSetting.Builder() - .name("scale") - .description("Scale of golden apple counter.") - .defaultValue(3) - .min(1) - .sliderMin(1) - .sliderMax(4) - .build() - ); - - public AppleHud(HUD hud) { - super(hud, "apples", "Displays the amount of golden apples in your inventory.", false); - } - - @Override - public void update(HudRenderer renderer) { - box.setSize(16 * scale.get(), 16 * scale.get()); - } - - @Override - public void render(HudRenderer renderer) { - double x = box.getX(); - double y = box.getY(); - - if (isInEditor()) { - RenderUtils.drawItem(Items.GOLDEN_APPLE.getDefaultStack(), (int) x, (int) y, scale.get(), true); - } else { - int count = InvUtils.find(Items.GOLDEN_APPLE).count(); - count += InvUtils.find(Items.ENCHANTED_GOLDEN_APPLE).count(); - if (count > 0) - RenderUtils.drawItem(new ItemStack(Items.GOLDEN_APPLE, count), (int) x, (int) y, scale.get(), true); - } - } -} diff --git a/src/main/java/anticope/rejects/gui/hud/CrystalHud.java b/src/main/java/anticope/rejects/gui/hud/CrystalHud.java deleted file mode 100644 index eb4c9e0..0000000 --- a/src/main/java/anticope/rejects/gui/hud/CrystalHud.java +++ /dev/null @@ -1,49 +0,0 @@ -package anticope.rejects.gui.hud; - -import meteordevelopment.meteorclient.settings.DoubleSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; -import meteordevelopment.meteorclient.systems.hud.HUD; -import meteordevelopment.meteorclient.systems.hud.HudRenderer; -import meteordevelopment.meteorclient.systems.hud.modules.HudElement; -import meteordevelopment.meteorclient.utils.player.InvUtils; -import meteordevelopment.meteorclient.utils.render.RenderUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; - -//SonyTV was here :) - -public class CrystalHud extends HudElement { - private final SettingGroup sgGeneral = settings.getDefaultGroup(); - - private final Setting scale = sgGeneral.add(new DoubleSetting.Builder() - .name("scale") - .description("Scale of crystal counter.") - .defaultValue(3) - .min(1) - .sliderMin(1) - .sliderMax(4) - .build() - ); - - public CrystalHud(HUD hud) { - super(hud, "crytals", "Displays the amount of crystals in your inventory.", false); - } - - @Override - public void update(HudRenderer renderer) { - box.setSize(16 * scale.get(), 16 * scale.get()); - } - - @Override - public void render(HudRenderer renderer) { - double x = box.getX(); - double y = box.getY(); - - if (isInEditor()) { - RenderUtils.drawItem(Items.END_CRYSTAL.getDefaultStack(), (int) x, (int) y, scale.get(), true); - } else if (InvUtils.find(Items.END_CRYSTAL).count() > 0) { - RenderUtils.drawItem(new ItemStack(Items.END_CRYSTAL, InvUtils.find(Items.END_CRYSTAL).count()), (int) x, (int) y, scale.get(), true); - } - } -} diff --git a/src/main/java/anticope/rejects/gui/hud/ExpHud.java b/src/main/java/anticope/rejects/gui/hud/ExpHud.java deleted file mode 100644 index b961226..0000000 --- a/src/main/java/anticope/rejects/gui/hud/ExpHud.java +++ /dev/null @@ -1,47 +0,0 @@ -package anticope.rejects.gui.hud; - -import meteordevelopment.meteorclient.settings.DoubleSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; -import meteordevelopment.meteorclient.systems.hud.HUD; -import meteordevelopment.meteorclient.systems.hud.HudRenderer; -import meteordevelopment.meteorclient.systems.hud.modules.HudElement; -import meteordevelopment.meteorclient.utils.player.InvUtils; -import meteordevelopment.meteorclient.utils.render.RenderUtils; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; - -public class ExpHud extends HudElement { - private final SettingGroup sgGeneral = settings.getDefaultGroup(); - - private final Setting scale = sgGeneral.add(new DoubleSetting.Builder() - .name("scale") - .description("Scale of exp bottle counter.") - .defaultValue(3) - .min(1) - .sliderMin(1) - .sliderMax(4) - .build() - ); - - public ExpHud(HUD hud) { - super(hud, "exp", "Displays the amount of exp bottles in your inventory.", false); - } - - @Override - public void update(HudRenderer renderer) { - box.setSize(16 * scale.get(), 16 * scale.get()); - } - - @Override - public void render(HudRenderer renderer) { - double x = box.getX(); - double y = box.getY(); - - if (isInEditor()) { - RenderUtils.drawItem(Items.EXPERIENCE_BOTTLE.getDefaultStack(), (int) x, (int) y, scale.get(), true); - } else if (InvUtils.find(Items.EXPERIENCE_BOTTLE).count() > 0) { - RenderUtils.drawItem(new ItemStack(Items.EXPERIENCE_BOTTLE, InvUtils.find(Items.EXPERIENCE_BOTTLE).count()), (int) x, (int) y, scale.get(), true); - } - } -}