Initial commit
This commit is contained in:
commit
0a170a36a6
|
@ -0,0 +1,118 @@
|
||||||
|
# User-specific stuff
|
||||||
|
.idea/
|
||||||
|
|
||||||
|
*.iml
|
||||||
|
*.ipr
|
||||||
|
*.iws
|
||||||
|
|
||||||
|
# IntelliJ
|
||||||
|
out/
|
||||||
|
# mpeltonen/sbt-idea plugin
|
||||||
|
.idea_modules/
|
||||||
|
|
||||||
|
# JIRA plugin
|
||||||
|
atlassian-ide-plugin.xml
|
||||||
|
|
||||||
|
# Compiled class file
|
||||||
|
*.class
|
||||||
|
|
||||||
|
# Log file
|
||||||
|
*.log
|
||||||
|
|
||||||
|
# BlueJ files
|
||||||
|
*.ctxt
|
||||||
|
|
||||||
|
# Package Files #
|
||||||
|
*.jar
|
||||||
|
*.war
|
||||||
|
*.nar
|
||||||
|
*.ear
|
||||||
|
*.zip
|
||||||
|
*.tar.gz
|
||||||
|
*.rar
|
||||||
|
|
||||||
|
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||||
|
hs_err_pid*
|
||||||
|
|
||||||
|
*~
|
||||||
|
|
||||||
|
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||||
|
.fuse_hidden*
|
||||||
|
|
||||||
|
# KDE directory preferences
|
||||||
|
.directory
|
||||||
|
|
||||||
|
# Linux trash folder which might appear on any partition or disk
|
||||||
|
.Trash-*
|
||||||
|
|
||||||
|
# .nfs files are created when an open file is removed but is still being accessed
|
||||||
|
.nfs*
|
||||||
|
|
||||||
|
# General
|
||||||
|
.DS_Store
|
||||||
|
.AppleDouble
|
||||||
|
.LSOverride
|
||||||
|
|
||||||
|
# Icon must end with two \r
|
||||||
|
Icon
|
||||||
|
|
||||||
|
# Thumbnails
|
||||||
|
._*
|
||||||
|
|
||||||
|
# Files that might appear in the root of a volume
|
||||||
|
.DocumentRevisions-V100
|
||||||
|
.fseventsd
|
||||||
|
.Spotlight-V100
|
||||||
|
.TemporaryItems
|
||||||
|
.Trashes
|
||||||
|
.VolumeIcon.icns
|
||||||
|
.com.apple.timemachine.donotpresent
|
||||||
|
|
||||||
|
# Directories potentially created on remote AFP share
|
||||||
|
.AppleDB
|
||||||
|
.AppleDesktop
|
||||||
|
Network Trash Folder
|
||||||
|
Temporary Items
|
||||||
|
.apdisk
|
||||||
|
|
||||||
|
# Windows thumbnail cache files
|
||||||
|
Thumbs.db
|
||||||
|
Thumbs.db:encryptable
|
||||||
|
ehthumbs.db
|
||||||
|
ehthumbs_vista.db
|
||||||
|
|
||||||
|
# Dump file
|
||||||
|
*.stackdump
|
||||||
|
|
||||||
|
# Folder config file
|
||||||
|
[Dd]esktop.ini
|
||||||
|
|
||||||
|
# Recycle Bin used on file shares
|
||||||
|
$RECYCLE.BIN/
|
||||||
|
|
||||||
|
# Windows Installer files
|
||||||
|
*.cab
|
||||||
|
*.msi
|
||||||
|
*.msix
|
||||||
|
*.msm
|
||||||
|
*.msp
|
||||||
|
|
||||||
|
# Windows shortcuts
|
||||||
|
*.lnk
|
||||||
|
|
||||||
|
.gradle
|
||||||
|
build/
|
||||||
|
|
||||||
|
# Ignore Gradle GUI config
|
||||||
|
gradle-app.setting
|
||||||
|
|
||||||
|
# Cache of project
|
||||||
|
.gradletasknamecache
|
||||||
|
|
||||||
|
**/build/
|
||||||
|
|
||||||
|
# Common working directory
|
||||||
|
run/
|
||||||
|
|
||||||
|
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||||
|
!gradle-wrapper.jar
|
|
@ -0,0 +1,16 @@
|
||||||
|
image: gradle:alpine
|
||||||
|
|
||||||
|
variables:
|
||||||
|
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- export GRADLE_USER_HOME=`pwd`/.gradle
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
stage: deploy
|
||||||
|
script: ./gradlew --build-cache assemble
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- build/libs
|
||||||
|
only:
|
||||||
|
- master
|
|
@ -0,0 +1,21 @@
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2020 JFronny
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
|
@ -0,0 +1,77 @@
|
||||||
|
plugins {
|
||||||
|
id 'fabric-loom' version '0.5-SNAPSHOT'
|
||||||
|
id 'maven-publish'
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
|
archivesBaseName = project.archives_base_name
|
||||||
|
version = project.mod_version
|
||||||
|
group = project.maven_group
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
//to change the versions see the gradle.properties file
|
||||||
|
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||||
|
mappings "net.fabricmc:yarn:${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}"
|
||||||
|
|
||||||
|
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
|
||||||
|
// You may need to force-disable transitiveness on them.
|
||||||
|
}
|
||||||
|
|
||||||
|
processResources {
|
||||||
|
inputs.property "version", project.version
|
||||||
|
|
||||||
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
|
include "fabric.mod.json"
|
||||||
|
expand "version": project.version
|
||||||
|
}
|
||||||
|
|
||||||
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
|
exclude "fabric.mod.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensure that the encoding is set to UTF-8, no matter what the system default is
|
||||||
|
// this fixes some edge cases with special characters not displaying correctly
|
||||||
|
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
options.encoding = "UTF-8"
|
||||||
|
}
|
||||||
|
|
||||||
|
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
||||||
|
// if it is present.
|
||||||
|
// If you remove this task, sources will not be generated.
|
||||||
|
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||||
|
classifier = "sources"
|
||||||
|
from sourceSets.main.allSource
|
||||||
|
}
|
||||||
|
|
||||||
|
jar {
|
||||||
|
from "LICENSE"
|
||||||
|
}
|
||||||
|
|
||||||
|
// configure the maven publication
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
mavenJava(MavenPublication) {
|
||||||
|
// add all the jars that should be included when publishing to maven
|
||||||
|
artifact(remapJar) {
|
||||||
|
builtBy remapJar
|
||||||
|
}
|
||||||
|
artifact(sourcesJar) {
|
||||||
|
builtBy remapSourcesJar
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// select the repositories you want to publish to
|
||||||
|
repositories {
|
||||||
|
// uncomment to publish to the local maven
|
||||||
|
// mavenLocal()
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,14 @@
|
||||||
|
# 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.16.2
|
||||||
|
yarn_mappings=1.16.2+build.47
|
||||||
|
loader_version=0.9.3+build.207
|
||||||
|
# Mod Properties
|
||||||
|
mod_version=1.0-SNAPSHOT
|
||||||
|
maven_group=io.gitlab.jfronny
|
||||||
|
archives_base_name=dynres
|
||||||
|
# Dependencies
|
||||||
|
# check this on https://modmuss50.me/fabric.html
|
||||||
|
fabric_version=0.20.1+build.401-1.16
|
Binary file not shown.
|
@ -0,0 +1,5 @@
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
|
@ -0,0 +1,185 @@
|
||||||
|
#!/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" "$@"
|
|
@ -0,0 +1,104 @@
|
||||||
|
@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 init
|
||||||
|
|
||||||
|
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 init
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windows variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
|
||||||
|
: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 %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
: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
|
|
@ -0,0 +1,10 @@
|
||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
jcenter()
|
||||||
|
maven {
|
||||||
|
name = 'Fabric'
|
||||||
|
url = 'https://maven.fabricmc.net/'
|
||||||
|
}
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,73 @@
|
||||||
|
package io.gitlab.jfronny.dynres;
|
||||||
|
|
||||||
|
import com.mojang.brigadier.Command;
|
||||||
|
import io.gitlab.jfronny.dynres.web.RequestHandler;
|
||||||
|
import io.gitlab.jfronny.dynres.web.bluemapcore.WebServer;
|
||||||
|
import net.fabricmc.api.DedicatedServerModInitializer;
|
||||||
|
import net.fabricmc.api.EnvType;
|
||||||
|
import net.fabricmc.api.Environment;
|
||||||
|
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
|
||||||
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
|
import net.fabricmc.loader.gui.FabricGuiEntry;
|
||||||
|
import net.minecraft.server.command.CommandManager;
|
||||||
|
import net.minecraft.text.LiteralText;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
//TODO host the pack
|
||||||
|
@Environment(EnvType.SERVER)
|
||||||
|
public class DynRes implements DedicatedServerModInitializer {
|
||||||
|
static WebServer server;
|
||||||
|
public static final String resFile = "resources.zip";
|
||||||
|
public static final String baseLink = "http://127.0.0.1/";
|
||||||
|
@Override
|
||||||
|
public void onInitializeServer() {
|
||||||
|
//TODO allow setting max connections or fixed port
|
||||||
|
//TODO allow setting custom resources path
|
||||||
|
File f = new File(FabricLoader.getInstance().getGameDir().toFile(), resFile);
|
||||||
|
if (!f.isFile()) {
|
||||||
|
FabricGuiEntry.displayCriticalError(new FileNotFoundException("The file resources.zip does not exist in the game directory but is required"), true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
server = new WebServer(0, 20, null, new RequestHandler(f, resFile));
|
||||||
|
server.start();
|
||||||
|
CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> {
|
||||||
|
if (dedicated) {
|
||||||
|
dispatcher.register(CommandManager.literal("dynres").executes(context -> {
|
||||||
|
context.getSource().sendFeedback(new LiteralText("DynRes is active. Use dynres restart if it breaks"), false);
|
||||||
|
return Command.SINGLE_SUCCESS;
|
||||||
|
}));
|
||||||
|
dispatcher.register(CommandManager.literal("dynres").then(CommandManager.literal("restart")).executes(context -> {
|
||||||
|
context.getSource().sendFeedback(new LiteralText("Restarting DynRes"), true);
|
||||||
|
server.start();
|
||||||
|
context.getSource().sendFeedback(new LiteralText("DynRes restarted"), true);
|
||||||
|
return Command.SINGLE_SUCCESS;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
System.err.println("DYNRES SHOULD NOT BE RUN ON INTERNAL SERVERS!");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getPort() {
|
||||||
|
return Integer.toString(server.getPort());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String simplifyElement(String s) {
|
||||||
|
String path = s.toLowerCase();
|
||||||
|
if (path.startsWith("/")) path = path.substring(1);
|
||||||
|
if (path.endsWith("/")) path = path.substring(0, path.length() - 1);
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String removePort(String s) {
|
||||||
|
String[] r = s.split(":");
|
||||||
|
if (r.length > 2)
|
||||||
|
r = Arrays.copyOf(r, 2);
|
||||||
|
return String.join(":", r);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,37 @@
|
||||||
|
package io.gitlab.jfronny.dynres.mixin;
|
||||||
|
|
||||||
|
import io.gitlab.jfronny.dynres.DynRes;
|
||||||
|
import net.minecraft.server.dedicated.ServerPropertiesHandler;
|
||||||
|
import net.minecraft.util.registry.DynamicRegistryManager;
|
||||||
|
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.CallbackInfo;
|
||||||
|
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
@Mixin(ServerPropertiesHandler.class)
|
||||||
|
public class ServerPropertiesHandlerMixin {
|
||||||
|
@Shadow public String resourcePack;
|
||||||
|
|
||||||
|
@Shadow public String resourcePackHash;
|
||||||
|
|
||||||
|
@Shadow public String resourcePackSha1;
|
||||||
|
|
||||||
|
@Inject(at = @At("RETURN"), method = "<init>(Ljava/util/Properties;Lnet/minecraft/util/registry/DynamicRegistryManager;)V")
|
||||||
|
public void init(Properties properties, DynamicRegistryManager dynamicRegistryManager, CallbackInfo info) {
|
||||||
|
System.err.println(resourcePack);
|
||||||
|
System.err.println(resourcePackHash);
|
||||||
|
System.err.println(resourcePackSha1);
|
||||||
|
|
||||||
|
resourcePack = DynRes.removePort(DynRes.simplifyElement(DynRes.baseLink)) + ":" + DynRes.getPort() + "/" + DynRes.simplifyElement(DynRes.resFile);
|
||||||
|
//TODO hash the pack
|
||||||
|
resourcePackSha1 = "";
|
||||||
|
resourcePackHash = resourcePackSha1;
|
||||||
|
|
||||||
|
System.err.println(resourcePack);
|
||||||
|
System.err.println(resourcePackHash);
|
||||||
|
System.err.println(resourcePackSha1);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,56 @@
|
||||||
|
package io.gitlab.jfronny.dynres.web;
|
||||||
|
|
||||||
|
import io.gitlab.jfronny.dynres.DynRes;
|
||||||
|
import io.gitlab.jfronny.dynres.web.bluemapcore.HttpRequest;
|
||||||
|
import io.gitlab.jfronny.dynres.web.bluemapcore.HttpRequestHandler;
|
||||||
|
import io.gitlab.jfronny.dynres.web.bluemapcore.HttpResponse;
|
||||||
|
import io.gitlab.jfronny.dynres.web.bluemapcore.HttpStatusCode;
|
||||||
|
import org.apache.http.HttpException;
|
||||||
|
import org.apache.http.MethodNotSupportedException;
|
||||||
|
import org.apache.http.entity.ContentType;
|
||||||
|
import org.apache.http.entity.FileEntity;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class RequestHandler implements HttpRequestHandler {
|
||||||
|
File f;
|
||||||
|
String r;
|
||||||
|
@Override
|
||||||
|
public HttpResponse handle(HttpRequest request) {
|
||||||
|
String method = request.getMethod().toUpperCase();
|
||||||
|
if (!method.equals("GET") && !method.equals("HEAD") && !method.equals("POST")) {
|
||||||
|
HttpResponse resp = new HttpResponse(HttpStatusCode.BAD_REQUEST);
|
||||||
|
resp.setData(method + " method not supported");
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
String path = DynRes.simplifyElement(request.getPath());
|
||||||
|
|
||||||
|
if (Objects.equals(path, r)) {
|
||||||
|
HttpResponse resp = new HttpResponse(HttpStatusCode.OK);
|
||||||
|
resp.addHeader("Server", "DynRes using BlueMap");
|
||||||
|
resp.addHeader("Cache-Control", "no-cache");
|
||||||
|
resp.addHeader("Content-Type", "application/zip");
|
||||||
|
|
||||||
|
try {
|
||||||
|
FileInputStream fs = new FileInputStream(f);
|
||||||
|
resp.setData(fs);
|
||||||
|
return resp;
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
return new HttpResponse(HttpStatusCode.INTERNAL_SERVER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new HttpResponse(HttpStatusCode.NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
public RequestHandler(File file, String relativePath) {
|
||||||
|
f = file;
|
||||||
|
r = relativePath;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,126 @@
|
||||||
|
/*
|
||||||
|
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||||
|
*
|
||||||
|
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||||
|
* Copyright (c) contributors
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package io.gitlab.jfronny.dynres.web.bluemapcore;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
import java.net.ServerSocket;
|
||||||
|
import java.net.Socket;
|
||||||
|
import java.net.SocketException;
|
||||||
|
import java.net.SocketTimeoutException;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
public class HttpConnection implements Runnable {
|
||||||
|
|
||||||
|
private HttpRequestHandler handler;
|
||||||
|
|
||||||
|
private ServerSocket server;
|
||||||
|
private Socket connection;
|
||||||
|
private InputStream in;
|
||||||
|
private OutputStream out;
|
||||||
|
|
||||||
|
public HttpConnection(ServerSocket server, Socket connection, HttpRequestHandler handler, int timeout, TimeUnit timeoutUnit) throws IOException {
|
||||||
|
this.server = server;
|
||||||
|
this.connection = connection;
|
||||||
|
this.handler = handler;
|
||||||
|
|
||||||
|
if (isClosed()){
|
||||||
|
throw new IOException("Socket already closed!");
|
||||||
|
}
|
||||||
|
|
||||||
|
connection.setSoTimeout((int) timeoutUnit.toMillis(timeout));
|
||||||
|
|
||||||
|
in = this.connection.getInputStream();
|
||||||
|
out = this.connection.getOutputStream();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
while (!isClosed() && !server.isClosed()){
|
||||||
|
try {
|
||||||
|
HttpRequest request = acceptRequest();
|
||||||
|
HttpResponse response = handler.handle(request);
|
||||||
|
sendResponse(response);
|
||||||
|
} catch (InvalidRequestException e){
|
||||||
|
try {
|
||||||
|
sendResponse(new HttpResponse(HttpStatusCode.BAD_REQUEST));
|
||||||
|
} catch (IOException e1) {}
|
||||||
|
break;
|
||||||
|
} catch (SocketTimeoutException e) {
|
||||||
|
break;
|
||||||
|
} catch (SocketException e){
|
||||||
|
break;
|
||||||
|
} catch (ConnectionClosedException e){
|
||||||
|
break;
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.err.println("Unexpected error while processing a HttpRequest!");
|
||||||
|
e.printStackTrace();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
close();
|
||||||
|
} catch (IOException e){
|
||||||
|
System.err.println("Error while closing HttpConnection!");
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void sendResponse(HttpResponse response) throws IOException {
|
||||||
|
response.write(out);
|
||||||
|
out.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
private HttpRequest acceptRequest() throws ConnectionClosedException, InvalidRequestException, IOException {
|
||||||
|
return HttpRequest.read(in);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isClosed(){
|
||||||
|
return !connection.isBound() || connection.isClosed() || !connection.isConnected() || connection.isOutputShutdown() || connection.isInputShutdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void close() throws IOException {
|
||||||
|
try {
|
||||||
|
in.close();
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
out.close();
|
||||||
|
} finally {
|
||||||
|
connection.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ConnectionClosedException extends IOException {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class InvalidRequestException extends IOException {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,245 @@
|
||||||
|
/*
|
||||||
|
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||||
|
*
|
||||||
|
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||||
|
* Copyright (c) contributors
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package io.gitlab.jfronny.dynres.web.bluemapcore;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Map.Entry;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import io.gitlab.jfronny.dynres.web.bluemapcore.HttpConnection.ConnectionClosedException;
|
||||||
|
import io.gitlab.jfronny.dynres.web.bluemapcore.HttpConnection.InvalidRequestException;
|
||||||
|
|
||||||
|
public class HttpRequest {
|
||||||
|
|
||||||
|
private static final Pattern REQUEST_PATTERN = Pattern.compile("^(\\w+) (\\S+) (.+)$");
|
||||||
|
|
||||||
|
private String method;
|
||||||
|
private String adress;
|
||||||
|
private String version;
|
||||||
|
private Map<String, Set<String>> header;
|
||||||
|
private Map<String, Set<String>> headerLC;
|
||||||
|
private byte[] data;
|
||||||
|
|
||||||
|
private String path = null;
|
||||||
|
private Map<String, String> getParams = null;
|
||||||
|
private String getParamString = null;
|
||||||
|
|
||||||
|
public HttpRequest(String method, String adress, String version, Map<String, Set<String>> header) {
|
||||||
|
this.method = method;
|
||||||
|
this.adress = adress;
|
||||||
|
this.version = version;
|
||||||
|
this.header = header;
|
||||||
|
this.headerLC = new HashMap<>();
|
||||||
|
|
||||||
|
for (Entry<String, Set<String>> e : header.entrySet()){
|
||||||
|
Set<String> values = new HashSet<>();
|
||||||
|
for (String v : e.getValue()){
|
||||||
|
values.add(v.toLowerCase());
|
||||||
|
}
|
||||||
|
|
||||||
|
headerLC.put(e.getKey().toLowerCase(), values);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.data = new byte[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMethod() {
|
||||||
|
return method;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAdress(){
|
||||||
|
return adress;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getVersion() {
|
||||||
|
return version;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, Set<String>> getHeader() {
|
||||||
|
return header;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, Set<String>> getLowercaseHeader() {
|
||||||
|
return headerLC;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<String> getHeader(String key){
|
||||||
|
Set<String> headerValues = header.get(key);
|
||||||
|
if (headerValues == null) return Collections.emptySet();
|
||||||
|
return headerValues;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<String> getLowercaseHeader(String key){
|
||||||
|
Set<String> headerValues = headerLC.get(key.toLowerCase());
|
||||||
|
if (headerValues == null) return Collections.emptySet();
|
||||||
|
return headerValues;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPath() {
|
||||||
|
if (path == null) parseAdress();
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, String> getGETParams() {
|
||||||
|
if (getParams == null) parseAdress();
|
||||||
|
return Collections.unmodifiableMap(getParams);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getGETParamString() {
|
||||||
|
if (getParamString == null) parseAdress();
|
||||||
|
return getParamString;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void parseAdress() {
|
||||||
|
String adress = this.adress;
|
||||||
|
if (adress.isEmpty()) adress = "/";
|
||||||
|
String[] adressParts = adress.split("\\?", 2);
|
||||||
|
String path = adressParts[0];
|
||||||
|
this.getParamString = adressParts.length > 1 ? adressParts[1] : "";
|
||||||
|
|
||||||
|
Map<String, String> getParams = new HashMap<>();
|
||||||
|
for (String getParam : this.getParamString.split("&")){
|
||||||
|
if (getParam.isEmpty()) continue;
|
||||||
|
String[] kv = getParam.split("=", 2);
|
||||||
|
String key = kv[0];
|
||||||
|
String value = kv.length > 1 ? kv[1] : "";
|
||||||
|
getParams.put(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.path = path;
|
||||||
|
this.getParams = getParams;
|
||||||
|
}
|
||||||
|
|
||||||
|
public InputStream getData(){
|
||||||
|
return new ByteArrayInputStream(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static HttpRequest read(InputStream in) throws IOException, InvalidRequestException {
|
||||||
|
BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
|
||||||
|
List<String> header = new ArrayList<>(20);
|
||||||
|
while(header.size() < 1000){
|
||||||
|
String headerLine = readLine(reader);
|
||||||
|
if (headerLine.isEmpty()) break;
|
||||||
|
header.add(headerLine);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (header.isEmpty()) throw new InvalidRequestException();
|
||||||
|
|
||||||
|
Matcher m = REQUEST_PATTERN.matcher(header.remove(0));
|
||||||
|
if (!m.find()) throw new InvalidRequestException();
|
||||||
|
|
||||||
|
String method = m.group(1);
|
||||||
|
if (method == null) throw new InvalidRequestException();
|
||||||
|
|
||||||
|
String adress = m.group(2);
|
||||||
|
if (adress == null) throw new InvalidRequestException();
|
||||||
|
|
||||||
|
String version = m.group(3);
|
||||||
|
if (version == null) throw new InvalidRequestException();
|
||||||
|
|
||||||
|
Map<String, Set<String>> headerMap = new HashMap<String, Set<String>>();
|
||||||
|
for (String line : header){
|
||||||
|
if (line.trim().isEmpty()) continue;
|
||||||
|
|
||||||
|
String[] kv = line.split(":", 2);
|
||||||
|
if (kv.length < 2) continue;
|
||||||
|
|
||||||
|
Set<String> values = new HashSet<>();
|
||||||
|
if (kv[0].trim().equalsIgnoreCase("If-Modified-Since")){
|
||||||
|
values.add(kv[1].trim());
|
||||||
|
} else {
|
||||||
|
for(String v : kv[1].split(",")){
|
||||||
|
values.add(v.trim());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
headerMap.put(kv[0].trim(), values);
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpRequest request = new HttpRequest(method, adress, version, headerMap);
|
||||||
|
|
||||||
|
if (request.getLowercaseHeader("Transfer-Encoding").contains("chunked")){
|
||||||
|
try {
|
||||||
|
ByteArrayOutputStream dataStream = new ByteArrayOutputStream();
|
||||||
|
while (dataStream.size() < 1000000){
|
||||||
|
String hexSize = reader.readLine();
|
||||||
|
int chunkSize = Integer.parseInt(hexSize, 16);
|
||||||
|
if (chunkSize <= 0) break;
|
||||||
|
byte[] data = new byte[chunkSize];
|
||||||
|
in.read(data);
|
||||||
|
dataStream.write(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dataStream.size() >= 1000000) {
|
||||||
|
throw new InvalidRequestException();
|
||||||
|
}
|
||||||
|
|
||||||
|
request.data = dataStream.toByteArray();
|
||||||
|
|
||||||
|
return request;
|
||||||
|
} catch (NumberFormatException ex){
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Set<String> clSet = request.getLowercaseHeader("Content-Length");
|
||||||
|
if (clSet.isEmpty()){
|
||||||
|
return request;
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
int cl = Integer.parseInt(clSet.iterator().next());
|
||||||
|
byte[] data = new byte[cl];
|
||||||
|
in.read(data);
|
||||||
|
request.data = data;
|
||||||
|
return request;
|
||||||
|
} catch (NumberFormatException ex){
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String readLine(BufferedReader in) throws ConnectionClosedException, IOException {
|
||||||
|
String line = in.readLine();
|
||||||
|
if (line == null){
|
||||||
|
throw new ConnectionClosedException();
|
||||||
|
}
|
||||||
|
return line;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,34 @@
|
||||||
|
/*
|
||||||
|
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||||
|
*
|
||||||
|
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||||
|
* Copyright (c) contributors
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package io.gitlab.jfronny.dynres.web.bluemapcore;
|
||||||
|
|
||||||
|
import org.apache.http.MethodNotSupportedException;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface HttpRequestHandler {
|
||||||
|
|
||||||
|
HttpResponse handle(HttpRequest request);
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,155 @@
|
||||||
|
/*
|
||||||
|
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||||
|
*
|
||||||
|
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||||
|
* Copyright (c) contributors
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package io.gitlab.jfronny.dynres.web.bluemapcore;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.Closeable;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
import java.io.OutputStreamWriter;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Map.Entry;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
|
public class HttpResponse implements Closeable {
|
||||||
|
|
||||||
|
private String version;
|
||||||
|
private HttpStatusCode statusCode;
|
||||||
|
private Map<String, Set<String>> header;
|
||||||
|
private InputStream data;
|
||||||
|
|
||||||
|
public HttpResponse(HttpStatusCode statusCode) {
|
||||||
|
this.version = "HTTP/1.1";
|
||||||
|
this.statusCode = statusCode;
|
||||||
|
|
||||||
|
this.header = new HashMap<>();
|
||||||
|
|
||||||
|
addHeader("Connection", "keep-alive");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addHeader(String key, String value){
|
||||||
|
Set<String> valueSet = header.get(key);
|
||||||
|
if (valueSet == null){
|
||||||
|
valueSet = new HashSet<>();
|
||||||
|
header.put(key, valueSet);
|
||||||
|
}
|
||||||
|
|
||||||
|
valueSet.add(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void removeHeader(String key, String value){
|
||||||
|
Set<String> valueSet = header.get(key);
|
||||||
|
if (valueSet == null){
|
||||||
|
valueSet = new HashSet<>();
|
||||||
|
header.put(key, valueSet);
|
||||||
|
}
|
||||||
|
|
||||||
|
valueSet.remove(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setData(InputStream dataStream){
|
||||||
|
this.data = dataStream;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setData(String data){
|
||||||
|
setData(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes this Response to an Output-Stream.<br>
|
||||||
|
* <br>
|
||||||
|
* This method closes the data-Stream of this response so it can't be used again!
|
||||||
|
*/
|
||||||
|
public void write(OutputStream out) throws IOException {
|
||||||
|
OutputStreamWriter writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
|
||||||
|
|
||||||
|
if (data != null){
|
||||||
|
addHeader("Transfer-Encoding", "chunked");
|
||||||
|
} else {
|
||||||
|
addHeader("Content-Length", "0");
|
||||||
|
}
|
||||||
|
|
||||||
|
writeLine(writer, version + " " + statusCode.getCode() + " " + statusCode.getMessage());
|
||||||
|
for (Entry<String, Set<String>> e : header.entrySet()){
|
||||||
|
if (e.getValue().isEmpty()) continue;
|
||||||
|
writeLine(writer, e.getKey() + ": " + StringUtils.join(e.getValue(), ", "));
|
||||||
|
}
|
||||||
|
|
||||||
|
writeLine(writer, "");
|
||||||
|
writer.flush();
|
||||||
|
|
||||||
|
if(data != null){
|
||||||
|
chunkedPipe(data, out);
|
||||||
|
out.flush();
|
||||||
|
data.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void close() throws IOException {
|
||||||
|
data.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void writeLine(OutputStreamWriter writer, String line) throws IOException {
|
||||||
|
writer.write(line + "\r\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void chunkedPipe(InputStream input, OutputStream output) throws IOException {
|
||||||
|
byte[] buffer = new byte[1024];
|
||||||
|
int byteCount;
|
||||||
|
while ((byteCount = input.read(buffer)) != -1) {
|
||||||
|
output.write((Integer.toHexString(byteCount) + "\r\n").getBytes());
|
||||||
|
output.write(buffer, 0, byteCount);
|
||||||
|
output.write("\r\n".getBytes());
|
||||||
|
}
|
||||||
|
output.write("0\r\n\r\n".getBytes());
|
||||||
|
}
|
||||||
|
|
||||||
|
public HttpStatusCode getStatusCode(){
|
||||||
|
return statusCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getVersion(){
|
||||||
|
return version;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, Set<String>> getHeader() {
|
||||||
|
return header;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<String> getHeader(String key){
|
||||||
|
Set<String> headerValues = header.get(key);
|
||||||
|
if (headerValues == null) return Collections.emptySet();
|
||||||
|
return headerValues;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,70 @@
|
||||||
|
/*
|
||||||
|
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||||
|
*
|
||||||
|
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||||
|
* Copyright (c) contributors
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package io.gitlab.jfronny.dynres.web.bluemapcore;
|
||||||
|
|
||||||
|
public enum HttpStatusCode {
|
||||||
|
|
||||||
|
CONTINUE (100, "Continue"),
|
||||||
|
PROCESSING (102, "Processing"),
|
||||||
|
|
||||||
|
OK (200, "OK"),
|
||||||
|
|
||||||
|
MOVED_PERMANENTLY (301, "Moved Permanently"),
|
||||||
|
FOUND (302, "Found"),
|
||||||
|
SEE_OTHER (303, "See Other"),
|
||||||
|
NOT_MODIFIED (304, "Not Modified"),
|
||||||
|
|
||||||
|
BAD_REQUEST (400, "Bad Request"),
|
||||||
|
UNAUTHORIZED (401, "Unauthorized"),
|
||||||
|
FORBIDDEN (403, "Forbidden"),
|
||||||
|
NOT_FOUND (404, "Not Found"),
|
||||||
|
|
||||||
|
INTERNAL_SERVER_ERROR (500, "Internal Server Error"),
|
||||||
|
NOT_IMPLEMENTED (501, "Not Implemented"),
|
||||||
|
SERVICE_UNAVAILABLE (503, "Service Unavailable"),
|
||||||
|
HTTP_VERSION_NOT_SUPPORTED (505, "HTTP Version not supported");
|
||||||
|
|
||||||
|
private int code;
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
private HttpStatusCode(int code, String message) {
|
||||||
|
this.code = code;
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCode(){
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage(){
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return getCode() + " " + getMessage();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,118 @@
|
||||||
|
/*
|
||||||
|
* This file is part of BlueMap, licensed under the MIT License (MIT).
|
||||||
|
*
|
||||||
|
* Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
|
||||||
|
* Copyright (c) contributors
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package io.gitlab.jfronny.dynres.web.bluemapcore;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.ServerSocket;
|
||||||
|
import java.net.Socket;
|
||||||
|
import java.net.SocketException;
|
||||||
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
|
import java.util.concurrent.RejectedExecutionException;
|
||||||
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
public class WebServer extends Thread {
|
||||||
|
|
||||||
|
private final int port;
|
||||||
|
private final int maxConnections;
|
||||||
|
private final InetAddress bindAdress;
|
||||||
|
|
||||||
|
private HttpRequestHandler handler;
|
||||||
|
|
||||||
|
private ThreadPoolExecutor connectionThreads;
|
||||||
|
|
||||||
|
private ServerSocket server;
|
||||||
|
|
||||||
|
public WebServer(int port, int maxConnections, InetAddress bindAdress, HttpRequestHandler handler) {
|
||||||
|
this.port = port;
|
||||||
|
this.maxConnections = maxConnections;
|
||||||
|
this.bindAdress = bindAdress;
|
||||||
|
|
||||||
|
this.handler = handler;
|
||||||
|
|
||||||
|
connectionThreads = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run(){
|
||||||
|
close();
|
||||||
|
|
||||||
|
connectionThreads = new ThreadPoolExecutor(maxConnections, maxConnections, 10, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
|
||||||
|
connectionThreads.allowCoreThreadTimeOut(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
server = new ServerSocket(port, maxConnections, bindAdress);
|
||||||
|
server.setSoTimeout(0);
|
||||||
|
} catch (IOException e){
|
||||||
|
System.err.println("Error while starting the WebServer!");
|
||||||
|
e.printStackTrace();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println("WebServer started.");
|
||||||
|
|
||||||
|
while (!server.isClosed() && server.isBound()){
|
||||||
|
|
||||||
|
try {
|
||||||
|
Socket connection = server.accept();
|
||||||
|
|
||||||
|
try {
|
||||||
|
connectionThreads.execute(new HttpConnection(server, connection, handler, 10, TimeUnit.SECONDS));
|
||||||
|
} catch (RejectedExecutionException e){
|
||||||
|
connection.close();
|
||||||
|
System.err.println("Dropped an incoming HttpConnection! (Too many connections?)");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (SocketException e){
|
||||||
|
// this mainly occurs if the socket got closed, so we ignore this error
|
||||||
|
} catch (IOException e){
|
||||||
|
System.err.println("Error while creating a new HttpConnection!");
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println("WebServer closed.");
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPort() {
|
||||||
|
return server.getLocalPort();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void close(){
|
||||||
|
if (connectionThreads != null) connectionThreads.shutdown();
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (server != null && !server.isClosed()){
|
||||||
|
server.close();
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.err.println("Error while closing WebServer!");
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"minVersion": "0.8",
|
||||||
|
"package": "io.gitlab.jfronny.dynres.mixin",
|
||||||
|
"compatibilityLevel": "JAVA_8",
|
||||||
|
"mixins": [
|
||||||
|
],
|
||||||
|
"server": [
|
||||||
|
"ServerPropertiesHandlerMixin"
|
||||||
|
],
|
||||||
|
"injectors": {
|
||||||
|
"defaultRequire": 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,30 @@
|
||||||
|
{
|
||||||
|
"schemaVersion": 1,
|
||||||
|
"id": "dynres",
|
||||||
|
"version": "${version}",
|
||||||
|
"name": "DynRes",
|
||||||
|
"description": "Host resourcepacks directly in-server",
|
||||||
|
"authors": [
|
||||||
|
"JFronny"
|
||||||
|
],
|
||||||
|
"contact": {
|
||||||
|
"website": "https://jfronny.gitlab.io",
|
||||||
|
"repo": "https://www.gitlab.com/JFronny/DynRes"
|
||||||
|
},
|
||||||
|
"license": "MIT",
|
||||||
|
"icon": "assets/dynres/icon.png",
|
||||||
|
"environment": "server",
|
||||||
|
"entrypoints": {
|
||||||
|
"server": [
|
||||||
|
"io.gitlab.jfronny.dynres.DynRes"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"mixins": [
|
||||||
|
"dynres.mixins.json"
|
||||||
|
],
|
||||||
|
"depends": {
|
||||||
|
"fabricloader": ">=0.9.3+build.207",
|
||||||
|
"fabric": "*",
|
||||||
|
"minecraft": "1.16.2"
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue