Revert "replace legacy hypixel api keys"

This reverts commit 1dea43d.
Polyfrost · Jul 10, 2023 · 55fb476 · 55fb476
1 parent 1a3de70
commit 55fb476
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 137 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,6 +6,6 @@ org.gradle.jvmargs=-Xmx2G
 
 mod_name = Hytils Reborn
 mod_id = hytils-reborn
-mod_version = 1.6.0-beta5
+mod_version = 1.6.0-beta4
 
 loom.platform = forge
diff --git a/src/main/java/cc/woverflow/hytils/HytilsReborn.java b/src/main/java/cc/woverflow/hytils/HytilsReborn.java
@@ -138,7 +138,7 @@ public void postInit(FMLPostInitializationEvent event) {
         isPatcher = Loader.isModLoaded("patcher");
         isChatting = Loader.isModLoaded("chatting");
 
-        Multithreading.runAsync(() -> rank = HypixelAPIUtils.getRank());
+        Multithreading.runAsync(() -> rank = HypixelAPIUtils.getRank(Minecraft.getMinecraft().getSession().getUsername()));
     }
 
     @Mod.EventHandler

diff --git a/src/main/java/cc/woverflow/hytils/command/HytilsCommand.java b/src/main/java/cc/woverflow/hytils/command/HytilsCommand.java
@@ -25,13 +25,16 @@
 import cc.polyfrost.oneconfig.utils.commands.annotations.Description;
 import cc.polyfrost.oneconfig.utils.commands.annotations.Main;
 import cc.polyfrost.oneconfig.utils.commands.annotations.SubCommand;
+import cc.polyfrost.oneconfig.utils.hypixel.HypixelUtils;
 import cc.woverflow.hytils.HytilsReborn;
 import cc.woverflow.hytils.command.parser.GEXPType;
 import cc.woverflow.hytils.command.parser.GEXPTypeParser;
 import cc.woverflow.hytils.command.parser.WinstreakType;
 import cc.woverflow.hytils.command.parser.WinstreakTypeParser;
+import cc.woverflow.hytils.config.HytilsConfig;
 import cc.woverflow.hytils.util.HypixelAPIUtils;
 import com.mojang.authlib.GameProfile;
+import net.minecraft.util.EnumChatFormatting;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Locale;
@@ -52,6 +55,10 @@ private void handleDefault() {
     @SuppressWarnings("SameParameterValue")
     private void gexp(@Description("username") @Nullable GameProfile player, @Description("type") @Nullable GEXPType type) {
         Multithreading.runAsync(() -> {
+            if (HytilsConfig.apiKey.isEmpty() || !HypixelUtils.INSTANCE.isValidKey(HytilsConfig.apiKey)) {
+                HytilsReborn.INSTANCE.sendMessage(EnumChatFormatting.RED + "You need to provide a valid API key to run this command! Type /api new to autoset a key.");
+                return;
+            }
             if (player != null) {
                 if (type == null) {
                     if (HypixelAPIUtils.getGEXP(player.getName())) {
@@ -105,6 +112,10 @@ private void gexp(@Description("username") @Nullable GameProfile player, @Descri
     @SuppressWarnings("SameParameterValue")
     private void winstreak(@Description("username") @Nullable GameProfile player, @Description("type") @Nullable WinstreakType gamemode) {
         Multithreading.runAsync(() -> {
+            if (HytilsConfig.apiKey.isEmpty() || !HypixelUtils.INSTANCE.isValidKey(HytilsConfig.apiKey)) {
+                HytilsReborn.INSTANCE.sendMessage(EnumChatFormatting.RED + "You need to provide a valid API key to run this command! Type /api new to autoset a key.");
+                return;
+            }
             if (player != null) {
                 if (gamemode != null) {
                     if (HypixelAPIUtils.getWinstreak(player.getName(), gamemode.name())) {
@@ -143,4 +154,17 @@ private void winstreak(@Description("username") @Nullable GameProfile player, @D
             }
         });
     }
+
+    @SubCommand(description = "Sets your API key.", aliases = "setkey")
+    private static void key(@Description("API Key") String apiKey) {
+        Multithreading.runAsync(() -> {
+            if (HypixelUtils.INSTANCE.isValidKey(apiKey)) {
+                HytilsConfig.apiKey = apiKey;
+                HytilsReborn.INSTANCE.getConfig().save();
+                HytilsReborn.INSTANCE.sendMessage(EnumChatFormatting.GREEN + "Saved API key successfully!");
+            } else {
+                HytilsReborn.INSTANCE.sendMessage(EnumChatFormatting.RED + "Invalid API key! Please try again.");
+            }
+        });
+    }
 }
diff --git a/src/main/java/cc/woverflow/hytils/config/HytilsConfig.java b/src/main/java/cc/woverflow/hytils/config/HytilsConfig.java
@@ -44,6 +44,17 @@
 @SuppressWarnings("unused")
 public class HytilsConfig extends Config {
 
+    // API
+
+    @Text(
+        name = "API Key",
+        description = "Automatically get the API Key from /api new.",
+        category = "API",
+        secure = true
+    )
+    @HypixelKey
+    public static String apiKey = "";
+
     // Automatic
 
     @Switch(