diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d27849f..4b24385 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: gradle:jdk16 +image: gradle:jdk17 variables: GRADLE_OPTS: "-Dorg.gradle.daemon=false" @@ -6,23 +6,27 @@ variables: before_script: - export GRADLE_USER_HOME=`pwd`/.gradle +stages: + - build + - deploy + build_test: - stage: deploy + stage: build script: - - gradle --build-cache assemble + - gradle --build-cache build - cp build/libs/* ./ - - rm *-dev.jar + - mv *-dev.jar dev.zip - mv *.jar latest.jar + - mv dev.zip latest-dev.jar artifacts: paths: - build/libs - latest.jar - only: - - master + - latest-dev.jar deploy: + rules: + - if: $CI_COMMIT_TAG && '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^master/' stage: deploy - when: manual script: - - gradle --build-cache publishModrinth - - gradle --build-cache curseforge + - gradle --build-cache build curseforge modrinth diff --git a/build.gradle b/build.gradle index ea0245f..e407b9d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,9 @@ repositories { name = 'TerraformersMC' url = 'https://maven.terraformersmc.com/' } - maven { url 'https://jitpack.io' } + maven { + url "https://gitlab.com/api/v4/projects/25805200/packages/maven" + } } dependencies { @@ -17,11 +19,10 @@ dependencies { // 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") + include modImplementation("io.gitlab.jfronny.libjf:libjf-web-v0:${project.jfapi_version}") + include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}") + include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}") + include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}") - modImplementation "com.terraformersmc:modmenu:2.+" - - include modImplementation ('com.gitlab.jfmods:LibWeb:-SNAPSHOT') { - exclude(group: "net.fabricmc.fabric-api") - } + modImplementation "com.terraformersmc:modmenu:2.0.7" } diff --git a/gradle.properties b/gradle.properties index d0a50a0..b4b9eb0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,17 @@ # 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.63 +loader_version=0.12.5 # Mod Properties mod_version=1.1.2 maven_group=io.gitlab.jfronny archives_base_name=dynres #Dependencies -fabric_version=0.34.9+1.17 +fabric_version=0.42.1+1.17 +jfapi_version=2.1.3-406390708 modrinth_id=v3lfX2LD modrinth_required_dependencies=dOW0jmMj diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +140,95 @@ 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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" 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, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# 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" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/src/main/java/io/gitlab/jfronny/dynres/Cfg.java b/src/main/java/io/gitlab/jfronny/dynres/Cfg.java index 1abd333..46a5abb 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.Entry; -import io.gitlab.jfronny.libjf.config.JfConfig; +import io.gitlab.jfronny.libjf.config.api.Entry; +import io.gitlab.jfronny.libjf.config.api.JfConfig; public class Cfg implements JfConfig { @Entry diff --git a/src/main/java/io/gitlab/jfronny/dynres/DebugClient.java b/src/main/java/io/gitlab/jfronny/dynres/DebugClient.java index 9f1259d..649fc8d 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/DebugClient.java +++ b/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"); } } diff --git a/src/main/java/io/gitlab/jfronny/dynres/DynRes.java b/src/main/java/io/gitlab/jfronny/dynres/DynRes.java index 87bffbc..9243450 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/DynRes.java +++ b/src/main/java/io/gitlab/jfronny/dynres/DynRes.java @@ -1,16 +1,18 @@ package io.gitlab.jfronny.dynres; -import io.gitlab.jfronny.libweb.api.LibWebAPI; -import io.gitlab.jfronny.libweb.api.LibWebInit; +import io.gitlab.jfronny.libjf.web.api.WebInit; +import io.gitlab.jfronny.libjf.web.api.WebServer; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; -import net.fabricmc.loader.gui.FabricGuiEntry; +import net.fabricmc.loader.impl.gui.FabricGuiEntry; +import org.apache.logging.log4j.LogManager; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -public class DynRes implements LibWebInit { +public class DynRes implements WebInit { + public static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger("DynRes"); public static File resFile; public static String resourceLink = ""; @@ -22,11 +24,11 @@ public class DynRes implements LibWebInit { } @Override - public void register(LibWebAPI api) { + public void register(WebServer api) { if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) { try { resourceLink = api.registerFile("/resources.zip", resFile.toPath(), !Cfg.hashResources); - Logger.l.info("Initialized DynRes at " + resourceLink); + LOGGER.info("Initialized DynRes at " + resourceLink); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/io/gitlab/jfronny/dynres/Logger.java b/src/main/java/io/gitlab/jfronny/dynres/Logger.java deleted file mode 100644 index 8c7819c..0000000 --- a/src/main/java/io/gitlab/jfronny/dynres/Logger.java +++ /dev/null @@ -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"); -} diff --git a/src/main/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java index 05b7e80..672df4a 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java @@ -1,7 +1,6 @@ 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; @@ -15,17 +14,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; 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); + DynRes.LOGGER.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()); + DynRes.LOGGER.info("[RECEIVE] ResourcePackUrl=" + status.getURL()); + DynRes.LOGGER.info("[RECEIVE] ResourcePackSha1=" + status.getSHA1()); } @Inject(at = @At("RETURN"), method = "validateResourcePackUrl(Ljava/lang/String;)Z") public void logUrlValid(String url, CallbackInfoReturnable info) { - Logger.l.info("[CHECK] ResourcePackUrlValid=" + info.getReturnValue()); + DynRes.LOGGER.info("[CHECK] ResourcePackUrlValid=" + info.getReturnValue()); } } diff --git a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java index c2581ab..20c25fa 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java +++ b/src/main/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 info) { - Logger.l.info("[RECEIVE] ResourcePackStatus=" + info.getReturnValue()); + DynRes.LOGGER.info("[RECEIVE] ResourcePackStatus=" + info.getReturnValue()); } } 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 80db3ee..a434fe5 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java +++ b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java @@ -2,10 +2,10 @@ 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.libweb.extra.LibWeb; -import io.gitlab.jfronny.libweb.extra.WebPaths; +import io.gitlab.jfronny.libjf.web.api.WebServer; +import io.gitlab.jfronny.libjf.web.impl.JfWeb; +import io.gitlab.jfronny.libjf.web.impl.util.WebPaths; import net.minecraft.server.dedicated.ServerPropertiesHandler; import org.apache.commons.codec.digest.DigestUtils; import org.spongepowered.asm.mixin.Final; @@ -32,19 +32,19 @@ public class ServerPropertiesHandlerMixin implements ServerPropertiesHandlerExt @Override public void applyChanges(boolean print) { - resourcePack = WebPaths.concat(LibWeb.api.getServerRoot(), "resources.zip"); + resourcePack = WebPaths.concat(WebServer.getInstance().getServerRoot(), "resources.zip"); if (print) - Logger.l.info("Pack link: " + resourcePack); + DynRes.LOGGER.info("Pack link: " + resourcePack); resourcePackSha1 = ""; if (Cfg.hashResources) { try { FileInputStream fs = new FileInputStream(DynRes.resFile); resourcePackSha1 = DigestUtils.sha1Hex(fs); if (print) - Logger.l.info("Set hash to " + resourcePackSha1); + DynRes.LOGGER.info("Set hash to " + resourcePackSha1); fs.close(); } catch (IOException e) { - Logger.l.error("Failed to get hash, continuing with empty", e); + DynRes.LOGGER.error("Failed to get hash, continuing with empty", e); } } resourcePackHash = resourcePackSha1; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f38cbb8..1af91e6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,7 +15,7 @@ "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"] }, @@ -23,8 +23,13 @@ "dynres.mixins.json" ], "depends": { - "fabricloader": ">=0.9.3+build.207", + "fabricloader": ">=0.12.0", "minecraft": "*", - "libjf": ">=1.2.0" + "libjf-config-v0": ">=2.1.2" + }, + "custom": { + "libjf": { + "web": true + } } }