diff --git a/build.gradle.kts b/build.gradle.kts index c7a9264..71e6604 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,5 +10,5 @@ dependencies { include(modImplementation(fabricApi.module("fabric-resource-loader-v0", prop("fabric_version")))!!) // Dev env - modLocalRuntime("com.terraformersmc:modmenu:4.1.1") + modLocalRuntime("com.terraformersmc:modmenu:5.0.0-alpha.4") } diff --git a/gradle.properties b/gradle.properties index bff71d5..8f1f62e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # https://fabricmc.net/develop -minecraft_version=1.19.2 -yarn_mappings=build.24 +minecraft_version=1.19.3 +yarn_mappings=build.2 loader_version=0.14.11 maven_group=io.gitlab.jfronny @@ -8,5 +8,5 @@ archives_base_name=resclone modrinth_id=resclone -fabric_version=0.68.0+1.19.2 -libjf_version=3.2.1 \ No newline at end of file +fabric_version=0.68.1+1.19.3 +libjf_version=3.3.1 \ No newline at end of file diff --git a/src/main/java/io/gitlab/jfronny/resclone/RescloneResourcePack.java b/src/main/java/io/gitlab/jfronny/resclone/RescloneResourcePack.java index 21d918d..ee1df71 100644 --- a/src/main/java/io/gitlab/jfronny/resclone/RescloneResourcePack.java +++ b/src/main/java/io/gitlab/jfronny/resclone/RescloneResourcePack.java @@ -12,7 +12,7 @@ public class RescloneResourcePack extends ZipResourcePack implements ModResource private final String name; public RescloneResourcePack(File file, String name) { - super(file); + super(name, file, true); this.name = name; } diff --git a/src/main/java/io/gitlab/jfronny/resclone/mixin/FileResourcePackProviderMixin.java b/src/main/java/io/gitlab/jfronny/resclone/mixin/FileResourcePackProviderMixin.java index 9c21a4b..7899a57 100644 --- a/src/main/java/io/gitlab/jfronny/resclone/mixin/FileResourcePackProviderMixin.java +++ b/src/main/java/io/gitlab/jfronny/resclone/mixin/FileResourcePackProviderMixin.java @@ -3,9 +3,8 @@ package io.gitlab.jfronny.resclone.mixin; import io.gitlab.jfronny.resclone.Resclone; import io.gitlab.jfronny.resclone.RescloneResourcePack; import io.gitlab.jfronny.resclone.data.PackMetaLoaded; -import net.minecraft.resource.FileResourcePackProvider; -import net.minecraft.resource.ResourcePackProfile; -import net.minecraft.resource.ResourcePackSource; +import net.minecraft.resource.*; +import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -18,17 +17,19 @@ import java.util.function.Consumer; @Mixin(FileResourcePackProvider.class) public class FileResourcePackProviderMixin { @Shadow @Final private ResourcePackSource source; + @Shadow @Final private ResourceType type; - @Inject(at = @At("TAIL"), method = "register(Ljava/util/function/Consumer;Lnet/minecraft/resource/ResourcePackProfile$Factory;)V") - public void registerExtra(Consumer consumer, ResourcePackProfile.Factory factory, CallbackInfo info) { + @Inject(at = @At("TAIL"), method = "register(Ljava/util/function/Consumer;)V") + public void registerExtra(Consumer consumer, CallbackInfo info) { for (PackMetaLoaded meta : Resclone.DOWNLOADED_PACKS) { - ResourcePackProfile resourcePackProfile = ResourcePackProfile.of( + ResourcePackProfile resourcePackProfile = ResourcePackProfile.create( "resclone/" + meta.name(), + Text.literal(meta.name()), meta.forceEnable(), - () -> new RescloneResourcePack(meta.zipPath().toFile(), meta.name()), - factory, + name -> new RescloneResourcePack(meta.zipPath().toFile(), meta.name()), + type, ResourcePackProfile.InsertionPosition.TOP, - this.source + source ); if (resourcePackProfile != null) { consumer.accept(resourcePackProfile); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9bc0f7b..3be79af 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,7 +3,7 @@ "id": "resclone", "name": "Resclone", "version": "${version}", - "description": "Downloads and updates resourcepacks", + "description": "Downloads and updates resource packs", "authors": ["JFronny"], "contact": { "email": "projects.contact@frohnmeyer-wds.de",