From eb63e87717a338bb22b064a720adeac277f7cab9 Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 8 Jun 2021 20:47:48 +0200 Subject: [PATCH] 1.17 release --- gradle.properties | 8 ++++---- .../dynres/mixin/ServerPropertiesHandlerMixin.java | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 642e735..d0a50a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.17-pre3 +minecraft_version=1.17 yarn_mappings=build.1 loader_version=0.11.3 # Mod Properties @@ -10,11 +10,11 @@ mod_version=1.1.2 maven_group=io.gitlab.jfronny archives_base_name=dynres #Dependencies -fabric_version=0.34.8+1.17 +fabric_version=0.34.9+1.17 modrinth_id=v3lfX2LD -modrinth_required_dependencies=TUqoYNVF -modrinth_optional_dependencies=EDbIonje +modrinth_required_dependencies=dOW0jmMj +modrinth_optional_dependencies=wRE7Emzz curseforge_id=407012 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu diff --git a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java index 0a571c0..1c6c7af 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java +++ b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java @@ -8,7 +8,6 @@ import io.gitlab.jfronny.libjf.Libjf; import io.gitlab.jfronny.libweb.extra.LibWeb; import io.gitlab.jfronny.libweb.extra.WebPaths; import net.minecraft.server.dedicated.ServerPropertiesHandler; -import net.minecraft.util.registry.DynamicRegistryManager; import org.apache.commons.codec.digest.DigestUtils; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -20,7 +19,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.io.FileInputStream; import java.io.IOException; -import java.util.Properties; @Mixin(ServerPropertiesHandler.class) public class ServerPropertiesHandlerMixin implements ServerPropertiesHandlerExt { @@ -28,8 +26,8 @@ public class ServerPropertiesHandlerMixin implements ServerPropertiesHandlerExt @Mutable @Final @Shadow public String resourcePackSha1; @Mutable @Final @Shadow public String resourcePack; - @Inject(at = @At("RETURN"), method = "(Ljava/util/Properties;Lnet/minecraft/util/registry/DynamicRegistryManager;)V") - public void init(Properties properties, DynamicRegistryManager dynamicRegistryManager, CallbackInfo info) { + @Inject(at = @At("RETURN"), method = "(Ljava/util/Properties;)V") + public void init(CallbackInfo info) { applyChanges(true); }