mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2024-11-25 12:05:13 +01:00
Remove fabric-1.16.1 implementation
This commit is contained in:
Lukas Rieger (Blue)
parent
1771768afe
commit
2614ef8a56
@ -1,187 +0,0 @@
|
|||||||
import com.matthewprenger.cursegradle.CurseArtifact
|
|
||||||
import com.matthewprenger.cursegradle.CurseProject
|
|
||||||
import com.matthewprenger.cursegradle.CurseRelation
|
|
||||||
import com.matthewprenger.cursegradle.Options
|
|
||||||
import net.fabricmc.loom.task.RemapJarTask
|
|
||||||
|
|
||||||
plugins {
|
|
||||||
java
|
|
||||||
`java-library`
|
|
||||||
id("com.diffplug.spotless") version "6.1.2"
|
|
||||||
id ("com.github.node-gradle.node") version "3.0.1"
|
|
||||||
id ("com.github.johnrengelman.shadow") version "7.1.2"
|
|
||||||
id ("fabric-loom") version "0.12-SNAPSHOT"
|
|
||||||
id ("com.modrinth.minotaur") version "2.+"
|
|
||||||
id ("com.matthewprenger.cursegradle") version "1.4.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
group = "de.bluecolored.bluemap.fabric"
|
|
||||||
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
|
|
||||||
|
|
||||||
val javaTarget = 11
|
|
||||||
java {
|
|
||||||
sourceCompatibility = JavaVersion.toVersion(javaTarget)
|
|
||||||
targetCompatibility = JavaVersion.toVersion(javaTarget)
|
|
||||||
|
|
||||||
withSourcesJar()
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
maven {
|
|
||||||
setUrl("https://libraries.minecraft.net")
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
setUrl("https://jitpack.io")
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
setUrl("https://maven.fabricmc.net/")
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val shadowInclude: Configuration by configurations.creating
|
|
||||||
|
|
||||||
configurations {
|
|
||||||
implementation.get().extendsFrom(shadowInclude)
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") {
|
|
||||||
//exclude dependencies provided by fabric
|
|
||||||
exclude (group = "com.google.guava", module = "guava")
|
|
||||||
exclude (group = "com.google.code.gson", module = "gson")
|
|
||||||
exclude (group = "org.apache.commons", module = "commons-lang3")
|
|
||||||
exclude (group = "commons-io", module = "commons-io")
|
|
||||||
exclude (group = "com.mojang", module = "brigadier")
|
|
||||||
}
|
|
||||||
|
|
||||||
minecraft ("com.mojang:minecraft:1.16.1")
|
|
||||||
mappings ("net.fabricmc:yarn:1.16.1+build.21:v2")
|
|
||||||
modImplementation ("net.fabricmc:fabric-loader:0.9.2+build.206")
|
|
||||||
modImplementation ("net.fabricmc.fabric-api:fabric-api:0.16.2+build.385-1.16.1")
|
|
||||||
modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")
|
|
||||||
|
|
||||||
testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2")
|
|
||||||
testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
|
||||||
}
|
|
||||||
|
|
||||||
spotless {
|
|
||||||
java {
|
|
||||||
target ("src/*/java/**/*.java")
|
|
||||||
|
|
||||||
licenseHeaderFile("../../HEADER")
|
|
||||||
indentWithSpaces()
|
|
||||||
trimTrailingWhitespace()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile::class).configureEach {
|
|
||||||
options.apply {
|
|
||||||
encoding = "utf-8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(AbstractArchiveTask::class).configureEach {
|
|
||||||
isReproducibleFileOrder = true
|
|
||||||
isPreserveFileTimestamps = false
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.test {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.processResources {
|
|
||||||
inputs.property ("version", project.version)
|
|
||||||
|
|
||||||
filesMatching("fabric.mod.json") {
|
|
||||||
expand ("version" to project.version)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.shadowJar {
|
|
||||||
configurations = listOf(shadowInclude)
|
|
||||||
|
|
||||||
//relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it
|
|
||||||
relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config")
|
|
||||||
relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt")
|
|
||||||
relocate ("org.spongepowered.configurate", "de.bluecolored.shadow.configurate")
|
|
||||||
relocate ("com.github.benmanes.caffeine", "de.bluecolored.shadow.benmanes.caffeine")
|
|
||||||
relocate ("org.aopalliance", "de.bluecolored.shadow.aopalliance")
|
|
||||||
relocate ("javax.inject", "de.bluecolored.shadow.javax.inject")
|
|
||||||
relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework")
|
|
||||||
relocate ("org.codehaus", "de.bluecolored.shadow.codehaus")
|
|
||||||
relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref")
|
|
||||||
|
|
||||||
relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone")
|
|
||||||
relocate ("com.google.inject", "de.bluecolored.shadow.google.inject")
|
|
||||||
|
|
||||||
relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2")
|
|
||||||
relocate ("org.apache.commons.logging", "de.bluecolored.shadow.apache.commons.logging")
|
|
||||||
relocate ("org.apache.commons.pool2", "de.bluecolored.shadow.apache.commons.pool2")
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register("remappedShadowJar", type = RemapJarTask::class) {
|
|
||||||
destinationDirectory.set(file("../../build/release"))
|
|
||||||
archiveFileName.set("BlueMap-${project.version}-${project.name}.jar")
|
|
||||||
dependsOn (tasks.shadowJar)
|
|
||||||
inputFile.set(tasks.shadowJar.get().archiveFile)
|
|
||||||
addNestedDependencies.set(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register("release") {
|
|
||||||
dependsOn("remappedShadowJar")
|
|
||||||
}
|
|
||||||
|
|
||||||
modrinth {
|
|
||||||
token.set(System.getenv("MODRINTH_TOKEN"))
|
|
||||||
projectId.set("swbUV1cr")
|
|
||||||
versionNumber.set("${project.version}-${project.name}")
|
|
||||||
changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}")
|
|
||||||
uploadFile.set(tasks.findByName("remappedShadowJar"))
|
|
||||||
gameVersions.addAll("1.16.1")
|
|
||||||
dependencies {
|
|
||||||
required.project("P7dR8mSH") // Fabric API
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
curseforge {
|
|
||||||
apiKey = System.getenv("CURSEFORGE_TOKEN") ?: ""
|
|
||||||
project(closureOf<CurseProject> {
|
|
||||||
id = "406463"
|
|
||||||
changelogType = "markdown"
|
|
||||||
changelog = "**Releasenotes and Changelog:**\n\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}"
|
|
||||||
releaseType = "release"
|
|
||||||
|
|
||||||
addGameVersion("Fabric")
|
|
||||||
|
|
||||||
addGameVersion("Java 18")
|
|
||||||
addGameVersion("Java 17")
|
|
||||||
addGameVersion("Java 16")
|
|
||||||
addGameVersion("Java 15")
|
|
||||||
addGameVersion("Java 14")
|
|
||||||
addGameVersion("Java 13")
|
|
||||||
addGameVersion("Java 12")
|
|
||||||
addGameVersion("Java 11")
|
|
||||||
|
|
||||||
addGameVersion("1.16.1")
|
|
||||||
|
|
||||||
mainArtifact(tasks.findByName("remappedShadowJar"), closureOf<CurseArtifact> {
|
|
||||||
relations(closureOf<CurseRelation> {
|
|
||||||
requiredDependency("fabric-api")
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
options(closureOf<Options> {
|
|
||||||
javaVersionAutoDetect = false
|
|
||||||
javaIntegration = false
|
|
||||||
forgeGradleIntegration = false
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register("publish") {
|
|
||||||
dependsOn("modrinth")
|
|
||||||
dependsOn("curseforge")
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -1,5 +0,0 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
234
implementations/fabric-1.16.1/gradlew
vendored
234
implementations/fabric-1.16.1/gradlew
vendored
@ -1,234 +0,0 @@
|
|||||||
#!/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
implementations/fabric-1.16.1/gradlew.bat
vendored
89
implementations/fabric-1.16.1/gradlew.bat
vendored
@ -1,89 +0,0 @@
|
|||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
||||||
exit /b 1
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
name = "Fabric"
|
|
||||||
url = uri("https://maven.fabricmc.net/")
|
|
||||||
}
|
|
||||||
gradlePluginPortal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.name = "fabric-1.16.1"
|
|
||||||
|
|
||||||
includeBuild("../../BlueMapCommon")
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric;
|
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector3d;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.Plugin;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.CommandSource;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.text.Text;
|
|
||||||
import de.bluecolored.bluemap.core.world.World;
|
|
||||||
import me.lucko.fabric.api.permissions.v0.Permissions;
|
|
||||||
import net.minecraft.server.command.ServerCommandSource;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
public class FabricCommandSource implements CommandSource {
|
|
||||||
|
|
||||||
private final FabricMod mod;
|
|
||||||
private final Plugin plugin;
|
|
||||||
private final ServerCommandSource delegate;
|
|
||||||
|
|
||||||
public FabricCommandSource(FabricMod mod, Plugin plugin, ServerCommandSource delegate) {
|
|
||||||
this.mod = mod;
|
|
||||||
this.plugin = plugin;
|
|
||||||
this.delegate = delegate;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendMessage(Text text) {
|
|
||||||
delegate.sendFeedback(net.minecraft.text.Text.Serializer.fromJson(text.toJSONString()), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hasPermission(String permission) {
|
|
||||||
try {
|
|
||||||
Class.forName("me.lucko.fabric.api.permissions.v0.Permissions");
|
|
||||||
return Permissions.check(delegate, permission, 1);
|
|
||||||
} catch (ClassNotFoundException ex) {
|
|
||||||
return delegate.hasPermissionLevel(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Vector3d> getPosition() {
|
|
||||||
Vec3d pos = delegate.getPosition();
|
|
||||||
if (pos != null) {
|
|
||||||
return Optional.of(new Vector3d(pos.x, pos.y, pos.z));
|
|
||||||
}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<World> getWorld() {
|
|
||||||
try {
|
|
||||||
var serverWorld = mod.getWorld(delegate.getWorld());
|
|
||||||
String worldId = plugin.getBlueMap().getWorldId(serverWorld.getSaveFolder());
|
|
||||||
return Optional.ofNullable(plugin.getWorlds().get(worldId));
|
|
||||||
} catch (IOException ignore) {}
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
|
|
||||||
import de.bluecolored.bluemap.fabric.events.PlayerJoinCallback;
|
|
||||||
import de.bluecolored.bluemap.fabric.events.PlayerLeaveCallback;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class FabricEventForwarder {
|
|
||||||
|
|
||||||
private final FabricMod mod;
|
|
||||||
private final Collection<ServerEventListener> eventListeners;
|
|
||||||
|
|
||||||
public FabricEventForwarder(FabricMod mod) {
|
|
||||||
this.mod = mod;
|
|
||||||
this.eventListeners = new ArrayList<>(1);
|
|
||||||
|
|
||||||
PlayerJoinCallback.EVENT.register(this::onPlayerJoin);
|
|
||||||
PlayerLeaveCallback.EVENT.register(this::onPlayerLeave);
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void addEventListener(ServerEventListener listener) {
|
|
||||||
this.eventListeners.add(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void removeAllListeners() {
|
|
||||||
this.eventListeners.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void onPlayerJoin(MinecraftServer server, ServerPlayerEntity player) {
|
|
||||||
if (this.mod.getServer() != server) return;
|
|
||||||
|
|
||||||
UUID uuid = player.getUuid();
|
|
||||||
for (ServerEventListener listener : eventListeners) listener.onPlayerJoin(uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void onPlayerLeave(MinecraftServer server, ServerPlayerEntity player) {
|
|
||||||
if (this.mod.getServer() != server) return;
|
|
||||||
|
|
||||||
UUID uuid = player.getUuid();
|
|
||||||
for (ServerEventListener listener : eventListeners) listener.onPlayerLeave(uuid);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,243 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric;
|
|
||||||
|
|
||||||
import com.github.benmanes.caffeine.cache.Caffeine;
|
|
||||||
import com.github.benmanes.caffeine.cache.LoadingCache;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.Plugin;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.commands.Commands;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Player;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerInterface;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
|
|
||||||
import de.bluecolored.bluemap.core.BlueMap;
|
|
||||||
import de.bluecolored.bluemap.core.MinecraftVersion;
|
|
||||||
import de.bluecolored.bluemap.core.logger.Logger;
|
|
||||||
import de.bluecolored.bluemap.fabric.events.PlayerJoinCallback;
|
|
||||||
import de.bluecolored.bluemap.fabric.events.PlayerLeaveCallback;
|
|
||||||
import net.fabricmc.api.ModInitializer;
|
|
||||||
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
|
|
||||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
|
||||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
import net.minecraft.util.registry.RegistryKey;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
|
|
||||||
public class FabricMod implements ModInitializer, ServerInterface {
|
|
||||||
|
|
||||||
private final Plugin pluginInstance;
|
|
||||||
private MinecraftServer serverInstance = null;
|
|
||||||
|
|
||||||
private final FabricEventForwarder eventForwarder;
|
|
||||||
|
|
||||||
private final LoadingCache<net.minecraft.server.world.ServerWorld, ServerWorld> worlds;
|
|
||||||
|
|
||||||
private int playerUpdateIndex = 0;
|
|
||||||
private final Map<UUID, Player> onlinePlayerMap;
|
|
||||||
private final List<FabricPlayer> onlinePlayerList;
|
|
||||||
|
|
||||||
public FabricMod() {
|
|
||||||
Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME));
|
|
||||||
|
|
||||||
this.onlinePlayerMap = new ConcurrentHashMap<>();
|
|
||||||
this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>());
|
|
||||||
|
|
||||||
pluginInstance = new Plugin("fabric-1.16.1", this);
|
|
||||||
|
|
||||||
this.eventForwarder = new FabricEventForwarder(this);
|
|
||||||
this.worlds = Caffeine.newBuilder()
|
|
||||||
.executor(BlueMap.THREAD_POOL)
|
|
||||||
.weakKeys()
|
|
||||||
.maximumSize(1000)
|
|
||||||
.build(FabricWorld::new);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInitialize() {
|
|
||||||
|
|
||||||
//register commands
|
|
||||||
CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) ->
|
|
||||||
new Commands<>(pluginInstance, dispatcher, fabricSource ->
|
|
||||||
new FabricCommandSource(this, pluginInstance, fabricSource)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
ServerLifecycleEvents.SERVER_STARTED.register((MinecraftServer server) -> {
|
|
||||||
this.serverInstance = server;
|
|
||||||
|
|
||||||
new Thread(()->{
|
|
||||||
Logger.global.logInfo("Loading BlueMap...");
|
|
||||||
|
|
||||||
try {
|
|
||||||
pluginInstance.load();
|
|
||||||
if (pluginInstance.isLoaded()) Logger.global.logInfo("BlueMap loaded!");
|
|
||||||
} catch (IOException e) {
|
|
||||||
Logger.global.logError("Failed to load bluemap!", e);
|
|
||||||
pluginInstance.unload();
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
});
|
|
||||||
|
|
||||||
ServerLifecycleEvents.SERVER_STOPPING.register((MinecraftServer server) -> {
|
|
||||||
pluginInstance.unload();
|
|
||||||
Logger.global.logInfo("BlueMap unloaded!");
|
|
||||||
});
|
|
||||||
|
|
||||||
PlayerJoinCallback.EVENT.register(this::onPlayerJoin);
|
|
||||||
PlayerLeaveCallback.EVENT.register(this::onPlayerLeave);
|
|
||||||
|
|
||||||
ServerTickEvents.END_SERVER_TICK.register((MinecraftServer server) -> {
|
|
||||||
if (server == this.serverInstance) this.updateSomePlayers();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MinecraftVersion getMinecraftVersion() {
|
|
||||||
return new MinecraftVersion(1, 16, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void registerListener(ServerEventListener listener) {
|
|
||||||
eventForwarder.addEventListener(listener);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unregisterAllListeners() {
|
|
||||||
eventForwarder.removeAllListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<ServerWorld> getLoadedWorlds() {
|
|
||||||
Collection<ServerWorld> loadedWorlds = new ArrayList<>(3);
|
|
||||||
for (net.minecraft.server.world.ServerWorld serverWorld : serverInstance.getWorlds()) {
|
|
||||||
loadedWorlds.add(worlds.get(serverWorld));
|
|
||||||
}
|
|
||||||
return loadedWorlds;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@Override
|
|
||||||
public Optional<ServerWorld> getWorld(Object world) {
|
|
||||||
if (world instanceof Path)
|
|
||||||
return getWorld((Path) world);
|
|
||||||
|
|
||||||
if (world instanceof String) {
|
|
||||||
Identifier identifier = Identifier.tryParse((String) world);
|
|
||||||
if (identifier != null) world = serverInstance.getWorld(RegistryKey.of(Registry.DIMENSION, identifier));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof RegistryKey) {
|
|
||||||
try {
|
|
||||||
world = serverInstance.getWorld((RegistryKey<World>) world);
|
|
||||||
} catch (ClassCastException ignored) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (world instanceof net.minecraft.server.world.ServerWorld)
|
|
||||||
return Optional.of(getWorld((net.minecraft.server.world.ServerWorld) world));
|
|
||||||
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ServerWorld getWorld(net.minecraft.server.world.ServerWorld serverWorld) {
|
|
||||||
return worlds.get(serverWorld);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Path getConfigFolder() {
|
|
||||||
return Path.of("config", "bluemap");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Path> getModsFolder() {
|
|
||||||
return Optional.of(Path.of("mods"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
|
|
||||||
if (this.serverInstance != server) return;
|
|
||||||
|
|
||||||
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
|
|
||||||
onlinePlayerMap.put(player.getUuid(), player);
|
|
||||||
onlinePlayerList.add(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onPlayerLeave(MinecraftServer server, ServerPlayerEntity player) {
|
|
||||||
if (this.serverInstance != server) return;
|
|
||||||
|
|
||||||
UUID playerUUID = player.getUuid();
|
|
||||||
onlinePlayerMap.remove(playerUUID);
|
|
||||||
synchronized (onlinePlayerList) {
|
|
||||||
onlinePlayerList.removeIf(p -> p.getUuid().equals(playerUUID));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public MinecraftServer getServer() {
|
|
||||||
return this.serverInstance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Plugin getPluginInstance() {
|
|
||||||
return pluginInstance;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<Player> getOnlinePlayers() {
|
|
||||||
return onlinePlayerMap.values();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Optional<Player> getPlayer(UUID uuid) {
|
|
||||||
return Optional.ofNullable(onlinePlayerMap.get(uuid));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Only update some of the online players each tick to minimize performance impact on the server-thread.
|
|
||||||
* Only call this method on the server-thread.
|
|
||||||
*/
|
|
||||||
private void updateSomePlayers() {
|
|
||||||
int onlinePlayerCount = onlinePlayerList.size();
|
|
||||||
if (onlinePlayerCount == 0) return;
|
|
||||||
|
|
||||||
int playersToBeUpdated = onlinePlayerCount / 20; //with 20 tps, each player is updated once a second
|
|
||||||
if (playersToBeUpdated == 0) playersToBeUpdated = 1;
|
|
||||||
|
|
||||||
for (int i = 0; i < playersToBeUpdated; i++) {
|
|
||||||
playerUpdateIndex++;
|
|
||||||
if (playerUpdateIndex >= 20 && playerUpdateIndex >= onlinePlayerCount) playerUpdateIndex = 0;
|
|
||||||
|
|
||||||
if (playerUpdateIndex < onlinePlayerCount) {
|
|
||||||
onlinePlayerList.get(playerUpdateIndex).update();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,172 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric;
|
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector3d;
|
|
||||||
import de.bluecolored.bluemap.common.plugin.text.Text;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Gamemode;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Player;
|
|
||||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
|
||||||
import net.minecraft.entity.effect.StatusEffects;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
import net.minecraft.util.math.Vec3d;
|
|
||||||
import net.minecraft.world.GameMode;
|
|
||||||
import net.minecraft.world.LightType;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.EnumMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
public class FabricPlayer implements Player {
|
|
||||||
|
|
||||||
private static final Map<GameMode, Gamemode> GAMEMODE_MAP = new EnumMap<>(GameMode.class);
|
|
||||||
static {
|
|
||||||
GAMEMODE_MAP.put(GameMode.ADVENTURE, Gamemode.ADVENTURE);
|
|
||||||
GAMEMODE_MAP.put(GameMode.SURVIVAL, Gamemode.SURVIVAL);
|
|
||||||
GAMEMODE_MAP.put(GameMode.CREATIVE, Gamemode.CREATIVE);
|
|
||||||
GAMEMODE_MAP.put(GameMode.SPECTATOR, Gamemode.SPECTATOR);
|
|
||||||
GAMEMODE_MAP.put(GameMode.NOT_SET, Gamemode.SURVIVAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
private final UUID uuid;
|
|
||||||
private Text name;
|
|
||||||
private String world;
|
|
||||||
private Vector3d position;
|
|
||||||
private Vector3d rotation;
|
|
||||||
private int skyLight;
|
|
||||||
private int blockLight;
|
|
||||||
private boolean online;
|
|
||||||
private boolean sneaking;
|
|
||||||
private boolean invisible;
|
|
||||||
private Gamemode gamemode;
|
|
||||||
|
|
||||||
private final FabricMod mod;
|
|
||||||
|
|
||||||
public FabricPlayer(UUID playerUuid, FabricMod mod) {
|
|
||||||
this.uuid = playerUuid;
|
|
||||||
this.mod = mod;
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UUID getUuid() {
|
|
||||||
return this.uuid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Text getName() {
|
|
||||||
return this.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getWorld() {
|
|
||||||
return this.world;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vector3d getPosition() {
|
|
||||||
return this.position;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Vector3d getRotation() {
|
|
||||||
return rotation;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSkyLight() {
|
|
||||||
return skyLight;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getBlockLight() {
|
|
||||||
return blockLight;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isOnline() {
|
|
||||||
return this.online;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSneaking() {
|
|
||||||
return this.sneaking;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInvisible() {
|
|
||||||
return this.invisible;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Gamemode getGamemode() {
|
|
||||||
return this.gamemode;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Only call on server thread!
|
|
||||||
*/
|
|
||||||
public void update() {
|
|
||||||
MinecraftServer server = mod.getServer();
|
|
||||||
if (server == null) {
|
|
||||||
this.online = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
|
|
||||||
if (player == null) {
|
|
||||||
this.online = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());
|
|
||||||
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
|
|
||||||
|
|
||||||
StatusEffectInstance invis = player.getStatusEffect(StatusEffects.INVISIBILITY);
|
|
||||||
this.invisible = invis != null && invis.getDuration() > 0;
|
|
||||||
|
|
||||||
this.name = Text.of(player.getName().getString());
|
|
||||||
this.online = true;
|
|
||||||
|
|
||||||
Vec3d pos = player.getPos();
|
|
||||||
this.position = new Vector3d(pos.getX(), pos.getY(), pos.getZ());
|
|
||||||
this.rotation = new Vector3d(player.pitch, player.headYaw, 0);
|
|
||||||
this.sneaking = player.isSneaking();
|
|
||||||
|
|
||||||
this.skyLight = player.getServerWorld().getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos());
|
|
||||||
this.blockLight = player.getServerWorld().getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());
|
|
||||||
|
|
||||||
try {
|
|
||||||
var world = mod.getWorld(player.getServerWorld());
|
|
||||||
this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder());
|
|
||||||
} catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
|
|
||||||
this.world = "unknown";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,98 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.Dimension;
|
|
||||||
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.util.WorldSavePath;
|
|
||||||
import net.minecraft.world.dimension.DimensionType;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
|
|
||||||
public class FabricWorld implements ServerWorld {
|
|
||||||
|
|
||||||
private final WeakReference<net.minecraft.server.world.ServerWorld> delegate;
|
|
||||||
private final Path saveFolder;
|
|
||||||
|
|
||||||
public FabricWorld(net.minecraft.server.world.ServerWorld delegate) {
|
|
||||||
this.delegate = new WeakReference<>(delegate);
|
|
||||||
|
|
||||||
MinecraftServer server = delegate.getServer();
|
|
||||||
Path worldFolder = delegate.getServer().getRunDirectory().toPath().resolve(server.getSavePath(WorldSavePath.ROOT));
|
|
||||||
this.saveFolder = DimensionType.getSaveDirectory(delegate.getRegistryKey(), worldFolder.toFile()).toPath()
|
|
||||||
.toAbsolutePath().normalize();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Dimension getDimension() {
|
|
||||||
net.minecraft.server.world.ServerWorld world = delegate.get();
|
|
||||||
if (world != null) {
|
|
||||||
if (world.getDimensionRegistryKey().equals(DimensionType.THE_NETHER_REGISTRY_KEY)) return Dimension.NETHER;
|
|
||||||
if (world.getDimensionRegistryKey().equals(DimensionType.THE_END_REGISTRY_KEY)) return Dimension.END;
|
|
||||||
if (world.getDimensionRegistryKey().equals(DimensionType.OVERWORLD_REGISTRY_KEY)) return Dimension.OVERWORLD;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ServerWorld.super.getDimension();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean persistWorldChanges() throws IOException {
|
|
||||||
net.minecraft.server.world.ServerWorld world = delegate.get();
|
|
||||||
if (world == null) return false;
|
|
||||||
|
|
||||||
var taskResult = CompletableFuture.supplyAsync(() -> {
|
|
||||||
try {
|
|
||||||
world.save(null, true, false);
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new CompletionException(e);
|
|
||||||
}
|
|
||||||
}, world.getServer());
|
|
||||||
|
|
||||||
try {
|
|
||||||
return taskResult.get();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
throw new IOException(e);
|
|
||||||
} catch (ExecutionException e) {
|
|
||||||
Throwable t = e.getCause();
|
|
||||||
if (t instanceof IOException) throw (IOException) t;
|
|
||||||
if (t instanceof IllegalArgumentException) throw (IllegalArgumentException) t;
|
|
||||||
throw new IOException(t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Path getSaveFolder() {
|
|
||||||
return this.saveFolder;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import de.bluecolored.bluemap.core.logger.AbstractLogger;
|
|
||||||
|
|
||||||
public class Log4jLogger extends AbstractLogger {
|
|
||||||
|
|
||||||
private Logger out;
|
|
||||||
|
|
||||||
public Log4jLogger(Logger out) {
|
|
||||||
this.out = out;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logError(String message, Throwable throwable) {
|
|
||||||
out.error(message, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logWarning(String message) {
|
|
||||||
out.warn(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logInfo(String message) {
|
|
||||||
out.info(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void logDebug(String message) {
|
|
||||||
if (out.isDebugEnabled()) out.debug(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void noFloodDebug(String message) {
|
|
||||||
if (out.isDebugEnabled()) super.noFloodDebug(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void noFloodDebug(String key, String message) {
|
|
||||||
if (out.isDebugEnabled()) super.noFloodDebug(key, message);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric.events;
|
|
||||||
|
|
||||||
import net.fabricmc.fabric.api.event.Event;
|
|
||||||
import net.fabricmc.fabric.api.event.EventFactory;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
|
|
||||||
public interface PlayerJoinCallback {
|
|
||||||
Event<PlayerJoinCallback> EVENT = EventFactory.createArrayBacked(PlayerJoinCallback.class,
|
|
||||||
(listeners) -> (server, player) -> {
|
|
||||||
for (PlayerJoinCallback event : listeners) {
|
|
||||||
event.onPlayerJoin(server, player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
void onPlayerJoin(MinecraftServer server, ServerPlayerEntity player);
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric.events;
|
|
||||||
|
|
||||||
import net.fabricmc.fabric.api.event.Event;
|
|
||||||
import net.fabricmc.fabric.api.event.EventFactory;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
|
|
||||||
public interface PlayerLeaveCallback {
|
|
||||||
Event<PlayerLeaveCallback> EVENT = EventFactory.createArrayBacked(PlayerLeaveCallback.class,
|
|
||||||
(listeners) -> (server, player) -> {
|
|
||||||
for (PlayerLeaveCallback event : listeners) {
|
|
||||||
event.onPlayerLeave(server, player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
void onPlayerLeave(MinecraftServer server, ServerPlayerEntity player);
|
|
||||||
}
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 de.bluecolored.bluemap.fabric.mixin;
|
|
||||||
|
|
||||||
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 de.bluecolored.bluemap.fabric.events.PlayerJoinCallback;
|
|
||||||
import de.bluecolored.bluemap.fabric.events.PlayerLeaveCallback;
|
|
||||||
import net.minecraft.network.ClientConnection;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.server.PlayerManager;
|
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
|
|
||||||
@Mixin(PlayerManager.class)
|
|
||||||
public abstract class MixinPlayerManager {
|
|
||||||
|
|
||||||
@Shadow
|
|
||||||
public abstract MinecraftServer getServer();
|
|
||||||
|
|
||||||
@Inject(at = @At("RETURN"), method = "onPlayerConnect")
|
|
||||||
public void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) {
|
|
||||||
PlayerJoinCallback.EVENT.invoker().onPlayerJoin(this.getServer(), player);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(at = @At("HEAD"), method = "remove")
|
|
||||||
public void remove(ServerPlayerEntity player, CallbackInfo ci) {
|
|
||||||
PlayerLeaveCallback.EVENT.invoker().onPlayerLeave(this.getServer(), player);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"required": true,
|
|
||||||
"minVersion": "0.8",
|
|
||||||
"package": "de.bluecolored.bluemap.fabric.mixin",
|
|
||||||
"compatibilityLevel": "JAVA_8",
|
|
||||||
"mixins": [],
|
|
||||||
"client": [],
|
|
||||||
"server": [
|
|
||||||
"MixinPlayerManager"
|
|
||||||
],
|
|
||||||
"injectors": {
|
|
||||||
"defaultRequire": 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
{
|
|
||||||
"schemaVersion": 1,
|
|
||||||
"id": "bluemap",
|
|
||||||
"version": "${version}",
|
|
||||||
|
|
||||||
"name": "BlueMap",
|
|
||||||
"description": "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
|
|
||||||
"authors": [
|
|
||||||
"Blue (TBlueF, Lukas Rieger)"
|
|
||||||
],
|
|
||||||
"contact": {
|
|
||||||
"homepage": "https://github.com/BlueMap-Minecraft",
|
|
||||||
"sources": "https://github.com/BlueMap-Minecraft/BlueMap"
|
|
||||||
},
|
|
||||||
|
|
||||||
"license": "MIT",
|
|
||||||
"icon": "assets/bluemap/icon.png",
|
|
||||||
|
|
||||||
"environment": "*",
|
|
||||||
"entrypoints": {
|
|
||||||
"main": [
|
|
||||||
"de.bluecolored.bluemap.fabric.FabricMod"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"mixins": [
|
|
||||||
"bluemap.mixins.json"
|
|
||||||
],
|
|
||||||
|
|
||||||
"depends": {
|
|
||||||
"fabricloader": ">=0.9.0",
|
|
||||||
"fabric": "*",
|
|
||||||
"minecraft": "1.16.1"
|
|
||||||
},
|
|
||||||
"suggests": {}
|
|
||||||
}
|
|
||||||
@ -3,7 +3,6 @@ rootProject.name = "BlueMap"
|
|||||||
includeBuild("implementations/cli")
|
includeBuild("implementations/cli")
|
||||||
|
|
||||||
includeBuild("implementations/fabric-1.15.2")
|
includeBuild("implementations/fabric-1.15.2")
|
||||||
includeBuild("implementations/fabric-1.16.1")
|
|
||||||
includeBuild("implementations/fabric-1.16.2")
|
includeBuild("implementations/fabric-1.16.2")
|
||||||
includeBuild("implementations/fabric-1.17")
|
includeBuild("implementations/fabric-1.17")
|
||||||
includeBuild("implementations/fabric-1.18")
|
includeBuild("implementations/fabric-1.18")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user