v0.1

Author: RedthMC

.gitignore

@@ -20,7 +20,7 @@ build
 # other
 eclipse
 run
-build - Copy.gradle
+versions
 .vscode
 .devauth
 .DS_STORE
@@ -30,7 +30,6 @@ build - Copy.gradle
 # Edit at https://www.toptal.com/developers/gitignore?templates=java,gradle,forgegradle,kotlin,macos,intellij,intellij+all,eclipse,visualstudiocode
 
 ### Eclipse ###
-.metadata
 bin/
 tmp/
 *.tmp
@@ -46,7 +45,6 @@ local.properties
 .externalToolBuilders/
 
 # Locally stored "Eclipse launch configurations"
-*.launch
 
 # PyDev specific (Python IDE for Eclipse)
 *.pydevproject

README.md

@@ -1,15 +1,6 @@
-# MMCUtils
-Utilities for Minemen Club
+# StatsOverlay
 
-# Features
-- **Auto Practice** - Go straight into practice once joined.
-- **Auto Party Chat** - Enter party chat once joined practice.
-- **Height Overlay** - Make wools and terracottas darker at height limit.
-- **Height Overlay Darkness** - Adjust the darkness of height limit overlay.
-- **Height Overlay Distance HUD** - Shows how many blocks you are away from height limit.
+Stats overlay mod for Hypixel
 
 Configurable in `OneConfig` menu
 
-# Requirements
-- OptiFine Smooth Lighting: On
-

build.gradle.kts

@@ -95,7 +95,9 @@ repositories {
 dependencies {
     // Adds the OneConfig library, so we can develop with it.
     modCompileOnly("cc.polyfrost:oneconfig-$platform:0.2.0-alpha+")
-    implementation(files("libs/optifine-1.8.9.jar"))
+
+    implementation(files("libs/OverflowAnimations-2.0.1-b6-1.8.9.jar"))
+
     // If we are building for legacy forge, includes the launch wrapper with `shade` as we configured earlier.
     if (platform.isLegacyForge) {
         compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT")

gradle.properties

@@ -1,13 +1,13 @@
 # gradle.properties file -- CHANGE THE VALUES STARTING WITH `mod_*` AND REMOVE THIS COMMENT.
 
 # Sets the name of your mod.
-mod_name=MMCUtils
+mod_name=StatsOverlay
 # Sets the id of your mod that mod loaders use to recognize it.
-mod_id=mmcutils
+mod_id=statsoverlay
 # Sets the version of your mod. Make sure to update this when you make changes according to semver.
-mod_version=1.0.5
+mod_version=0.1
 # Sets the name of the jar file that you put in your 'mods' folder.
-mod_archives_name=MMCUtils
+mod_archives_name=StatsOverlay
 
 # Gradle Configuration -- DO NOT TOUCH THESE VALUES.
 polyfrost.defaults.loom=1

src/main/java/me/redth/mmcutils/Configuration.java

@@ -0,0 +1,71 @@
+package me.redth.statsoverlay;
+
+import cc.polyfrost.oneconfig.events.EventManager;
+import cc.polyfrost.oneconfig.events.event.LocrawEvent;
+import cc.polyfrost.oneconfig.events.event.ReceivePacketEvent;
+import cc.polyfrost.oneconfig.events.event.WorldLoadEvent;
+import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
+import cc.polyfrost.oneconfig.utils.hypixel.LocrawInfo;
+import me.redth.statsoverlay.config.OverlayConfig;
+import me.redth.statsoverlay.stat.DataList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import net.minecraft.network.play.server.S38PacketPlayerListItem;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.network.FMLNetworkEvent;
+
+@Mod(modid = "@ID@", name = "@NAME@", version = "@VER@")
+public class StatsOverlay {
+    private static final Minecraft mc = Minecraft.getMinecraft();
+    public static OverlayConfig config;
+    public static boolean inBW;
+
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent e) {
+        config = new OverlayConfig();
+        EventManager.INSTANCE.register(this);
+    }
+
+    @Subscribe
+    public void onPacketReceived(ReceivePacketEvent event) {
+        if (!(event.packet instanceof S38PacketPlayerListItem)) return;
+        if (!OverlayConfig.showAnyWhere && !inBW) return;
+
+        S38PacketPlayerListItem.Action action = ((S38PacketPlayerListItem) event.packet).getAction();
+        if (action == S38PacketPlayerListItem.Action.ADD_PLAYER) {
+            for (S38PacketPlayerListItem.AddPlayerData entry : ((S38PacketPlayerListItem) event.packet).getEntries()) {
+                DataList.add(entry.getProfile());
+            }
+        } else if (action == S38PacketPlayerListItem.Action.REMOVE_PLAYER) {
+            for (S38PacketPlayerListItem.AddPlayerData entry : ((S38PacketPlayerListItem) event.packet).getEntries()) {
+                DataList.remove(entry.getProfile());
+            }
+        }
+    }
+
+    @Subscribe
+    public void onWorldLoad(WorldLoadEvent event) {
+        DataList.clear();
+    }
+
+    @SubscribeEvent
+    public void onDisconnect(FMLNetworkEvent.ClientDisconnectionFromServerEvent event) {
+        DataList.clear();
+    }
+
+    @Subscribe
+    public void onLocraw(LocrawEvent event) {
+        if (OverlayConfig.showAnyWhere) return;
+        inBW = event.info.getGameType() == LocrawInfo.GameType.BEDWARS && !"lobby".equals(event.info.getGameMode());
+        if (inBW) {
+            for (NetworkPlayerInfo networkPlayerInfo : mc.thePlayer.sendQueue.getPlayerInfoMap()) {
+                DataList.add(networkPlayerInfo.getGameProfile());
+            }
+        }
+    }
+
+
+    // todo: align
+}

src/main/java/me/redth/mmcutils/HeightLimitHud.java

@@ -0,0 +1,88 @@
+package me.redth.statsoverlay.config;
+
+import cc.polyfrost.oneconfig.config.Config;
+import cc.polyfrost.oneconfig.config.annotations.Checkbox;
+import cc.polyfrost.oneconfig.config.annotations.Dropdown;
+import cc.polyfrost.oneconfig.config.annotations.DualOption;
+import cc.polyfrost.oneconfig.config.annotations.HUD;
+import cc.polyfrost.oneconfig.config.annotations.HypixelKey;
+import cc.polyfrost.oneconfig.config.annotations.KeyBind;
+import cc.polyfrost.oneconfig.config.annotations.Switch;
+import cc.polyfrost.oneconfig.config.annotations.Text;
+import cc.polyfrost.oneconfig.config.core.OneKeyBind;
+import cc.polyfrost.oneconfig.config.data.Mod;
+import cc.polyfrost.oneconfig.config.data.ModType;
+import me.redth.statsoverlay.stat.DataList;
+import org.lwjgl.input.Keyboard;
+
+public class OverlayConfig extends Config {
+
+    @KeyBind(name = "Overlay Key Bind")
+    public static OneKeyBind keyBind = new OneKeyBind(Keyboard.KEY_TAB);
+
+    @DualOption(name = "Key Bind Mode", left = "Hold", right = "Toggle")
+    public static boolean toggleKeyBind = false;
+
+    @DualOption(name = "Show in", left = "Only in Bedwars", right = "Any Server")
+    public static boolean showAnyWhere = false;
+
+    @Dropdown(name = "Sorting", options = {"Stars", "Final Kills", "FKDR", "Wins", "WLR", "Beds Broken", "BBLR"})
+    public static int sorting = 0;
+
+    @Text(name = "Self Name")
+    public static String selfName = "§cYou";
+
+    @Switch(name = "Show Stars Before Name")
+    public static boolean prefixStars = true;
+
+    @Checkbox(name = "Final Kills")
+    public static boolean finalKills = true;
+
+    @Checkbox(name = "FKDR")
+    public static boolean fkdr = true;
+
+    @Checkbox(name = "Wins")
+    public static boolean wins = true;
+
+    @Checkbox(name = "WLR")
+    public static boolean wlr = true;
+
+    @Checkbox(name = "Beds Broken")
+    public static boolean bedsBroken = true;
+
+    @Checkbox(name = "BBLR")
+    public static boolean bblr = true;
+
+    @HUD(name = "Overlay")
+    public static OverlayHUD hud = new OverlayHUD();
+
+    @HypixelKey()
+    @Text(name = "Hypixel API key", secure = true, category = "Hypixel API")
+    public static String apiKey;
+
+    private static boolean keyBindToggled;
+    private static boolean keyPressed;
+
+    public OverlayConfig() {
+        super(new Mod("StatsOverlay", ModType.HYPIXEL), "statsoverlay.json");
+        initialize();
+        addListener("sorting", () -> DataList.altered = true);
+        addListener("keyBindMode", () -> keyBindToggled = false);
+    }
+
+    public static boolean isKeyPressed() {
+        if (toggleKeyBind) {
+            if (keyBind.isActive()) {
+                if (!keyPressed) {
+                    keyPressed = true;
+                    keyBindToggled = !keyBindToggled;
+                }
+            } else {
+                keyPressed = false;
+            }
+            return keyBindToggled;
+        }
+
+        return keyBind.isActive();
+    }
+}