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

Bstats and velocity 3.1.1 compatibility

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-07-03 05:32:14 +02:00
parent 8a970f9a22
commit a64fa24dcc
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.gradle
View File

@ -1,9 +1,10 @@
plugins { plugins {
id 'java' id 'java'
id "com.github.johnrengelman.shadow" version "7.1.2"
} }
group 'org.adde0109' group 'org.adde0109'
version '1.0-SNAPSHOT' version '0.2.0-SNAPSHOT'
repositories { repositories {
maven { maven {
@ -14,8 +15,18 @@ repositories {
} }
dependencies { dependencies {
implementation 'com.velocitypowered:velocity-api:3.1.2-SNAPSHOT' implementation 'com.velocitypowered:velocity-api:3.1.1'
implementation 'com.electronwill.night-config:toml:3.6.5' implementation 'com.electronwill.night-config:toml:3.6.5'
implementation 'com.google.guava:guava:31.1-jre' implementation 'org.bstats:bstats-velocity:3.0.0'
annotationProcessor 'com.velocitypowered:velocity-api:3.1.2-SNAPSHOT' annotationProcessor 'com.velocitypowered:velocity-api:3.1.2-SNAPSHOT'
} }
shadowJar {
relocate 'org.bstats', 'org.adde0109.ambassador'
}
assemble.dependsOn(shadowJar)
tasks.shadowJar.configure {
classifier = null
}

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

@ -2,7 +2,6 @@ package org.adde0109.ambassador;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.Continuation;
import com.velocitypowered.api.event.PostOrder;
import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.player.PlayerChooseInitialServerEvent; import com.velocitypowered.api.event.player.PlayerChooseInitialServerEvent;
import com.velocitypowered.api.event.player.ServerPreConnectEvent; import com.velocitypowered.api.event.player.ServerPreConnectEvent;
@ -13,21 +12,23 @@ import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.proxy.server.RegisteredServer;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.adde0109.ambassador.Forge.ForgeConnection; import org.adde0109.ambassador.Forge.ForgeConnection;
import org.adde0109.ambassador.Forge.ForgeHandshakeHandler; import org.adde0109.ambassador.Forge.ForgeHandshakeHandler;
import org.adde0109.ambassador.Forge.ForgeHandshakeUtils; import org.adde0109.ambassador.Forge.ForgeHandshakeUtils;
import org.adde0109.ambassador.Forge.ForgeServerConnection; import org.adde0109.ambassador.Forge.ForgeServerConnection;
import org.checkerframework.checker.index.qual.PolyUpperBound; import org.bstats.velocity.Metrics;
import org.slf4j.Logger; 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.1.0-SNAPSHOT", url = "", description = "", authors = {"adde0109"}) @Plugin(id = "ambassador", name = "Ambassador", version = "0.2.0-SNAPSHOT", url = "", description = "", authors = {"adde0109"})
public class Ambassador { public class Ambassador {
private final ProxyServer server; private final ProxyServer server;
private final Logger logger; private final Logger logger;
private final Metrics.Factory metricsFactory;
private final Path dataDirectory; private final Path dataDirectory;
private Optional<RegisteredServer> forgeServer; private Optional<RegisteredServer> forgeServer;
private AmbassadorConfig config; private AmbassadorConfig config;
@ -37,14 +38,17 @@ public class Ambassador {
@Inject @Inject
public Ambassador(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { public Ambassador(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory) {
this.server = server; this.server = server;
this.logger = logger; this.logger = logger;
this.dataDirectory = dataDirectory; this.dataDirectory = dataDirectory;
this.metricsFactory = metricsFactory;
} }
@Subscribe @Subscribe
public void onProxyInitialization(ProxyInitializeEvent event) { public void onProxyInitialization(ProxyInitializeEvent event) {
Metrics metrics = metricsFactory.make(this, 15655);
config = AmbassadorConfig.readOrCreateConfig(dataDirectory,server,logger); config = AmbassadorConfig.readOrCreateConfig(dataDirectory,server,logger);
if(config != null) { if(config != null) {
forgeHandshakeHandler = new ForgeHandshakeHandler(config, server, logger); forgeHandshakeHandler = new ForgeHandshakeHandler(config, server, logger);
@ -89,9 +93,9 @@ public class Ambassador {
}); });
//If vanilla tries to connect to forge //If vanilla tries to connect to forge
} else if (forgeServerConnectionOptional.isPresent() && (event.getPreviousServer() != null)){ } else if (forgeServerConnectionOptional.isPresent() && (event.getPlayer().getCurrentServer().isPresent())){
event.setResult(ServerPreConnectEvent.ServerResult.denied()); event.setResult(ServerPreConnectEvent.ServerResult.denied());
event.getPlayer().sendMessage(Component.text("This server requires Forge!")); event.getPlayer().sendMessage(Component.text("This server requires Forge!", NamedTextColor.RED));
continuation.resume(); continuation.resume();
} else { } else {
continuation.resume(); continuation.resume();