Revert "bye bye skyclient"

This reverts commit 55cf145.

Author: Wyvest

gradle.properties

@@ -1,7 +1,7 @@
 mod_name = OneConfig
 mod_id = oneconfig
 mod_major_version = 0.2.2-alpha
-mod_minor_version = 224
+mod_minor_version = 223
 
 polyfrost.defaults.loom=3
 

src/main/java/cc/polyfrost/oneconfig/utils/Notifications.java

@@ -42,6 +42,7 @@
 import cc.polyfrost.oneconfig.renderer.NanoVGHelper;
 import cc.polyfrost.oneconfig.renderer.asset.Icon;
 import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -253,6 +254,8 @@ else if (desiredPosition != entry.getValue().getEnd())
 
     private Animation dummyAnimation;
     private static final Icon DEFAULT_ICON = new Icon(SVGs.ONECONFIG_HEAD_DARK);
+    private static final File crashPatchSkyClientFile = new File("./OneConfig/CrashPatch/SKYCLIENT");
+    private static final File oldCrashPatchSkyClientFile = new File("./W-OVERFLOW/CrashPatch/SKYCLIENT");
 
     @Subscribe
     private void onTickEvent(TickEvent event) {
@@ -261,7 +264,8 @@ private void onTickEvent(TickEvent event) {
                 Preferences.firstLaunch = false;
                 Preferences.getInstance().save();
                 dummyAnimation = new EaseInOutQuad(4000, 0, 1, false);
-                String message = "Press '" + Preferences.oneConfigKeyBind.getDisplay() + "' to open OneConfig, the next-gen config library for Minecraft.";
+                boolean isSkyClient = isSkyClient();
+                String message = isSkyClient ? "SkyClient now includes OneConfig, the next-gen config library for Minecraft. You can now simply press '" + Preferences.oneConfigKeyBind.getDisplay() + "' to configure all your mods!" : "Press '" + Preferences.oneConfigKeyBind.getDisplay() + "' to open OneConfig, the next-gen config library for Minecraft.";
                 send("Welcome to OneConfig!", message, DEFAULT_ICON, -1f, () -> {
                     if (Platform.getGuiPlatform().getCurrentScreen() instanceof OneConfigGui || Preferences.oneconfigOpened) {
                         Preferences.oneconfigOpened = true;
@@ -274,4 +278,10 @@ private void onTickEvent(TickEvent event) {
             }
         }
     }
+
+    private boolean isSkyClient() {
+        if (crashPatchSkyClientFile.exists()) return true;
+        if (oldCrashPatchSkyClientFile.exists()) return true;
+        return Platform.getLoaderPlatform().getLoadedMods().stream().anyMatch(mod -> mod != null && StringUtils.contains(mod.id, "skyclient") || StringUtils.contains(mod.id, "skyblockclient") || StringUtils.equals(mod.id, "scc"));
+    }
 }

versions/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java

@@ -36,7 +36,6 @@
 import cc.polyfrost.oneconfig.internal.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.internal.config.core.KeyBindHandler;
 import cc.polyfrost.oneconfig.internal.gui.BlurHandler;
-import cc.polyfrost.oneconfig.internal.hacks.ByeSkyClientHack;
 import cc.polyfrost.oneconfig.internal.hud.HudCore;
 import cc.polyfrost.oneconfig.libs.universal.ChatColor;
 import cc.polyfrost.oneconfig.libs.universal.UChat;
@@ -173,7 +172,6 @@ public void init() {
         HypixelUtils.INSTANCE.initialize();
         EventManager.INSTANCE.register(KeyBindHandler.INSTANCE);
         ConfigCore.sortMods();
-        ByeSkyClientHack.INSTANCE.initialize();
 
         initialized = true;
     }