Compare commits
No commits in common. "master" and "b1.2.0" have entirely different histories.
2
.gitlab-ci.yml
Normal file
2
.gitlab-ci.yml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
include:
|
||||||
|
- remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml'
|
@ -1 +0,0 @@
|
|||||||
#link https://pages.frohnmeyer-wds.de/scripts/jfmod.yml
|
|
@ -1,8 +0,0 @@
|
|||||||
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
|
|
12
build.gradle
Normal file
12
build.gradle
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
||||||
|
|
||||||
|
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:3.0.0"
|
||||||
|
}
|
@ -1,38 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("jfmod") version "1.6-SNAPSHOT"
|
|
||||||
}
|
|
||||||
|
|
||||||
allprojects { group = "io.gitlab.jfronny" }
|
|
||||||
base.archivesName = "dynres"
|
|
||||||
|
|
||||||
jfMod {
|
|
||||||
minecraftVersion = "1.21"
|
|
||||||
yarn("build.1")
|
|
||||||
loaderVersion = "0.15.11"
|
|
||||||
libJfVersion = "3.16.0"
|
|
||||||
fabricApiVersion = "0.100.1+1.21"
|
|
||||||
|
|
||||||
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:11.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")
|
|
||||||
}
|
|
18
gradle.properties
Normal file
18
gradle.properties
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Done to increase the memory available to gradle.
|
||||||
|
org.gradle.jvmargs=-Xmx1G
|
||||||
|
# Fabric Properties
|
||||||
|
# check these on https://fabricmc.net/versions.html
|
||||||
|
minecraft_version=1.18
|
||||||
|
yarn_mappings=build.1
|
||||||
|
loader_version=0.12.6
|
||||||
|
# Mod Properties
|
||||||
|
maven_group=io.gitlab.jfronny
|
||||||
|
archives_base_name=dynres
|
||||||
|
#Dependencies
|
||||||
|
fabric_version=0.43.1+1.18
|
||||||
|
jfapi_version=2.2.0
|
||||||
|
|
||||||
|
modrinth_id=v3lfX2LD
|
||||||
|
modrinth_optional_dependencies=JPP6w2U1
|
||||||
|
curseforge_id=407012
|
||||||
|
curseforge_optional_dependencies=modmenu
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
5
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
5
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
234
gradlew
vendored
Normal file
234
gradlew
vendored
Normal file
@ -0,0 +1,234 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
# 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 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
|
||||||
|
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
|
||||||
|
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
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
|
||||||
|
|
||||||
|
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 ;; #(
|
||||||
|
MSYS* | 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" && ! "$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
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
# 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" "$@"
|
89
gradlew.bat
vendored
Normal file
89
gradlew.bat
vendored
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
@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
|
@ -1,9 +0,0 @@
|
|||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
maven("https://maven.fabricmc.net/") // FabricMC
|
|
||||||
maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts
|
|
||||||
gradlePluginPortal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.name = "dynres"
|
|
@ -1,33 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"required": true,
|
|
||||||
"minVersion": "0.8",
|
|
||||||
"package": "io.gitlab.jfronny.dynres.mixin",
|
|
||||||
"compatibilityLevel": "JAVA_17",
|
|
||||||
"client": [
|
|
||||||
"ClientCommonNetworkHandlerMixin",
|
|
||||||
"ServerInfoMixin"
|
|
||||||
],
|
|
||||||
"injectors": {
|
|
||||||
"defaultRequire": 1
|
|
||||||
},
|
|
||||||
"mixins": [
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,14 +1,11 @@
|
|||||||
package io.gitlab.jfronny.dynres;
|
package io.gitlab.jfronny.dynres;
|
||||||
|
|
||||||
import io.gitlab.jfronny.libjf.config.api.v2.Entry;
|
import io.gitlab.jfronny.libjf.config.api.Entry;
|
||||||
import io.gitlab.jfronny.libjf.config.api.v2.JfConfig;
|
import io.gitlab.jfronny.libjf.config.api.JfConfig;
|
||||||
|
|
||||||
@JfConfig(referencedConfigs = "libjf-web-v0")
|
public class Cfg implements JfConfig {
|
||||||
public class Cfg {
|
@Entry
|
||||||
@Entry public static String resourcesFile = "resources.zip";
|
public static String resourcesFile = "resources.zip";
|
||||||
@Entry public static boolean hashResources = false;
|
@Entry
|
||||||
|
public static boolean hashResources = false;
|
||||||
static {
|
|
||||||
JFC_Cfg.ensureInitialized();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,37 +1,38 @@
|
|||||||
package io.gitlab.jfronny.dynres;
|
package io.gitlab.jfronny.dynres;
|
||||||
|
|
||||||
import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
|
import io.gitlab.jfronny.libjf.web.api.WebInit;
|
||||||
import io.gitlab.jfronny.libjf.web.api.v1.*;
|
import io.gitlab.jfronny.libjf.web.api.WebServer;
|
||||||
import net.fabricmc.api.EnvType;
|
import net.fabricmc.api.EnvType;
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
||||||
public class DynRes implements WebEntrypoint {
|
public class DynRes implements WebInit {
|
||||||
public static final SystemLoggerPlus LOGGER = SystemLoggerPlus.forName("DynRes");
|
public static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger("DynRes");
|
||||||
public static Path packFile;
|
public static Path resFile;
|
||||||
public static String packUrl = "";
|
public static String resourceLink = "";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
packFile = FabricLoader.getInstance().getGameDir().resolve(Cfg.resourcesFile);
|
resFile = FabricLoader.getInstance().getGameDir().resolve(Cfg.resourcesFile);
|
||||||
if (!Files.exists(packFile)) {
|
if (!Files.exists(resFile)) {
|
||||||
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
|
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!");
|
LOGGER.error("The resource file specified in your config could not be found. YOU MUST SPECIFY A RESOURCE PACK FOR IT TO BE SERVED!", new Exception("File not found"));
|
||||||
}
|
}
|
||||||
packFile = null;
|
resFile = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void register(WebServer api) {
|
public void register(WebServer api) {
|
||||||
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER && packFile != null) {
|
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER && resFile != null) {
|
||||||
try {
|
try {
|
||||||
packUrl = api.registerFile(PathSegment.of("resources.zip"), packFile, !Cfg.hashResources);
|
resourceLink = api.registerFile("/resources.zip", resFile, !Cfg.hashResources);
|
||||||
LOGGER.info("Initialized DynRes at {0}", packUrl);
|
LOGGER.info("Initialized DynRes at " + resourceLink);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
LOGGER.error("Could not register DynRes resource pack", e);
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,30 @@
|
|||||||
|
package io.gitlab.jfronny.dynres.mixin;
|
||||||
|
|
||||||
|
import io.gitlab.jfronny.dynres.DynRes;
|
||||||
|
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) {
|
||||||
|
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) {
|
||||||
|
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<Boolean> info) {
|
||||||
|
DynRes.LOGGER.info("[CHECK] ResourcePackUrlValid=" + info.getReturnValue());
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,14 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
@ -11,6 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|||||||
public class ServerInfoMixin {
|
public class ServerInfoMixin {
|
||||||
@Inject(at = @At("RETURN"), method = "getResourcePackPolicy()Lnet/minecraft/client/network/ServerInfo$ResourcePackPolicy;")
|
@Inject(at = @At("RETURN"), method = "getResourcePackPolicy()Lnet/minecraft/client/network/ServerInfo$ResourcePackPolicy;")
|
||||||
public void getResPackState(CallbackInfoReturnable<ServerInfo.ResourcePackPolicy> info) {
|
public void getResPackState(CallbackInfoReturnable<ServerInfo.ResourcePackPolicy> info) {
|
||||||
DynRes.LOGGER.info("[RECEIVE] ResourcePackStatus={0}", info.getReturnValue());
|
DynRes.LOGGER.info("[RECEIVE] ResourcePackStatus=" + info.getReturnValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -2,57 +2,43 @@ package io.gitlab.jfronny.dynres.mixin;
|
|||||||
|
|
||||||
import io.gitlab.jfronny.dynres.Cfg;
|
import io.gitlab.jfronny.dynres.Cfg;
|
||||||
import io.gitlab.jfronny.dynres.DynRes;
|
import io.gitlab.jfronny.dynres.DynRes;
|
||||||
import io.gitlab.jfronny.libjf.web.api.v1.WebServer;
|
import io.gitlab.jfronny.libjf.web.api.WebServer;
|
||||||
import io.gitlab.jfronny.libjf.web.impl.util.WebPaths;
|
import io.gitlab.jfronny.libjf.web.impl.util.WebPaths;
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.dedicated.ServerPropertiesHandler;
|
import net.minecraft.server.dedicated.ServerPropertiesHandler;
|
||||||
import net.minecraft.text.Text;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Mutable;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.io.InputStream;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.security.MessageDigest;
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@Mixin(ServerPropertiesHandler.class)
|
@Mixin(ServerPropertiesHandler.class)
|
||||||
public abstract class ServerPropertiesHandlerMixin {
|
public class ServerPropertiesHandlerMixin {
|
||||||
@Shadow @Nullable
|
@Mutable @Final @Shadow public String resourcePackHash;
|
||||||
private static Text parseResourcePackPrompt(String prompt) {
|
@Mutable @Final @Shadow public String resourcePackSha1;
|
||||||
throw new IllegalStateException("Mixin not applied");
|
@Mutable @Final @Shadow public String resourcePack;
|
||||||
}
|
|
||||||
|
|
||||||
@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)
|
@Inject(at = @At("RETURN"), method = "<init>(Ljava/util/Properties;)V")
|
||||||
private static void getServerResourcePackProperties(String id, String url, String sha1, String hash, boolean required, String prompt, CallbackInfoReturnable<Optional<MinecraftServer.ServerResourcePackProperties>> cir) {
|
public void init(CallbackInfo info) {
|
||||||
if (DynRes.packFile != null) {
|
if (DynRes.resFile != null) {
|
||||||
sha1 = "";
|
resourcePack = WebPaths.concat(WebServer.getInstance().getServerRoot(), "resources.zip");
|
||||||
|
DynRes.LOGGER.info("Pack link: " + resourcePack);
|
||||||
|
resourcePackSha1 = "";
|
||||||
if (Cfg.hashResources) {
|
if (Cfg.hashResources) {
|
||||||
try {
|
try (InputStream fs = Files.newInputStream(DynRes.resFile)) {
|
||||||
StringBuilder result = new StringBuilder();
|
resourcePackSha1 = DigestUtils.sha1Hex(fs);
|
||||||
for (byte b : MessageDigest.getInstance("SHA-1").digest(Files.readAllBytes(DynRes.packFile))) {
|
DynRes.LOGGER.info("Set hash to " + resourcePackSha1);
|
||||||
result.append(Integer.toString((b & 0xff) + 0x100, 16).substring(1));
|
} catch (IOException e) {
|
||||||
}
|
|
||||||
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);
|
DynRes.LOGGER.error("Failed to get hash, continuing with empty", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
url = WebPaths.concat(WebServer.getInstance().getServerRoot(), "resources.zip");
|
resourcePackHash = resourcePackSha1;
|
||||||
cir.setReturnValue(Optional.of(new MinecraftServer.ServerResourcePackProperties(
|
|
||||||
UUID.nameUUIDFromBytes(url.getBytes(StandardCharsets.UTF_8)),
|
|
||||||
url,
|
|
||||||
sha1,
|
|
||||||
required,
|
|
||||||
parseResourcePackPrompt(prompt)
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 3.0 KiB |
@ -3,8 +3,13 @@
|
|||||||
"minVersion": "0.8",
|
"minVersion": "0.8",
|
||||||
"package": "io.gitlab.jfronny.dynres.mixin",
|
"package": "io.gitlab.jfronny.dynres.mixin",
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_17",
|
||||||
|
"client": [
|
||||||
|
"ClientPlayNetworkHandlerMixin",
|
||||||
|
"ServerInfoMixin"
|
||||||
|
],
|
||||||
"server": [
|
"server": [
|
||||||
"ServerPropertiesHandlerMixin"
|
"ServerPropertiesHandlerMixin",
|
||||||
|
"MinecraftServerMixin"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
@ -3,13 +3,13 @@
|
|||||||
"id": "dynres",
|
"id": "dynres",
|
||||||
"version": "${version}",
|
"version": "${version}",
|
||||||
"name": "DynRes",
|
"name": "DynRes",
|
||||||
"description": "Host a resource pack directly on your server",
|
"description": "Host resourcepacks directly in-server",
|
||||||
"authors": ["JFronny"],
|
"authors": [
|
||||||
|
"JFronny"
|
||||||
|
],
|
||||||
"contact": {
|
"contact": {
|
||||||
"email": "projects.contact@frohnmeyer-wds.de",
|
"website": "https://jfronny.gitlab.io",
|
||||||
"homepage": "https://jfronny.gitlab.io",
|
"repo": "https://www.gitlab.com/jfmods/DynRes"
|
||||||
"issues": "https://git.frohnmeyer-wds.de/JfMods/DynRes/issues",
|
|
||||||
"sources": "https://git.frohnmeyer-wds.de/JfMods/DynRes"
|
|
||||||
},
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"icon": "assets/dynres/icon.png",
|
"icon": "assets/dynres/icon.png",
|
||||||
@ -17,19 +17,15 @@
|
|||||||
"entrypoints": {
|
"entrypoints": {
|
||||||
"libjf:web": ["io.gitlab.jfronny.dynres.DynRes"],
|
"libjf:web": ["io.gitlab.jfronny.dynres.DynRes"],
|
||||||
"client": ["io.gitlab.jfronny.dynres.DebugClient"],
|
"client": ["io.gitlab.jfronny.dynres.DebugClient"],
|
||||||
"libjf:config": ["io.gitlab.jfronny.dynres.JFC_Cfg"]
|
"libjf:config": ["io.gitlab.jfronny.dynres.Cfg"]
|
||||||
},
|
},
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"dynres.mixins.json",
|
"dynres.mixins.json"
|
||||||
{
|
|
||||||
"config": "dynres.client.mixins.json",
|
|
||||||
"environment": "client"
|
|
||||||
}
|
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.12.0",
|
"fabricloader": ">=0.12.0",
|
||||||
"minecraft": "*",
|
"minecraft": "*",
|
||||||
"libjf-config-core-v1": ">=2.7.0"
|
"libjf-config-v0": ">=2.1.2"
|
||||||
},
|
},
|
||||||
"custom": {
|
"custom": {
|
||||||
"libjf": {
|
"libjf": {
|
||||||
|
Loading…
Reference in New Issue
Block a user