GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

1.20.2 Support (#449)

Browse Source 
* Spigot 1.20.2

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Oops

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* 1.20.2 velocity (#1)

* 1.20.2 Velocity

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Archive build artifacts

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix typo in velocity-plugin.json

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Fix formatting and apply codestyle to eclipse

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Ignore changes to core base prefs

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Proper ignore

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Remove buildship prefs

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

* Formatting

Signed-off-by: GitHub <noreply@github.com>

* Formatting

Signed-off-by: GitHub <noreply@github.com>

* Properly build PRs

* Formatting + remove artifacts

Signed-off-by: GitHub <noreply@github.com>

* Throw IllegalStateException

Signed-off-by: GitHub <noreply@github.com>

---------

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Signed-off-by: GitHub <noreply@github.com>
This commit is contained in:
Kas-tle
2023-09-26 10:36:02 -07:00
committed by GitHub
parent 492be77ad9
commit 26c11bdede
6 changed files with 132 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
velocity/build.gradle.kts
View File

@@ -1,8 +1,15 @@
var velocityVersion = "3.1.1"
var velocityVersion = "3.2.0-SNAPSHOT"
var log4jVersion = "2.11.2"
var gsonVersion = "2.8.8"
var guavaVersion = "25.1-jre"
indra {
javaVersions {
// For Velocity API
target(11)
}
}
dependencies {
api(projects.core)
implementation("cloud.commandframework", "cloud-velocity", Versions.cloudVersion)

8
velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
View File

@@ -76,7 +76,13 @@ public final class VelocityProxyDataHandler extends CommonDataHandler {
SERVER_LOGIN_PACKET = getPrefixedClass("protocol.packet.ServerLogin");
checkNotNull(SERVER_LOGIN_PACKET, "ServerLogin packet class cannot be null");
GET_SESSION_HANDLER = getMethodByName(minecraftConnection, "getSessionHandler", true);
Method sessionHandler = getMethodByName(minecraftConnection, "getSessionHandler", true);
if (sessionHandler == null) {
// We are 1.20.2+
sessionHandler = getMethodByName(minecraftConnection, "getActiveSessionHandler", true);
}
GET_SESSION_HANDLER = sessionHandler;
checkNotNull(GET_SESSION_HANDLER, "getSessionHandler method cannot be null");
INITIAL_LOGIN_SESSION_HANDLER =

2
velocity/src/main/resources/velocity-plugin.json
View File

@@ -1 +1 @@
{"id": "${id}", "name": "${name}", "version": "${version}", "description": "${description}", "url": "$url}", "authors": ["${author}"], "main": "org.geysermc.floodgate.VelocityPlugin"}
{"id": "${id}", "name": "${name}", "version": "${version}", "description": "${description}", "url": "${url}", "authors": ["${author}"], "main": "org.geysermc.floodgate.VelocityPlugin"}