Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-12-23 00:47:39 +01:00
Code Issues Projects Releases Wiki Activity

Add player versions and sample pipelines to dump

Browse Source
This commit is contained in:
Nassim Jahnke 2023-01-10 19:05:54 +01:00
parent 4067107b52
commit 0ae64203f5
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
6 changed files with 72 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/java/com/viaversion/viaversion/bukkit/commands/BukkitCommandSender.java
View File

@ -19,7 +19,7 @@ package com.viaversion.viaversion.bukkit.commands;
import com.viaversion.viaversion.api.command.ViaCommandSender;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.entity.Entity;
import java.util.UUID;
@ -42,10 +42,10 @@ public class BukkitCommandSender implements ViaCommandSender {
@Override
public UUID getUUID() {
if (sender instanceof Player) {
return ((Player) sender).getUniqueId();
if (sender instanceof Entity) {
return ((Entity) sender).getUniqueId();
} else {
return UUID.fromString(getName());
return new UUID(0, 0);
}
}

2
bungee/src/main/java/com/viaversion/viaversion/bungee/commands/BungeeCommandSender.java
View File

@ -45,7 +45,7 @@ public class BungeeCommandSender implements ViaCommandSender {
if (sender instanceof ProxiedPlayer) {
return ((ProxiedPlayer) sender).getUniqueId();
} else {
return UUID.fromString(getName());
return new UUID(0, 0);
}
}

59
common/src/main/java/com/viaversion/viaversion/commands/defaultsubs/DumpSubCmd.java
View File

@ -19,10 +19,13 @@ package com.viaversion.viaversion.commands.defaultsubs;
import com.google.common.io.CharStreams;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.command.ViaCommandSender;
import com.viaversion.viaversion.api.command.ViaSubCommand;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.dump.DumpTemplate;
import com.viaversion.viaversion.dump.VersionInfo;
import com.viaversion.viaversion.util.GsonUtil;
@ -34,7 +37,12 @@ import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
import java.util.logging.Level;
public class DumpSubCmd extends ViaSubCommand {
@ -64,14 +72,13 @@ public class DumpSubCmd extends ViaSubCommand {
);
Map<String, Object> configuration = Via.getPlatform().getConfigurationProvider().getValues();
DumpTemplate template = new DumpTemplate(version, configuration, Via.getPlatform().getDump(), Via.getManager().getInjector().getDump());
DumpTemplate template = new DumpTemplate(version, configuration, Via.getPlatform().getDump(), Via.getManager().getInjector().getDump(), getPlayerSample(sender.getUUID()));
Via.getPlatform().runAsync(new Runnable() {
@Override
public void run() {
HttpURLConnection con = null;
HttpURLConnection con;
try {
con = (HttpURLConnection) new URL("https://dump.viaversion.com/documents").openConnection();
} catch (IOException e) {
@ -125,4 +132,50 @@ public class DumpSubCmd extends ViaSubCommand {
private String getUrl(String id) {
return String.format("https://dump.viaversion.com/%s", id);
}
private JsonObject getPlayerSample(UUID senderUuid) {
JsonObject playerSample = new JsonObject();
// Player versions
JsonObject versions = new JsonObject();
playerSample.add("versions", versions);
Map<ProtocolVersion, Integer> playerVersions = new TreeMap<>((o1, o2) -> ProtocolVersion.getIndex(o2) - ProtocolVersion.getIndex(o1));
for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
ProtocolVersion protocolVersion = ProtocolVersion.getProtocol(connection.getProtocolInfo().getProtocolVersion());
playerVersions.compute(protocolVersion, (v, num) -> num != null ? num + 1 : 1);
}
for (Map.Entry<ProtocolVersion, Integer> entry : playerVersions.entrySet()) {
versions.addProperty(entry.getKey().getName(), entry.getValue());
}
// Pipeline of sender
Set<List<String>> pipelines = new HashSet<>();
UserConnection senderConnection = Via.getAPI().getConnection(senderUuid);
if (senderConnection != null && senderConnection.getChannel() != null) {
pipelines.add(senderConnection.getChannel().pipeline().names());
}
// Other pipelines if different ones are found (3 max)
for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
if (connection.getChannel() == null) {
continue;
}
List<String> names = connection.getChannel().pipeline().names();
if (pipelines.add(names) && pipelines.size() == 3) {
break;
}
}
int i = 0;
for (List<String> pipeline : pipelines) {
JsonArray senderPipeline = new JsonArray(pipeline.size());
for (String name : pipeline) {
senderPipeline.add(name);
}
playerSample.add("pipeline-" + i++, senderPipeline);
}
return playerSample;
}
}

10
common/src/main/java/com/viaversion/viaversion/dump/DumpTemplate.java
View File

@ -18,7 +18,9 @@
package com.viaversion.viaversion.dump;
import com.google.gson.JsonObject;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.Collection;
import java.util.Map;
public class DumpTemplate {
@ -26,12 +28,14 @@ public class DumpTemplate {
private final Map<String, Object> configuration;
private final JsonObject platformDump;
private final JsonObject injectionDump;
private final JsonObject playerSample;
public DumpTemplate(VersionInfo versionInfo, Map<String, Object> configuration, JsonObject platformDump, JsonObject injectionDump) {
public DumpTemplate(VersionInfo versionInfo, Map<String, Object> configuration, JsonObject platformDump, JsonObject injectionDump, JsonObject playerSample) {
this.versionInfo = versionInfo;
this.configuration = configuration;
this.platformDump = platformDump;
this.injectionDump = injectionDump;
this.playerSample = playerSample;
}
public VersionInfo getVersionInfo() {
@ -49,4 +53,8 @@ public class DumpTemplate {
public JsonObject getInjectionDump() {
return injectionDump;
}
public JsonObject getPlayerSample() {
return playerSample;
}
}

2
sponge/src/main/java/com/viaversion/viaversion/sponge/commands/SpongeCommandSender.java
View File

@ -47,7 +47,7 @@ public class SpongeCommandSender implements ViaCommandSender {
if (source instanceof Identifiable) {
return ((Identifiable) source).uniqueId();
} else {
return UUID.fromString(getName());
return new UUID(0, 0);
}
}

2
velocity/src/main/java/com/viaversion/viaversion/velocity/command/VelocityCommandSender.java
View File

@ -46,7 +46,7 @@ public class VelocityCommandSender implements ViaCommandSender {
if (source instanceof Player) {
return ((Player) source).getUniqueId();
}
return UUID.fromString(getName());
return new UUID(0, 0);
}
@Override