From 306279e92e043606cc94b00c04cb117a58e5ad29 Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 17 May 2022 11:32:03 +0200 Subject: [PATCH] Reenable compat modules for frex and dashloader. Will require a frex update to stop some unneeded logging --- build.gradle | 17 +++++--------- gradle.properties | 4 ++-- .../integration/DashLoaderCompat.java | 10 +++------ .../respackopts/integration/FrexCompat.java | 22 +++++-------------- 4 files changed, 17 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index 59a169b..aba6cc0 100644 --- a/build.gradle +++ b/build.gradle @@ -6,12 +6,11 @@ repositories { name = "vram" url = "https://maven.vram.io/" } - maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Required for canvas" } - maven { url = "https://minecraft.curseforge.com/api/maven"; name = "CurseForge (for canvas)" } maven { - url "https://oskarstrom.net/maven" + url "https://quantumfusion.dev/maven/" content { - includeGroup "net.oskarstrom" + includeGroup "dev.quantumfusion" + includeGroup "dev.quantumfusion.dashloader" } } maven { url = "https://jitpack.io"; name = "jitpack (for StarScript)" } @@ -24,10 +23,8 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-fabric:6.2.57") { exclude(group: "net.fabricmc.fabric-api") } -// modCompileOnly "io.vram:frex-fabric-mc118:+" - include modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${project.jfapi_version}") - include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}") - include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}") + modCompileOnly "io.vram:frex-fabric-mc118:+" + modImplementation("io.gitlab.jfronny.libjf:libjf-data-manipulation-v0:${project.jfapi_version}") modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}") testImplementation('org.junit.jupiter:junit-jupiter:5.8.2') @@ -38,9 +35,7 @@ dependencies { // } //DashLoader "compatibility" -// modImplementation ('net.oskarstrom:DashLoader:2.1-dev7') { -// exclude group: 'net.fabricmc.fabric-api' -// } + modRuntimeOnly 'dev.quantumfusion.dashloader:dashloader-definitions:3.0-rc14-1.18' } test { diff --git a/gradle.properties b/gradle.properties index 0359249..8241e60 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,8 +8,8 @@ fabric_version=0.51.1+1.18.2 jfapi_version=2.8.1 modrinth_id=TiF5QWZY -modrinth_required_dependencies=P7dR8mSH, 9s6osm5g +modrinth_required_dependencies=P7dR8mSH, 9s6osm5g, WKwQAwke modrinth_optional_dependencies=mOgUt4GM curseforge_id=430090 -curseforge_required_dependencies=fabric-api, cloth-config +curseforge_required_dependencies=fabric-api, cloth-config, libjf curseforge_optional_dependencies=modmenu diff --git a/src/main/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java b/src/main/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java index c1cc145..9bf66e4 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/integration/DashLoaderCompat.java @@ -4,10 +4,7 @@ import io.gitlab.jfronny.respackopts.Respackopts; import net.fabricmc.loader.api.FabricLoader; import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; +import java.nio.file.*; import java.nio.file.attribute.BasicFileAttributes; public class DashLoaderCompat { @@ -19,9 +16,8 @@ public class DashLoaderCompat { try { if (Respackopts.CONFIG.debugLogs) Respackopts.LOGGER.info("Removing DashCache to force dashloader to reload"); - Class loaderClass = Class.forName("net.oskarstrom.dashloader.DashLoader"); - Object loaderInstance = loaderClass.getDeclaredMethod("getInstance").invoke(null); - Path loaderPath = (Path) loaderClass.getDeclaredMethod("getModBoundDir").invoke(loaderInstance); + Class loaderClass = Class.forName("dev.quantumfusion.dashloader.def.DashLoader"); + Path loaderPath = (Path) loaderClass.getDeclaredField("DASH_CACHE_FOLDER").get(null); Files.walkFileTree(loaderPath, new SimpleFileVisitor<>() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { diff --git a/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java b/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java index 140f7a0..33afc78 100644 --- a/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java +++ b/src/main/java/io/gitlab/jfronny/respackopts/integration/FrexCompat.java @@ -1,23 +1,13 @@ package io.gitlab.jfronny.respackopts.integration; -import io.gitlab.jfronny.respackopts.Respackopts; -//import io.vram.frex.api.config.ShaderConfig; +import io.gitlab.jfronny.commons.throwable.*; +import io.gitlab.jfronny.respackopts.*; +import io.vram.frex.api.config.*; -//TODO re-enable for release public class FrexCompat { - private static boolean initial = true; public static void onInitializeFrex() { -// ShaderConfig.registerShaderConfigSupplier(Respackopts.RPO_SHADER_ID, Respackopts::getShaderImportSource); -// Respackopts.LOGGER.info("enabled frex/canvas support"); -// Respackopts.SAVE_ACTIONS.add(() -> { -// try { -// if (!initial) -// ShaderConfig.invalidateShaderConfig(); -// initial = false; -// } -// catch (Throwable e) { -// Respackopts.LOGGER.error("Could not reload shader config", e); -// } -// }); + ShaderConfig.registerShaderConfigSupplier(Respackopts.RPO_SHADER_ID, Respackopts::getShaderImportSource); + Respackopts.LOGGER.info("enabled frex/canvas support"); + Respackopts.SAVE_ACTIONS.add(Try.handle(ShaderConfig::invalidateShaderConfig, e -> Respackopts.LOGGER.error("Could not reload shader config", e))); } }