feat: add functionality to disable Skyblocker dungeon map and handle update notifications for zen and krypt

Author: KdGaming0

CHANGELOG.md

@@ -1,7 +1,2 @@
-- fix: Typo in Resource Packs Wizard page and added missing key for Sophie's Hypixel Enhants. Should not be possible to apply from wizard page correctly.
-- fix: Added check for NPC in sender for Scam shield. Scam shield is no longer checking NPC messages.
-- feat: Added automatic config backups that run every three days. Apply them from the Configuration menu.
-- feat: Changed Gradle build system to use Stonecutter for easy multi-version support.
-- feat: Added config update system; this lets me update a specific config file with a modpack update or add configs for a new mod without having to apply configs for all mods.
-- feat: Added option to apply specific config files instead of the whole zip file.
-- chore: Fixed language files and improved readability.
+- feat: add code to force-close the Zen and Krypt update notification; this should be handled by the modpack.
+- feat: add function to disable Skyblocker dungeon map on startup; it is being replaced by Krypt in the new configs.

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.configuration-cache=false
 # Mod properties
 mod.name=PackCore
 mod.id=packcore
-mod.version=3.2.0
+mod.version=3.2.1
 mod.group=com.github.kd_gaming1
 
 # Global dependencies

src/main/java/com/github/kd_gaming1/packcore/PackCore.java

@@ -4,6 +4,7 @@
 import com.github.kd_gaming1.packcore.command.scamshield.ScamShieldCommand;
 import com.github.kd_gaming1.packcore.config.PackCoreConfig;
 import com.github.kd_gaming1.packcore.config.backup.ScheduledBackupManager;
+import com.github.kd_gaming1.packcore.integration.skyblocker.DungeonMap;
 import com.github.kd_gaming1.packcore.scamshield.ChatMessageInterceptor;
 import com.github.kd_gaming1.packcore.scamshield.ScamShieldChatHandler;
 import com.github.kd_gaming1.packcore.scamshield.detector.ScamDetector;
@@ -17,8 +18,11 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.TitleScreen;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -96,6 +100,24 @@ public void onInitializeClient() {
             PackCoreConfig.haveSetBobbyConfig = true;
             PackCoreConfig.write(MOD_ID);
         }
+
+        if (!PackCoreConfig.haveSetDungeonMapConfig) {
+            DungeonMap.disableDungeonMap();
+            PackCoreConfig.haveSetDungeonMapConfig = true;
+            PackCoreConfig.write(MOD_ID);
+        }
+
+        ClientTickEvents.END_CLIENT_TICK.register(client -> {
+            try {
+                Screen currentScreen = client.currentScreen;
+                Class<?> zenClass = Class.forName("xyz.meowing.zen.updateChecker.UpdateGUI");
+                Class<?> kryptClass = Class.forName("xyz.meowing.krypt.updateChecker.UpdateGUI");
+
+                if (zenClass.isInstance(currentScreen) || kryptClass.isInstance(currentScreen)) {
+                    MinecraftClient.getInstance().setScreen(null);
+                }
+            } catch (ClassNotFoundException ignored) {}
+        });
     }
     public static ModpackInfo getModpackInfo() {
         return modpackInfo;

src/main/java/com/github/kd_gaming1/packcore/config/PackCoreConfig.java

@@ -69,6 +69,9 @@ public class PackCoreConfig extends MidnightConfig {
     @Entry(category = CATEGORY_ADVANCED, name = "packcore.midnightconfig.have_set_bobby_config")
     public static boolean haveSetBobbyConfig = false;
 
+    @Entry(category = CATEGORY_ADVANCED, name = "packcore.midnightconfig.have_set_skyblocker_dungeon_map_config")
+    public static boolean haveSetDungeonMapConfig = false;
+
     @Hidden
     @Entry(category = CATEGORY_ADVANCED, name = "packcore.midnightconfig.setup_wizard_completed")
     public static boolean defaultConfigSuccessfullyApplied = false;

src/main/java/com/github/kd_gaming1/packcore/integration/skyblocker/DungeonMap.java

@@ -0,0 +1,36 @@
+package com.github.kd_gaming1.packcore.integration.skyblocker;
+
+import com.github.kd_gaming1.packcore.PackCore;
+
+import java.lang.reflect.Method;
+
+public class DungeonMap {
+
+    public static void disableDungeonMap() {
+        try {
+            Class<?> configManager = Class.forName("de.hysky.skyblocker.config.SkyblockerConfigManager");
+            Method updateMethod = configManager.getDeclaredMethod("update", java.util.function.Consumer.class);
+
+            java.util.function.Consumer<Object> consumer = DungeonMap::updateDungeonMapConfig;
+
+            updateMethod.invoke(null, consumer);
+            PackCore.LOGGER.info("Disabled Skyblocker Dungeon Map");
+
+        } catch (ClassNotFoundException e) {
+            PackCore.LOGGER.info("Skyblocker not present");
+        } catch (Exception e) {
+            PackCore.LOGGER.warn("Could not update Skyblocker Dungeon Map config", e);
+        }
+    }
+
+    private static void updateDungeonMapConfig(Object config) {
+        try {
+            Object dungeons = config.getClass().getField("dungeons").get(config);
+            Object dungeonMap = dungeons.getClass().getField("dungeonMap").get(dungeons);
+
+            dungeonMap.getClass().getField("enableMap").setBoolean(dungeonMap, false);
+        } catch (Exception e) {
+            PackCore.LOGGER.warn("Failed to update Dungeon Map config", e);
+        }
+    }
+}

src/main/resources/assets/packcore/lang/en_us.json

@@ -38,6 +38,9 @@
   "packcore.midnightconfig.have_set_bobby_config": "Mark Bobby config as applied",
   "packcore.midnightconfig.have_set_bobby_config.tooltip": "Tracks if PackCore has applied Bobby’s settings. Change it to force the setup again.",
 
+  "packcore.midnightconfig.have_set_skyblocker_dungeon_map_config": "Mark Skyblocker Dungeon Map config as applied",
+  "packcore.midnightconfig.have_set_skyblocker_dungeon_map_config.tooltip": "Tracks if PackCore has applied Skyblocker Dungeon Map config",
+
   "packcore.midnightconfig.setup_wizard_completed": "Mark setup wizard as completed",
   "packcore.midnightconfig.setup_wizard_completed.tooltip": "Tracks if the setup wizard has been completed.",