R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now works with legacy forwarding on 1.18 and later

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-08-01 00:52:35 +02:00
parent 43e0ba91c7
commit 2aadd545cf
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -4,7 +4,7 @@ plugins {
} }
group 'org.adde0109' group 'org.adde0109'
version '0.3.1' version '0.3.2'
repositories { repositories {
maven { maven {

9
src/main/java/org/adde0109/ambassador/Ambassador.java
View File

@ -11,6 +11,7 @@ import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.util.GameProfile;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import org.adde0109.ambassador.forge.ForgeConnection; import org.adde0109.ambassador.forge.ForgeConnection;
@ -23,7 +24,7 @@ import org.slf4j.Logger;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.*; import java.util.*;
@Plugin(id = "ambassador", name = "Ambassador", version = "0.3.1", authors = {"adde0109"}) @Plugin(id = "ambassador", name = "Ambassador", version = "0.3.2", authors = {"adde0109"})
public class Ambassador { public class Ambassador {
private final ProxyServer server; private final ProxyServer server;
@ -94,6 +95,12 @@ public class Ambassador {
event.getPlayer().sendMessage(Component.text("This server requires Forge!", NamedTextColor.RED)); event.getPlayer().sendMessage(Component.text("This server requires Forge!", NamedTextColor.RED));
continuation.resume(); continuation.resume();
} else if (forgeConnection.isPresent()) { } else if (forgeConnection.isPresent()) {
//To make legacy forwarding work
List<GameProfile.Property> properties = new ArrayList<>(event.getPlayer().getGameProfileProperties());
properties.add(new GameProfile.Property("extraData", "\1FML2\1",""));
event.getPlayer().setGameProfileProperties(properties);
if (forgeConnection.get().getTransmittedHandshake().isPresent() if (forgeConnection.get().getTransmittedHandshake().isPresent()
&& forgeConnection.get().getRecivedClientModlist().isPresent() && forgeConnection.get().getRecivedClientModlist().isPresent()
&& msg.equals(forgeConnection.get().getTransmittedHandshake().get())) { && msg.equals(forgeConnection.get().getTransmittedHandshake().get())) {