From 57e2fb4b7acdb7503f264933798306b5c4220a94 Mon Sep 17 00:00:00 2001 From: JFronny Date: Sat, 4 May 2024 20:23:29 +0200 Subject: [PATCH] chore: remove dashloader compat --- build.gradle.kts | 15 ++---------- .../respackopts/RespackoptsClient.java | 2 -- .../integration/DashLoaderCompat.java | 24 ------------------- .../respackopts/RespackoptsConfig.java | 2 -- .../assets/respackopts/lang/en_us.json | 1 - 5 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 src/client/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java diff --git a/build.gradle.kts b/build.gradle.kts index 8c34aab..e2e4eef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,13 +16,6 @@ repositories { includeGroup("io.vram") } } - maven("https://notalpha.dev/maven/releases") { - name = "DashLoader" - content { - includeGroup("dev.notalpha") - includeGroup("dev.quantumfusion") - } - } maven("https://api.modrinth.com/maven") { name = "Modrinth" content { @@ -70,8 +63,7 @@ dependencies { modLocalRuntime("com.terraformersmc:modmenu:$modmenuVersion", nofabric) modClientCompileOnly("com.terraformersmc:modmenu:$modmenuVersion", nofabric) - modClientCompileOnly("io.vram:frex-fabric:20.0.+") - modClientCompileOnly("dev.notalpha:dashloader:5.0.0-beta.1+1.20.0") + modClientCompileOnly("io.vram:frex-fabric:20.2.+") testImplementation("org.junit.jupiter:junit-jupiter:5.9.3") @@ -79,11 +71,8 @@ dependencies { annotationProcessor("io.gitlab.jfronny:commons-serialize-generator:$muscriptVersion") // Canvas for FREX testing -// modClientRuntimeOnly("io.vram:canvas-fabric:20.0.+") + //modClientRuntimeOnly("io.vram:canvas-fabric:20.2.+") // Sodium for debugging modClientRuntimeOnly("maven.modrinth:sodium:mc1.20.6-0.5.8") - - // DashLoader "compatibility" -// modClientRuntimeOnly("dev.notalpha:dashloader:5.0.0-beta.1+1.20.0") } diff --git a/src/client/java/io/gitlab/jfronny/respackopts/RespackoptsClient.java b/src/client/java/io/gitlab/jfronny/respackopts/RespackoptsClient.java index 82793df..57d9cc3 100644 --- a/src/client/java/io/gitlab/jfronny/respackopts/RespackoptsClient.java +++ b/src/client/java/io/gitlab/jfronny/respackopts/RespackoptsClient.java @@ -52,7 +52,6 @@ public class RespackoptsClient implements ClientModInitializer, SaveHook { if (args.flagResourcesForReload()) { forcePackReload = true; - DashLoaderCompat.requestForceReload(); } List> futures = new ArrayList<>(); if (args.reloadResourcesImmediately()) { @@ -66,7 +65,6 @@ public class RespackoptsClient implements ClientModInitializer, SaveHook { public static CompletableFuture forceReloadResources() { forcePackReload = true; - DashLoaderCompat.requestForceReload(); if (RespackoptsConfig.debugLogs) Respackopts.LOGGER.info("Forcing resource reload"); return CompletableFuture.allOf(MinecraftClient.getInstance().reloadResources()); } diff --git a/src/client/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java b/src/client/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java deleted file mode 100644 index adfac56..0000000 --- a/src/client/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.gitlab.jfronny.respackopts.integration; - -import dev.notalpha.dashloader.client.DashLoaderClient; -import io.gitlab.jfronny.respackopts.Respackopts; -import io.gitlab.jfronny.respackopts.RespackoptsConfig; -import net.fabricmc.loader.api.FabricLoader; - -public class DashLoaderCompat { - public static void requestForceReload() { - if (!FabricLoader.getInstance().isModLoaded("dashloader")) - return; - if (!RespackoptsConfig.dashloaderCompat) - return; - try { - if (RespackoptsConfig.debugLogs) - Respackopts.LOGGER.info("Removing DashCache to force dashloader to reload"); - - DashLoaderClient.CACHE.remove(); - DashLoaderClient.NEEDS_RELOAD = true; - } catch (Throwable e) { - Respackopts.LOGGER.error("Failed to remove dashloader data, try disabling dashloaderCompat if this keeps happening", e); - } - } -} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java b/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java index 1330506..1a73465 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/RespackoptsConfig.java @@ -16,7 +16,6 @@ public class RespackoptsConfig implements JfCustomConfig { public static boolean debugCommands = false; public static boolean debugLogs = false; public static boolean ioLogs = false; - public static boolean dashloaderCompat = true; public static ScanState scanState = ScanState.NONE; public static ConfigInstance configInstance = null; @@ -40,7 +39,6 @@ public class RespackoptsConfig implements JfCustomConfig { .value("debugCommands", debugCommands, () -> debugCommands, v -> debugCommands = v) .value("debugLogs", debugLogs, () -> debugLogs, v -> debugLogs = v) .value("ioLogs", ioLogs, () -> ioLogs, v -> ioLogs = v) - .value("dashloaderCompat", dashloaderCompat, () -> dashloaderCompat, v -> dashloaderCompat = v) // Not using Respackopts.FALLBACK_CONF_DIR to avoid premature initialization with libjf-unsafe and libjf-config-reflect .setPath(dir.resolve("_respackopts.conf")) .referenceConfig(() -> { diff --git a/src/main/resources/assets/respackopts/lang/en_us.json b/src/main/resources/assets/respackopts/lang/en_us.json index 81d42bb..3119e38 100644 --- a/src/main/resources/assets/respackopts/lang/en_us.json +++ b/src/main/resources/assets/respackopts/lang/en_us.json @@ -8,7 +8,6 @@ "respackopts.jfconfig.debugLogs.tooltip": "Logs some information useful for debugging packs or the mod itself. (requires restart)", "respackopts.jfconfig.ioLogs": "IO Logs", "respackopts.jfconfig.ioLogs.tooltip": "Log every resource access. WARNING: This WILL result in giant log files! (requires restart)", - "respackopts.jfconfig.dashloaderCompat": "Dashloader compatibility", "respackopts.invalid": "Invalid value", "respackopts.dumpSucceeded": "Successfully dumped the resource to %s", "respackopts.dumpFailed": "Could not dump the requested resource, look at your log for details",