Merge remote-tracking branch 'origin/master' into feature/floodgate-merge

This commit is contained in:
Tim203 2023-09-24 10:44:56 +02:00
commit 05eb054559
No known key found for this signature in database
298 changed files with 35381 additions and 44504 deletions

View file

@ -1,37 +1,37 @@
[versions]
base-api = "feature-floodgate-merge-1.0.0-SNAPSHOT"
floodgate = "development-2.2.2-SNAPSHOT"
cumulus = "1.1.1"
cumulus = "1.1.2"
erosion = "1.0-20230406.174837-8"
events = "1.0-SNAPSHOT"
jackson = "2.14.0"
events = "1.1-SNAPSHOT"
jackson = { strictly = "2.14.0" } # Don't let other dependencies override
fastutil = "8.5.2"
netty = "4.1.80.Final"
guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8
websocket = "1.5.1"
protocol = "3.0.0.Beta1-20230501.101518-75"
protocol-connection = "3.0.0.Beta1-20230501.101518-74"
raknet = "1.0.0.CR1-20230430.211932-7"
protocol = "3.0.0.Beta1-20230908.171156-106"
protocol-connection = "3.0.0.Beta1-20230908.171156-105"
raknet = "1.0.0.CR1-20230703.195238-9"
blockstateupdater="1.20.30-20230918.203831-4"
mcauthlib = "d9d773e"
mcprotocollib = "1.19.4-2-20230503.145414-3"
adventure = "4.14.0-20230424.215040-7"
adventure-platform = "4.1.2"
mcprotocollib = "1.20-2-20230827.192136-1"
adventure = "4.14.0"
adventure-platform = "4.3.0"
junit = "5.9.2"
checkerframework = "3.19.0"
log4j = "2.17.1"
log4j = "2.20.0"
jline = "3.21.0"
terminalconsoleappender = "1.2.0"
folia = "1.19.4-R0.1-SNAPSHOT"
viaversion = "4.0.0"
adapters = "1.8-SNAPSHOT"
adapters = "1.9-SNAPSHOT"
commodore = "2.2"
bungeecord = "a7c6ede"
velocity = "3.0.0"
sponge = "8.0.0"
fabric-minecraft = "1.19.1"
fabric-loader = "0.14.8"
fabric-api = "0.58.5+1.19.1"
velocity = "3.1.1"
fabric-minecraft = "1.20"
fabric-loader = "0.14.21"
fabric-api = "0.83.0+1.20"
[libraries]
base-api = { group = "org.geysermc.api", name = "base-api", version.ref = "base-api" }
@ -71,7 +71,7 @@ netty-transport-native-kqueue = { group = "io.netty", name = "netty-transport-na
log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
log4j-slf4j18-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j18-impl", version.ref = "log4j" }
log4j-slf4j2-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j" }
jline-terminal = { group = "org.jline", name = "jline-terminal", version.ref = "jline" }
jline-terminal-jna = { group = "org.jline", name = "jline-terminal-jna", version.ref = "jline" }
@ -95,7 +95,6 @@ junit = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "ju
mcauthlib = { group = "com.github.GeyserMC", name = "MCAuthLib", version.ref = "mcauthlib" }
mcprotocollib = { group = "com.github.steveice10", name = "mcprotocollib", version.ref = "mcprotocollib" }
raknet = { group = "org.cloudburstmc.netty", name = "netty-transport-raknet", version.ref = "raknet" }
sponge-api = { group = "org.spongepowered", name = "spongeapi", version.ref = "sponge" }
terminalconsoleappender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref = "terminalconsoleappender" }
velocity-api = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }
viaversion = { group = "com.viaversion", name = "viaversion", version.ref = "viaversion" }
@ -105,10 +104,12 @@ protocol-common = { group = "org.cloudburstmc.protocol", name = "common", versio
protocol-codec = { group = "org.cloudburstmc.protocol", name = "bedrock-codec", version.ref = "protocol" }
protocol-connection = { group = "org.cloudburstmc.protocol", name = "bedrock-connection", version.ref = "protocol-connection" }
blockstateupdater = { group = "org.cloudburstmc", name = "block-state-updater", version.ref = "blockstateupdater"}
[bundles]
jackson = ["jackson-annotations", "jackson-core", "jackson-dataformat-yaml"]
fastutil = ["fastutil-int-int-maps", "fastutil-int-long-maps", "fastutil-int-byte-maps", "fastutil-int-boolean-maps", "fastutil-object-int-maps", "fastutil-object-object-maps"]
adventure = ["adventure-text-serializer-gson", "adventure-text-serializer-legacy", "adventure-text-serializer-plain"]
log4j = ["log4j-api", "log4j-core", "log4j-slf4j18-impl"]
log4j = ["log4j-api", "log4j-core", "log4j-slf4j2-impl"]
jline = ["jline-terminal", "jline-terminal-jna", "jline-reader"]
protocol = ["protocol-common", "protocol-codec", "protocol-connection"]