diff --git a/build.gradle b/build.gradle index 3c11e6b..a3648e1 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,5 @@ dependencies { mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "com.terraformersmc:modmenu:2.0.0-beta.7" } diff --git a/gradle.properties b/gradle.properties index 3ec4f11..6aa5031 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,14 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G # Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.17 -yarn_mappings=build.1 -loader_version=0.11.3 +# check these on https://fabricmc.net/versions.html +minecraft_version=1.17.1 +yarn_mappings=build.61 +loader_version=0.12.1 # Mod Properties mod_version=1.7.1 maven_group=io.gitlab.jfronny archives_base_name=resclone -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.34.9+1.17 modrinth_id=kVAQyCLX modrinth_required_dependencies= diff --git a/src/main/java/io/gitlab/jfronny/resclone/RescloneEntryDefault.java b/src/main/java/io/gitlab/jfronny/resclone/RescloneEntryDefault.java index d616dd9..06f9d2d 100644 --- a/src/main/java/io/gitlab/jfronny/resclone/RescloneEntryDefault.java +++ b/src/main/java/io/gitlab/jfronny/resclone/RescloneEntryDefault.java @@ -11,7 +11,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; public class RescloneEntryDefault implements RescloneEntry { - @Override public void init(RescloneApi api) { api.addFetcher(new BasicFileFetcher()); @@ -21,5 +20,4 @@ public class RescloneEntryDefault implements RescloneEntry { api.addProcessor(new PruneVanillaProcessor()); ConfigLoader.load(api); } - } \ No newline at end of file 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 b420abb..febc102 100644 --- a/src/main/java/io/gitlab/jfronny/resclone/mixin/FileResourcePackProviderMixin.java +++ b/src/main/java/io/gitlab/jfronny/resclone/mixin/FileResourcePackProviderMixin.java @@ -17,9 +17,7 @@ import java.util.function.Consumer; @Mixin(FileResourcePackProvider.class) public class FileResourcePackProviderMixin { - @Shadow - @Final - private ResourcePackSource field_25345; + @Shadow @Final private ResourcePackSource source; @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) { @@ -30,7 +28,7 @@ public class FileResourcePackProviderMixin { () -> new RescloneResourcePack(meta.zipPath.toFile(), meta.name), factory, ResourcePackProfile.InsertionPosition.TOP, - this.field_25345 + this.source ); if (resourcePackProfile != null) { consumer.accept(resourcePackProfile); diff --git a/src/main/java/io/gitlab/jfronny/resclone/util/ConfigLoader.java b/src/main/java/io/gitlab/jfronny/resclone/util/ConfigLoader.java index ea859a6..20a262f 100644 --- a/src/main/java/io/gitlab/jfronny/resclone/util/ConfigLoader.java +++ b/src/main/java/io/gitlab/jfronny/resclone/util/ConfigLoader.java @@ -12,7 +12,6 @@ import java.util.HashSet; import java.util.Set; public class ConfigLoader { - public static void load(RescloneApi api) { Path configPath = api.getConfigPath().resolve("config.json"); if (!Files.exists(configPath)) { @@ -43,5 +42,4 @@ public class ConfigLoader { e.printStackTrace(); } } - } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 4868cd4..2e8ef3c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,8 +23,7 @@ "resclone.mixins.json" ], "depends": { - "fabricloader": ">=0.10.8", - "fabric": "*", + "fabricloader": ">=0.12.0", "minecraft": "*" } }