diff --git a/build.gradle.kts b/build.gradle.kts index b9ab8c2..199b831 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -113,7 +113,7 @@ dependencies { // 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") - shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta17") + //shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta17") } } @@ -201,7 +201,7 @@ tasks { "ForceLoadAsMod" to true, // We want to load this jar as a mod, so we force Forge to do so. "TweakOrder" to "0", // Makes sure that the OneConfig launch wrapper is loaded as soon as possible. "MixinConfigs" to "mixins.hytils.json", // We want to use our mixin configuration, so we specify it here. - //"TweakClass" to "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker" // Loads the OneConfig launch wrapper. + "TweakClass" to "org.spongepowered.asm.launch.MixinTweaker" ) } dependsOn(shadowJar) diff --git a/src/main/java/org/polyfrost/hytils/config/HytilsConfig.java b/src/main/java/org/polyfrost/hytils/config/HytilsConfig.java index dc1705d..666126c 100644 --- a/src/main/java/org/polyfrost/hytils/config/HytilsConfig.java +++ b/src/main/java/org/polyfrost/hytils/config/HytilsConfig.java @@ -105,7 +105,7 @@ public class HytilsConfig extends Config { description = "Choose which GEXP to get.", options = {"Daily", "Weekly"} ) - public static boolean gexpMode = false; + public static int gexpMode = 0; @Switch( title = "Automatically Check Winstreak", @@ -1223,7 +1223,7 @@ public class HytilsConfig extends Config { public HytilsConfig() { - super("hytilsreborn.json", "/assets/hytils/hypixel.png", "Hytils Reborn", Category.HYPIXEL); // new VigilanceMigrator(new File(HytilsReborn.INSTANCE.oldModDir, "hytilsreborn.toml").getAbsolutePath())) + super("hytilsreborn.json", "Hytils Reborn", Category.HYPIXEL); // new VigilanceMigrator(new File(HytilsReborn.INSTANCE.oldModDir, "hytilsreborn.toml").getAbsolutePath())) try { File modDir = HytilsReborn.INSTANCE.oldModDir; File oldModDir = new File(modDir.getParentFile(), "Hytilities Reborn"); diff --git a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/triggers/AutoVictory.java b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/triggers/AutoVictory.java index 455f800..2c716d1 100644 --- a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/triggers/AutoVictory.java +++ b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/triggers/AutoVictory.java @@ -76,7 +76,7 @@ public void onTitle(TitleEvent event) { private void doNotification() { victoryDetected = true; if (HytilsConfig.autoGetGEXP) { - if (!HytilsConfig.gexpMode) { + if (HytilsConfig.gexpMode == 0) { try { if (HypixelAPIUtils.getGEXP()) { Notifications.INSTANCE