mirror of
https://github.com/ViaVersion/VIAaaS.git
synced 2024-11-24 12:25:39 +01:00
update via
This commit is contained in:
creeper123123321
parent
d407dd2002
commit
d2b8f7b617
@ -15,11 +15,11 @@ buildscript {
|
||||
plugins {
|
||||
`java-library`
|
||||
application
|
||||
kotlin("jvm") version "1.8.0"
|
||||
kotlin("jvm") version "1.8.10"
|
||||
id("maven-publish")
|
||||
id("com.github.ben-manes.versions") version "0.44.0"
|
||||
id("com.github.johnrengelman.shadow") version "7.1.2"
|
||||
id("com.palantir.git-version") version "0.15.0"
|
||||
id("com.github.ben-manes.versions") version "0.46.0"
|
||||
id("com.github.johnrengelman.shadow") version "8.1.0"
|
||||
id("com.palantir.git-version") version "2.0.0"
|
||||
id("org.gradlewebtools.minify") version "1.3.2" apply false
|
||||
}
|
||||
|
||||
@ -60,23 +60,23 @@ dependencies {
|
||||
implementation(kotlin("stdlib-jdk8"))
|
||||
implementation(kotlin("reflect"))
|
||||
|
||||
val vvVer = "4.6.0-23w07a-SNAPSHOT"
|
||||
val vbVer = "4.6.0-23w07a-SNAPSHOT"
|
||||
val vrVer = "9e4ac93"
|
||||
val vvVer = "4.6.0-1.19.4-rc2-SNAPSHOT"
|
||||
val vbVer = "4.6.0-1.19.4-pre4-SNAPSHOT"
|
||||
val vrVer = "549d1bd"
|
||||
implementation("com.viaversion:viaversion:$vvVer") { isTransitive = false }
|
||||
implementation("com.viaversion:viabackwards:$vbVer") { isTransitive = false }
|
||||
implementation("com.github.ViaVersion.ViaRewind:viarewind-all:$vrVer") { isTransitive = false }
|
||||
implementation("net.raphimc:ViaAprilFools:2.0.4")
|
||||
implementation("net.raphimc:ViaAprilFools:2.0.6")
|
||||
|
||||
val nettyVer = "4.1.86.Final"
|
||||
val nettyVer = "4.1.89.Final"
|
||||
implementation("io.netty:netty-handler-proxy:$nettyVer")
|
||||
implementation("io.netty:netty-resolver-dns:$nettyVer")
|
||||
implementation("io.netty:netty-transport-native-epoll:$nettyVer:linux-aarch_64")
|
||||
implementation("io.netty:netty-transport-native-epoll:$nettyVer:linux-x86_64")
|
||||
implementation("io.netty:netty-tcnative-boringssl-static:2.0.54.Final:linux-aarch_64")
|
||||
implementation("io.netty:netty-tcnative-boringssl-static:2.0.54.Final:linux-x86_64")
|
||||
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.16.Final:linux-aarch_64")
|
||||
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.16.Final:linux-x86_64")
|
||||
implementation("io.netty:netty-tcnative-boringssl-static:2.0.59.Final:linux-aarch_64")
|
||||
implementation("io.netty:netty-tcnative-boringssl-static:2.0.59.Final:linux-x86_64")
|
||||
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.19.Final:linux-aarch_64")
|
||||
implementation("io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.19.Final:linux-x86_64")
|
||||
|
||||
implementation("com.google.guava:guava:31.1-jre")
|
||||
implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT")
|
||||
@ -84,7 +84,7 @@ dependencies {
|
||||
implementation("org.powernukkit.fastutil:fastutil-lite:8.1.1")
|
||||
implementation("org.yaml:snakeyaml:1.33")
|
||||
|
||||
val log4jVer = "2.19.0"
|
||||
val log4jVer = "2.20.0"
|
||||
val slf4jVer = "2.0.6"
|
||||
implementation("com.lmax:disruptor:3.4.4")
|
||||
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||
@ -92,10 +92,10 @@ dependencies {
|
||||
implementation("org.apache.logging.log4j:log4j-iostreams:$log4jVer")
|
||||
implementation("org.apache.logging.log4j:log4j-jul:$log4jVer")
|
||||
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVer")
|
||||
implementation("org.jline:jline-terminal-jansi:3.21.0")
|
||||
implementation("org.jline:jline-terminal-jansi:3.23.0")
|
||||
implementation("org.slf4j:slf4j-api:$slf4jVer")
|
||||
|
||||
val ktorVersion = "2.2.3"
|
||||
val ktorVersion = "2.2.4"
|
||||
implementation("io.ktor:ktor-network-tls-certificates-jvm:$ktorVersion")
|
||||
implementation("io.ktor:ktor-server-websockets:$ktorVersion")
|
||||
implementation("io.ktor:ktor-server-netty-jvm:$ktorVersion")
|
||||
@ -113,7 +113,7 @@ dependencies {
|
||||
implementation("io.ktor:ktor-client-logging-jvm:$ktorVersion")
|
||||
testImplementation("io.ktor:ktor-server-test-host-jvm:$ktorVersion")
|
||||
|
||||
implementation("com.auth0:java-jwt:4.2.1")
|
||||
implementation("com.auth0:java-jwt:4.3.0")
|
||||
}
|
||||
|
||||
val run: JavaExec by tasks
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
||||
networkTimeout=10000
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
12
gradlew
vendored
12
gradlew
vendored
@ -55,7 +55,7 @@
|
||||
# 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
|
||||
# https://github.com/gradle/gradle/blob/HEAD/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/.
|
||||
@ -80,10 +80,10 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
# 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"'
|
||||
@ -143,12 +143,16 @@ fi
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
|
||||
1
gradlew.bat
vendored
1
gradlew.bat
vendored
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ import com.viaversion.aas.config.AspirinViaConfig
|
||||
import com.viaversion.viaversion.ViaManagerImpl
|
||||
import com.viaversion.viaversion.api.Via
|
||||
import com.viaversion.viaversion.api.command.ViaCommandSender
|
||||
import com.viaversion.viaversion.api.data.MappingDataLoader
|
||||
import com.viaversion.viaversion.api.platform.PlatformTask
|
||||
import com.viaversion.viaversion.api.platform.ViaPlatform
|
||||
import com.viaversion.viaversion.libs.gson.JsonObject
|
||||
import com.viaversion.viaversion.util.VersionInfo
|
||||
@ -44,9 +44,9 @@ object AspirinPlatform : ViaPlatform<UUID> {
|
||||
)
|
||||
conf = AspirinViaConfig()
|
||||
|
||||
MappingDataLoader.enableMappingsCache()
|
||||
Via.getManager().addEnableListener(enableListener)
|
||||
(Via.getManager() as ViaManagerImpl).init()
|
||||
(Via.getManager() as ViaManagerImpl).onServerLoaded()
|
||||
}
|
||||
|
||||
override fun sendMessage(p0: UUID, p1: String) = Unit
|
||||
@ -64,6 +64,9 @@ object AspirinPlatform : ViaPlatform<UUID> {
|
||||
override fun getDataFolder() = File("config/viaversion")
|
||||
override fun getConf() = conf
|
||||
override fun runAsync(p0: Runnable) = FutureTask(CompletableFuture.runAsync(p0, executor))
|
||||
override fun runRepeatingAsync(runnable: Runnable?, ticks: Long): PlatformTask<*> =
|
||||
FutureTask(eventLoop.scheduleAtFixedRate({ runAsync(runnable!!) }, 0, ticks * 50, TimeUnit.MILLISECONDS))
|
||||
|
||||
override fun getLogger() = logger
|
||||
override fun getOnlinePlayers(): Array<ViaCommandSender> = emptyArray()
|
||||
override fun isPluginEnabled() = true
|
||||
@ -72,7 +75,7 @@ object AspirinPlatform : ViaPlatform<UUID> {
|
||||
override fun getPlatformVersion() = AspirinServer.version
|
||||
override fun getPluginVersion() = VersionInfo.VERSION
|
||||
override fun isOldClientsAllowed() = true
|
||||
override fun hasPlugin(name: String?)= false
|
||||
override fun hasPlugin(name: String?) = false
|
||||
|
||||
override fun isProxy() = true
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user