diff --git a/README.md b/README.md index e93e490..b5f07f3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +## Note +This mod no longer seems to be required as of MC 1.20.5. +Nonetheless, interactions between mods might still cause an issue, so I will keep updating it for the time being. +If you experience no lag spikes, you can safely remove this mod. + +## Original Description In vanilla minecraft, the list of resource packs is refreshed by scanning all possible sources synchronously. Generally, this is not a problem, but in the resource pack organizer screen, this scan is performed whenever it is resized and every twenty ticks. diff --git a/build.gradle.kts b/build.gradle.kts index b9aba57..5485a23 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,16 @@ plugins { - id("jfmod") version "1.5-SNAPSHOT" + id("jfmod") version "1.6-SNAPSHOT" } allprojects { group = "io.gitlab.jfronny" } base.archivesName = "async-pack-scan" jfMod { - minecraftVersion = "1.20.4" + minecraftVersion = "1.20.5" yarn("build.1") - loaderVersion = "0.15.0" - libJfVersion = "3.14.1" + loaderVersion = "0.15.10" + libJfVersion = "3.15.3" + fabricApiVersion = "0.97.6+1.20.5" modrinth { projectId = "async-pack-scan" @@ -27,11 +28,11 @@ loom { } dependencies { - include(modImplementation(fabricApi.module("fabric-resource-loader-v0", "0.96.4+1.20.4"))!!) - modImplementation("io.gitlab.jfronny.libjf:libjf-base:${jfMod.libJfVersion.get()}") + include(modImplementation("net.fabricmc.fabric-api:fabric-resource-loader-v0")!!) + modImplementation("io.gitlab.jfronny.libjf:libjf-base") // For testing in dev environment - modLocalRuntime("net.fabricmc.fabric-api:fabric-api:0.91.1+1.20.4") - modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}") - modLocalRuntime("com.terraformersmc:modmenu:9.0.0-pre.1") + modLocalRuntime("net.fabricmc.fabric-api:fabric-api") + modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil") + modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1") } diff --git a/src/client/java/io/gitlab/jfronny/aps/client/mixin/ResourcePackOrganizerMixin.java b/src/client/java/io/gitlab/jfronny/aps/client/mixin/ResourcePackOrganizerMixin.java index 4caec68..e14f355 100644 --- a/src/client/java/io/gitlab/jfronny/aps/client/mixin/ResourcePackOrganizerMixin.java +++ b/src/client/java/io/gitlab/jfronny/aps/client/mixin/ResourcePackOrganizerMixin.java @@ -74,7 +74,7 @@ public abstract class ResourcePackOrganizerMixin { this.resourcePackManager.setEnabledProfiles( Lists.reverse(this.enabledPacks) .stream() - .map(ResourcePackProfile::getName) + .map(ResourcePackProfile::getId) .collect(ImmutableList.toImmutableList()) ); } diff --git a/src/main/java/io/gitlab/jfronny/aps/impl/AsyncPackScan.java b/src/main/java/io/gitlab/jfronny/aps/impl/AsyncPackScan.java index d826491..598bb7d 100644 --- a/src/main/java/io/gitlab/jfronny/aps/impl/AsyncPackScan.java +++ b/src/main/java/io/gitlab/jfronny/aps/impl/AsyncPackScan.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.aps.impl; -import io.gitlab.jfronny.commons.logging.Logger; +import io.gitlab.jfronny.commons.logger.SystemLoggerPlus; public class AsyncPackScan { - public static final Logger LOG = Logger.forName("async-pack-scan"); + public static final SystemLoggerPlus LOG = SystemLoggerPlus.forName("async-pack-scan"); }