From 7af7faa24d3989baaf25ddea373778738f085ed6 Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 22 Sep 2023 20:59:35 +0200 Subject: [PATCH] chore: update to 1.20.2 --- build.gradle.kts | 16 +++++----- .../mixin/ClientPlayNetworkHandlerMixin.java | 17 +++++----- .../java/io/gitlab/jfronny/dynres/Cfg.java | 4 +-- .../java/io/gitlab/jfronny/dynres/DynRes.java | 7 ++-- .../mixin/ServerPropertiesHandlerMixin.java | 32 +++++++++++-------- 5 files changed, 40 insertions(+), 36 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bdde858..580ae8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,12 +5,12 @@ plugins { allprojects { group = "io.gitlab.jfronny" } base.archivesName = "dynres" -val fabricVersion = "0.83.0+1.20" +val fabricVersion = "0.89.1+1.20.2" jfMod { - minecraftVersion = "1.20.1" - yarn("build.9") - loaderVersion = "0.14.21" - libJfVersion = "3.10.2" + minecraftVersion = "1.20.2" + yarn("build.1") + loaderVersion = "0.14.22" + libJfVersion = "3.13.1" modrinth { projectId = "dynres" @@ -26,9 +26,9 @@ jfMod { } dependencies { - modImplementation("io.gitlab.jfronny.libjf:libjf-web-v0:${jfMod.libJfVersion.get()}") - modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${jfMod.libJfVersion.get()}") + modImplementation("io.gitlab.jfronny.libjf:libjf-web-v1:${jfMod.libJfVersion.get()}") + modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}") // Dev env - modLocalRuntime("com.terraformersmc:modmenu:7.1.0") + modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2") } diff --git a/src/client/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java b/src/client/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java index 5011804..82dd4a3 100644 --- a/src/client/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/client/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java @@ -1,15 +1,16 @@ package io.gitlab.jfronny.dynres.mixin; -import io.gitlab.jfronny.dynres.*; -import net.minecraft.client.network.*; -import net.minecraft.network.packet.c2s.play.*; -import net.minecraft.network.packet.s2c.play.*; -import org.jetbrains.annotations.*; -import org.spongepowered.asm.mixin.*; +import io.gitlab.jfronny.dynres.DynRes; +import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.network.packet.c2s.common.ResourcePackStatusC2SPacket; +import net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.*; -import org.spongepowered.asm.mixin.injection.callback.*; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.net.*; +import java.net.URL; @Mixin(ClientPlayNetworkHandler.class) public abstract class ClientPlayNetworkHandlerMixin { diff --git a/src/main/java/io/gitlab/jfronny/dynres/Cfg.java b/src/main/java/io/gitlab/jfronny/dynres/Cfg.java index 7b799b2..dced877 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/Cfg.java +++ b/src/main/java/io/gitlab/jfronny/dynres/Cfg.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.dynres; -import io.gitlab.jfronny.libjf.config.api.v1.Entry; -import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; +import io.gitlab.jfronny.libjf.config.api.v2.Entry; +import io.gitlab.jfronny.libjf.config.api.v2.JfConfig; @JfConfig(referencedConfigs = "libjf-web-v0") public class Cfg { diff --git a/src/main/java/io/gitlab/jfronny/dynres/DynRes.java b/src/main/java/io/gitlab/jfronny/dynres/DynRes.java index 77c897d..016cc41 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/DynRes.java +++ b/src/main/java/io/gitlab/jfronny/dynres/DynRes.java @@ -1,7 +1,6 @@ package io.gitlab.jfronny.dynres; -import io.gitlab.jfronny.libjf.web.api.WebInit; -import io.gitlab.jfronny.libjf.web.api.WebServer; +import io.gitlab.jfronny.libjf.web.api.v1.*; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; import org.slf4j.Logger; @@ -11,7 +10,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -public class DynRes implements WebInit { +public class DynRes implements WebEntrypoint { public static final Logger LOGGER = LoggerFactory.getLogger("DynRes"); public static Path packFile; public static String packUrl = ""; @@ -30,7 +29,7 @@ public class DynRes implements WebInit { public void register(WebServer api) { if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER && packFile != null) { try { - packUrl = api.registerFile("/resources.zip", packFile, !Cfg.hashResources); + packUrl = api.registerFile(PathSegment.of("resources.zip"), packFile, !Cfg.hashResources); LOGGER.info("Initialized DynRes at " + packUrl); } catch (IOException e) { e.printStackTrace(); 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 38db322..2b68331 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java +++ b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java @@ -1,20 +1,24 @@ package io.gitlab.jfronny.dynres.mixin; -import io.gitlab.jfronny.dynres.*; -import io.gitlab.jfronny.libjf.web.api.*; -import io.gitlab.jfronny.libjf.web.impl.util.*; -import net.minecraft.server.*; -import net.minecraft.server.dedicated.*; -import net.minecraft.text.*; -import org.jetbrains.annotations.*; -import org.spongepowered.asm.mixin.*; -import org.spongepowered.asm.mixin.injection.*; -import org.spongepowered.asm.mixin.injection.callback.*; +import io.gitlab.jfronny.dynres.Cfg; +import io.gitlab.jfronny.dynres.DynRes; +import io.gitlab.jfronny.libjf.web.api.v1.WebServer; +import io.gitlab.jfronny.libjf.web.impl.util.WebPaths; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.dedicated.ServerPropertiesHandler; +import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.io.*; -import java.nio.file.*; -import java.security.*; -import java.util.*; +import java.io.IOException; +import java.nio.file.Files; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Optional; @Mixin(ServerPropertiesHandler.class) public abstract class ServerPropertiesHandlerMixin {