chore: update to 1.20.5

.gitlab-ci.yml

@@ -1,28 +0,0 @@
-image: gradle:jdk16
-
-variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-
-before_script:
-  - export GRADLE_USER_HOME=`pwd`/.gradle
-
-build_test:
-  stage: deploy
-  script:
-    - gradle --build-cache assemble
-    - cp build/libs/* ./
-    - rm *-dev.jar
-    - mv *.jar latest.jar
-  artifacts:
-    paths:
-      - build/libs
-      - latest.jar
-  only:
-    - master
-
-deploy:
-  stage: deploy
-  when: manual
-  script:
-    - gradle --build-cache publishModrinth
-    - gradle --build-cache curseforge

.woodpecker.yml

@@ -0,0 +1 @@
+#link https://pages.frohnmeyer-wds.de/scripts/jfmod.yml

README.md

@@ -0,0 +1,8 @@
+DynRes uses an integrated web server to serve a resource pack directly from the server directory.
+It also modifies the server to specify that pack as the default (overwrites resource-pack and resource-pack-sha1 in server.properties).
+You can configure the port for the web server, the file to host and whether to provide a hash in the config.
+
+To use this mod on your server you need to place your resource pack in the configured place (default: server/resources.zip)
+and change baseLink in the config to your public address (what players will enter)
+
+This mod is only required on your server. If added to a client the only thing it will do is log some information about server connections

build.gradle

@@ -1,27 +0,0 @@
-apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
-
-repositories {
-    maven {
-        name = 'TerraformersMC'
-        url = 'https://maven.terraformersmc.com/'
-    }
-    maven { url 'https://jitpack.io' }
-}
-
-dependencies {
-    //to change the versions see the gradle.properties file
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-    download("https://gitlab.com/jfmods/LibJF/-/jobs/artifacts/master/raw/latest-dev.jar?job=build_test", "libjf")
-
-    modImplementation "com.terraformersmc:modmenu:2.+"
-
-    include modImplementation ('com.gitlab.jfmods:LibWeb:-SNAPSHOT') {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
-}

build.gradle.kts

@@ -0,0 +1,38 @@
+plugins {
+    id("jfmod") version "1.6-SNAPSHOT"
+}
+
+allprojects { group = "io.gitlab.jfronny" }
+base.archivesName = "dynres"
+
+jfMod {
+    minecraftVersion = "1.20.5"
+    yarn("build.1")
+    loaderVersion = "0.15.10"
+    libJfVersion = "3.15.4"
+    fabricApiVersion = "0.97.6+1.20.5"
+
+    modrinth {
+        projectId = "dynres"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+
+    curseforge {
+        projectId = "407012"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+}
+
+dependencies {
+    modImplementation("io.gitlab.jfronny.libjf:libjf-web-v1")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2")
+
+    // Dev env
+    modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1")
+    // for modmenu
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-key-binding-api-v1")
+}

gradle.properties

@@ -1,20 +0,0 @@
-# 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
-# Mod Properties
-mod_version=1.1.2
-maven_group=io.gitlab.jfronny
-archives_base_name=dynres
-#Dependencies
-fabric_version=0.34.9+1.17
-
-modrinth_id=v3lfX2LD
-modrinth_required_dependencies=dOW0jmMj
-modrinth_optional_dependencies=wRE7Emzz
-curseforge_id=407012
-curseforge_required_dependencies=libjf
-curseforge_optional_dependencies=modmenu

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

settings.gradle.kts

@@ -0,0 +1,9 @@
+pluginManagement {
+    repositories {
+        maven("https://maven.fabricmc.net/") // FabricMC
+        maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "dynres"

src/client/java/io/gitlab/jfronny/dynres/mixin/ClientCommonNetworkHandlerMixin.java

@@ -0,0 +1,33 @@
+package io.gitlab.jfronny.dynres.mixin;
+
+import io.gitlab.jfronny.dynres.DynRes;
+import net.minecraft.client.network.ClientCommonNetworkHandler;
+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.CallbackInfo;
+
+import java.net.URL;
+
+@Mixin(ClientCommonNetworkHandler.class)
+public abstract class ClientCommonNetworkHandlerMixin {
+    @Shadow @Nullable protected static URL getParsedResourcePackUrl(String url) {
+        throw new RuntimeException("Mixin not applied");
+    }
+
+    @Inject(at = @At("HEAD"), method = "onResourcePackSend(Lnet/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket;)V")
+    public void logResourcePackStatus(ResourcePackSendS2CPacket status, CallbackInfo info) {
+        DynRes.LOGGER.info("[RECEIVE] ResourcePackUrl={0}", status.url());
+        DynRes.LOGGER.info("[RECEIVE] ResourcePackHash={0}", status.hash());
+    }
+
+    @Redirect(method = "onResourcePackSend(Lnet/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientCommonNetworkHandler;getParsedResourcePackUrl(Ljava/lang/String;)Ljava/net/URL;"))
+    public URL logResourcePackStatus(String url) {
+        URL res = getParsedResourcePackUrl(url);
+        DynRes.LOGGER.info("[CHECK] ResourcePackUrlValid={0}", res != null);
+        return res;
+    }
+}

src/client/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java

@@ -1,6 +1,6 @@
 package io.gitlab.jfronny.dynres.mixin;
 
-import io.gitlab.jfronny.dynres.Logger;
+import io.gitlab.jfronny.dynres.DynRes;
 import net.minecraft.client.network.ServerInfo;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -11,6 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public class ServerInfoMixin {
     @Inject(at = @At("RETURN"), method = "getResourcePackPolicy()Lnet/minecraft/client/network/ServerInfo$ResourcePackPolicy;")
     public void getResPackState(CallbackInfoReturnable<ServerInfo.ResourcePackPolicy> info) {
-        Logger.l.info("[RECEIVE] ResourcePackStatus=" + info.getReturnValue());
+        DynRes.LOGGER.info("[RECEIVE] ResourcePackStatus={0}", info.getReturnValue());
     }
 }

src/client/resources/dynres.client.mixins.json

@@ -0,0 +1,15 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "io.gitlab.jfronny.dynres.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "client": [
+    "ClientCommonNetworkHandlerMixin",
+    "ServerInfoMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "mixins": [
+  ]
+}

src/main/java/io/gitlab/jfronny/dynres/Cfg.java

@@ -1,11 +1,14 @@
 package io.gitlab.jfronny.dynres;
 
-import io.gitlab.jfronny.libjf.config.Entry;
-import io.gitlab.jfronny.libjf.config.JfConfig;
+import io.gitlab.jfronny.libjf.config.api.v2.Entry;
+import io.gitlab.jfronny.libjf.config.api.v2.JfConfig;
 
-public class Cfg implements JfConfig {
-    @Entry
-    public static String resourcesFile = "resources.zip";
-    @Entry
-    public static boolean hashResources = false;
+@JfConfig(referencedConfigs = "libjf-web-v0")
+public class Cfg  {
+    @Entry public static String resourcesFile = "resources.zip";
+    @Entry public static boolean hashResources = false;
+
+    static {
+        JFC_Cfg.ensureInitialized();
+    }
 }

src/main/java/io/gitlab/jfronny/dynres/DebugClient.java

@@ -5,6 +5,6 @@ import net.fabricmc.api.ClientModInitializer;
 public class DebugClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-        Logger.l.info("[DynRes DebugClient] This mod is not needed on clients. All it does here is log additional info");
+        DynRes.LOGGER.info("[DynRes DebugClient] This mod is not needed on clients. All it does here is log additional info");
     }
 }

src/main/java/io/gitlab/jfronny/dynres/DynRes.java

@@ -1,36 +1,37 @@
 package io.gitlab.jfronny.dynres;
 
-import io.gitlab.jfronny.libjf.Libjf;
-import io.gitlab.jfronny.libweb.api.LibWebAPI;
-import io.gitlab.jfronny.libweb.api.LibWebInit;
+import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
+import io.gitlab.jfronny.libjf.web.api.v1.*;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.gui.FabricGuiEntry;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
-public class DynRes implements LibWebInit {
-    public static File resFile;
-    public static String resourceLink = "";
+public class DynRes implements WebEntrypoint {
+    public static final SystemLoggerPlus LOGGER = SystemLoggerPlus.forName("DynRes");
+    public static Path packFile;
+    public static String packUrl = "";
 
     static {
-        Libjf.registerConfig("dynres", Cfg.class);
-        resFile = new File(FabricLoader.getInstance().getGameDir().toFile(), Cfg.resourcesFile);
-        if (!resFile.isFile()) {
-            FabricGuiEntry.displayCriticalError(new FileNotFoundException("The file " + resFile + " does not exist in the game directory but is required"), true);
+        packFile = FabricLoader.getInstance().getGameDir().resolve(Cfg.resourcesFile);
+        if (!Files.exists(packFile)) {
+            if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
+                LOGGER.error("The resource file specified in your config could not be found. YOU MUST SPECIFY A RESOURCE PACK FOR IT TO BE SERVED!");
+            }
+            packFile = null;
         }
     }
 
     @Override
-    public void register(LibWebAPI api) {
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
+    public void register(WebServer api) {
+        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER && packFile != null) {
             try {
-                resourceLink = api.registerFile("/resources.zip", resFile.toPath(), !Cfg.hashResources);
-                Logger.l.info("Initialized DynRes at " + resourceLink);
+                packUrl = api.registerFile(PathSegment.of("resources.zip"), packFile, !Cfg.hashResources);
+                LOGGER.info("Initialized DynRes at {0}", packUrl);
             } catch (IOException e) {
-                e.printStackTrace();
+                LOGGER.error("Could not register DynRes resource pack", e);
             }
         }
     }

src/main/java/io/gitlab/jfronny/dynres/Logger.java

@@ -1,7 +0,0 @@
-package io.gitlab.jfronny.dynres;
-
-import org.apache.logging.log4j.LogManager;
-
-public class Logger {
-    public static final org.apache.logging.log4j.Logger l = LogManager.getLogger("DynRes");
-}

src/main/java/io/gitlab/jfronny/dynres/ServerPropertiesHandlerExt.java

@@ -1,5 +0,0 @@
-package io.gitlab.jfronny.dynres;
-
-public interface ServerPropertiesHandlerExt {
-    void applyChanges(boolean print);
-}

src/main/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java

@@ -1,31 +0,0 @@
-package io.gitlab.jfronny.dynres.mixin;
-
-import io.gitlab.jfronny.dynres.DynRes;
-import io.gitlab.jfronny.dynres.Logger;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.c2s.play.ResourcePackStatusC2SPacket;
-import net.minecraft.network.packet.s2c.play.ResourcePackSendS2CPacket;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(ClientPlayNetworkHandler.class)
-public class ClientPlayNetworkHandlerMixin {
-    @Inject(at = @At("HEAD"), method = "sendResourcePackStatus(Lnet/minecraft/network/packet/c2s/play/ResourcePackStatusC2SPacket$Status;)V")
-    public void logSentResourcePackStatus(ResourcePackStatusC2SPacket.Status packStatus, CallbackInfo info) {
-        Logger.l.info("[SEND] ResourcePackStatus=" + packStatus);
-    }
-
-    @Inject(at = @At("HEAD"), method = "onResourcePackSend(Lnet/minecraft/network/packet/s2c/play/ResourcePackSendS2CPacket;)V")
-    public void logResourcePackStatus(ResourcePackSendS2CPacket status, CallbackInfo info) {
-        Logger.l.info("[RECEIVE] ResourcePackUrl=" + status.getURL());
-        Logger.l.info("[RECEIVE] ResourcePackSha1=" + status.getSHA1());
-    }
-
-    @Inject(at = @At("RETURN"), method = "validateResourcePackUrl(Ljava/lang/String;)Z")
-    public void logUrlValid(String url, CallbackInfoReturnable<Boolean> info) {
-        Logger.l.info("[CHECK] ResourcePackUrlValid=" + info.getReturnValue());
-    }
-}

src/main/java/io/gitlab/jfronny/dynres/mixin/MinecraftServerMixin.java

@@ -1,14 +0,0 @@
-package io.gitlab.jfronny.dynres.mixin;
-
-import net.minecraft.server.MinecraftServer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(MinecraftServer.class)
-public class MinecraftServerMixin {
-    @Redirect(method = "loadWorldResourcePack()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;setResourcePack(Ljava/lang/String;Ljava/lang/String;)V"))
-    public void cancelResourcePackSet(MinecraftServer server, String url, String hash) {
-        // cancel
-    }
-}

src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java

@@ -2,53 +2,57 @@ package io.gitlab.jfronny.dynres.mixin;
 
 import io.gitlab.jfronny.dynres.Cfg;
 import io.gitlab.jfronny.dynres.DynRes;
-import io.gitlab.jfronny.dynres.Logger;
-import io.gitlab.jfronny.dynres.ServerPropertiesHandlerExt;
-import io.gitlab.jfronny.libjf.Libjf;
-import io.gitlab.jfronny.libweb.extra.LibWeb;
-import io.gitlab.jfronny.libweb.extra.WebPaths;
+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 org.apache.commons.codec.digest.DigestUtils;
-import org.spongepowered.asm.mixin.Final;
+import net.minecraft.text.Text;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
 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.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Optional;
+import java.util.UUID;
 
 @Mixin(ServerPropertiesHandler.class)
-public class ServerPropertiesHandlerMixin implements ServerPropertiesHandlerExt {
-    @Mutable @Final @Shadow public String resourcePackHash;
-    @Mutable @Final @Shadow public String resourcePackSha1;
-    @Mutable @Final @Shadow public String resourcePack;
-
-    @Inject(at = @At("RETURN"), method = "<init>(Ljava/util/Properties;)V")
-    public void init(CallbackInfo info) {
-        applyChanges(true);
+public abstract class ServerPropertiesHandlerMixin {
+    @Shadow @Nullable
+    private static Text parseResourcePackPrompt(String prompt) {
+        throw new IllegalStateException("Mixin not applied");
     }
 
-    @Override
-    public void applyChanges(boolean print) {
-        resourcePack = WebPaths.concat(LibWeb.api.getServerRoot(), "resources.zip");
-        if (print)
-            Logger.l.info("Pack link: " + resourcePack);
-        resourcePackSha1 = "";
-        Libjf.registerConfig("dynres", Cfg.class);
-        if (Cfg.hashResources) {
-            try {
-                FileInputStream fs = new FileInputStream(DynRes.resFile);
-                resourcePackSha1 = DigestUtils.sha1Hex(fs);
-                if (print)
-                    Logger.l.info("Set hash to " + resourcePackSha1);
-                fs.close();
-            } catch (IOException e) {
-                Logger.l.error("Failed to get hash, continuing with empty", e);
+    @Inject(method = "getServerResourcePackProperties(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Ljava/util/Optional;", at = @At("HEAD"), cancellable = true)
+    private static void getServerResourcePackProperties(String id, String url, String sha1, String hash, boolean required, String prompt, CallbackInfoReturnable<Optional<MinecraftServer.ServerResourcePackProperties>> cir) {
+        if (DynRes.packFile != null) {
+            sha1 = "";
+            if (Cfg.hashResources) {
+                try {
+                    StringBuilder result = new StringBuilder();
+                    for (byte b : MessageDigest.getInstance("SHA-1").digest(Files.readAllBytes(DynRes.packFile))) {
+                        result.append(Integer.toString((b & 0xff) + 0x100, 16).substring(1));
+                    }
+                    sha1 = result.toString();
+                    DynRes.LOGGER.info("Set hash to {0}", sha1);
+                } catch (IOException | NoSuchAlgorithmException e) {
+                    DynRes.LOGGER.error("Failed to get hash, continuing with empty", e);
+                }
             }
+            url = WebPaths.concat(WebServer.getInstance().getServerRoot(), "resources.zip");
+            cir.setReturnValue(Optional.of(new MinecraftServer.ServerResourcePackProperties(
+                    UUID.nameUUIDFromBytes(url.getBytes(StandardCharsets.UTF_8)),
+                    url,
+                    sha1,
+                    required,
+                    parseResourcePackPrompt(prompt)
+            )));
         }
-        resourcePackHash = resourcePackSha1;
     }
 }

src/main/resources/dynres.mixins.json

@@ -2,14 +2,9 @@
   "required": true,
   "minVersion": "0.8",
   "package": "io.gitlab.jfronny.dynres.mixin",
-  "compatibilityLevel": "JAVA_8",
-  "client": [
-    "ClientPlayNetworkHandlerMixin",
-    "ServerInfoMixin"
-  ],
+  "compatibilityLevel": "JAVA_17",
   "server": [
-    "ServerPropertiesHandlerMixin",
-    "MinecraftServerMixin"
+    "ServerPropertiesHandlerMixin"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/fabric.mod.json

@@ -3,27 +3,37 @@
   "id": "dynres",
   "version": "${version}",
   "name": "DynRes",
-  "description": "Host resourcepacks directly in-server",
-  "authors": [
-    "JFronny"
-  ],
+  "description": "Host a resource pack directly on your server",
+  "authors": ["JFronny"],
   "contact": {
-    "website": "https://jfronny.gitlab.io",
-    "repo": "https://www.gitlab.com/jfmods/DynRes"
+    "email": "projects.contact@frohnmeyer-wds.de",
+    "homepage": "https://jfronny.gitlab.io",
+    "issues": "https://git.frohnmeyer-wds.de/JfMods/DynRes/issues",
+    "sources": "https://git.frohnmeyer-wds.de/JfMods/DynRes"
   },
   "license": "MIT",
   "icon": "assets/dynres/icon.png",
   "environment": "*",
   "entrypoints": {
-    "libweb": ["io.gitlab.jfronny.dynres.DynRes"],
+    "libjf:web": ["io.gitlab.jfronny.dynres.DynRes"],
     "client": ["io.gitlab.jfronny.dynres.DebugClient"],
-    "libjf:config": ["io.gitlab.jfronny.dynres.Cfg"]
+    "libjf:config": ["io.gitlab.jfronny.dynres.JFC_Cfg"]
   },
   "mixins": [
-    "dynres.mixins.json"
+    "dynres.mixins.json",
+    {
+      "config": "dynres.client.mixins.json",
+      "environment": "client"
+    }
   ],
   "depends": {
-    "fabricloader": ">=0.9.3+build.207",
-    "minecraft": "*"
+    "fabricloader": ">=0.12.0",
+    "minecraft": "*",
+    "libjf-config-core-v1": ">=2.7.0"
+  },
+  "custom": {
+    "libjf": {
+      "web": true
+    }
   }
 }