GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	api/src/main/java/org/geysermc/geyser/api/GeyserApi.java
#	api/src/main/java/org/geysermc/geyser/api/command/Command.java
#	api/src/main/java/org/geysermc/geyser/api/command/CommandExecutor.java
#	api/src/main/java/org/geysermc/geyser/api/command/CommandSource.java
#	api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventBus.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventRegistrar.java
#	api/src/main/java/org/geysermc/geyser/api/event/EventSubscriber.java
#	api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventBus.java
#	api/src/main/java/org/geysermc/geyser/api/event/ExtensionEventSubscriber.java
#	api/src/main/java/org/geysermc/geyser/api/event/connection/ConnectionEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/downstream/ServerDefineCommandsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCommandsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserDefineCustomItemsEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPostInitializeEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserPreInitializeEvent.java
#	api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserShutdownEvent.java
#	api/src/main/java/org/geysermc/geyser/api/extension/Extension.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionDescription.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLoader.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionLogger.java
#	api/src/main/java/org/geysermc/geyser/api/extension/ExtensionManager.java
#	api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidDescriptionException.java
#	api/src/main/java/org/geysermc/geyser/api/extension/exception/InvalidExtensionException.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemData.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemOptions.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/CustomRenderOffsets.java
#	api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java
#	api/src/main/java/org/geysermc/geyser/api/network/AuthType.java
#	api/src/main/java/org/geysermc/geyser/api/network/BedrockListener.java
#	api/src/main/java/org/geysermc/geyser/api/network/RemoteServer.java
#	api/src/main/java/org/geysermc/geyser/api/util/TriState.java
#	core/build.gradle.kts
#	gradle/libs.versions.toml
#	settings.gradle.kts
This commit is contained in:
Tim203 2023-02-09 17:34:27 +01:00
commit ed36adec56
No known key found for this signature in database
GPG key ID: 736F3CD49EF01DBF
15 changed files with 10205 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gradle/libs.versions.toml
View file

@ -1,6 +1,6 @@
[versions]
base-api = "1.0.0-SNAPSHOT"
cumulus = "1.1.1"
cumulus = "1.1.1"
events = "1.0-SNAPSHOT"
jackson = "2.14.0"
fastutil = "8.5.2"
@ -8,7 +8,7 @@ netty = "4.1.80.Final"
guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8
websocket = "1.5.1"
protocol = "2.9.15-20230106.005737-3"
protocol = "2.9.16-20230205.181702-1"
raknet = "1.6.28-20220125.214016-6"
mcauthlib = "d9d773e"
mcprotocollib = "1.19.3-20230107.194116-10"
@ -17,7 +17,7 @@ adventure = "4.12.0-20220629.025215-9"
adventure-platform = "4.1.2"
junit = "4.13.1"
checkerframework = "3.19.0"
log4j = "2.17.1"
log4j = "2.17.1"
jline = "3.21.0"
terminalconsoleappender = "1.2.0"
paper = "1.19-R0.1-SNAPSHOT"
@ -85,7 +85,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
mcauthlib = { group = "com.github.GeyserMC", name = "MCAuthLib", version.ref = "mcauthlib" }
mcprotocollib = { group = "com.github.steveice10", name = "mcprotocollib", version.ref = "mcprotocollib" }
packetlib = { group = "com.github.steveice10", name = "packetlib", version.ref = "packetlib" }
protocol = { group = "com.nukkitx.protocol", name = "bedrock-v560", version.ref = "protocol" }
protocol = { group = "com.nukkitx.protocol", name = "bedrock-v567", version.ref = "protocol" }
raknet = { group = "com.nukkitx.network", name = "raknet", version.ref = "raknet" }
sponge-api = { group = "org.spongepowered", name = "spongeapi", version.ref = "sponge" }
terminalconsoleappender = { group = "net.minecrell", name = "terminalconsoleappender", version.ref = "terminalconsoleappender" }
@ -94,8 +94,8 @@ viaversion = { group = "com.viaversion", name = "viaversion", version.ref = "via
websocket = { group = "org.java-websocket", name = "Java-WebSocket", version.ref = "websocket" }
[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" ]
jline = [ "jline-terminal", "jline-terminal-jna", "jline-reader" ]
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"]
jline = ["jline-terminal", "jline-terminal-jna", "jline-reader"]