Yeet the JavaVersion stuff for now, that needs wayyyyyyyyy more testing

Author: onebeastchris

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModBootstrap.java

@@ -28,7 +28,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
-import net.minecraft.SharedConstants;
 import net.minecraft.server.MinecraftServer;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -46,7 +45,6 @@
 import org.geysermc.geyser.platform.mod.platform.GeyserModPlatform;
 import org.geysermc.geyser.platform.mod.world.GeyserModWorldManager;
 import org.geysermc.geyser.text.GeyserLocale;
-import org.geysermc.geyser.util.version.JavaVersion;
 
 import java.io.InputStream;
 import java.net.SocketAddress;
@@ -74,7 +72,6 @@ public abstract class GeyserModBootstrap implements GeyserBootstrap {
     private final GeyserModLogger geyserLogger = new GeyserModLogger();
     private IGeyserPingPassthrough geyserPingPassthrough;
     private WorldManager geyserWorldManager;
-    private JavaVersion javaVersion;
 
     @Override
     public void onGeyserInitialize() {
@@ -85,7 +82,6 @@ public void onGeyserInitialize() {
         if (geyserConfig == null) {
             return;
         }
-        this.javaVersion = JavaVersion.lookup(SharedConstants.getProtocolVersion());
         this.geyser = GeyserImpl.load(this);
     }
 
@@ -174,11 +170,6 @@ public WorldManager getWorldManager() {
         return geyserWorldManager;
     }
 
-    @Override
-    public JavaVersion getJavaProtocolVersion() {
-        return javaVersion;
-    }
-
     @Override
     public Path getConfigFolder() {
         return dataFolder;

bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java

@@ -66,7 +66,6 @@
 import org.geysermc.geyser.platform.spigot.world.manager.GeyserSpigotNativeWorldManager;
 import org.geysermc.geyser.platform.spigot.world.manager.GeyserSpigotWorldManager;
 import org.geysermc.geyser.text.GeyserLocale;
-import org.geysermc.geyser.util.version.JavaVersion;
 import org.geysermc.geyser.util.metrics.MetricsPlatform;
 import org.incendo.cloud.bukkit.BukkitCommandManager;
 import org.incendo.cloud.execution.ExecutionCoordinator;
@@ -86,7 +85,6 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
             new GeyserPaperLogger(this, getLogger()) : new GeyserSpigotLogger(getLogger());
     private IGeyserPingPassthrough geyserSpigotPingPassthrough;
     private GeyserSpigotWorldManager geyserWorldManager;
-    private JavaVersion protocolVersion;
 
     private GeyserImpl geyser;
 
@@ -97,14 +95,6 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
 
     @Override
     public void onLoad() {
-        try {
-            this.protocolVersion = JavaVersion.lookup(Bukkit.getUnsafe().getProtocolVersion());
-        } catch (Throwable t) {
-            // ignored, likely running on spigot?
-        }
-
-        // TODO getting protocol version on spigot
-
         onGeyserInitialize();
     }
 
@@ -406,11 +396,6 @@ public Path getConfigFolder() {
         return getDataFolder().toPath();
     }
 
-    @Override
-    public JavaVersion getJavaProtocolVersion() {
-        return protocolVersion;
-    }
-
     @Override
     public BootstrapDumpInfo getDumpInfo() {
         return new GeyserSpigotDumpInfo();

core/src/main/java/org/geysermc/geyser/GeyserBootstrap.java

@@ -35,7 +35,6 @@
 import org.geysermc.geyser.level.GeyserWorldManager;
 import org.geysermc.geyser.level.WorldManager;
 import org.geysermc.geyser.ping.IGeyserPingPassthrough;
-import org.geysermc.geyser.util.version.JavaVersion;
 import org.geysermc.geyser.util.metrics.MetricsPlatform;
 import org.geysermc.geyser.util.metrics.ProvidedMetricsPlatform;
 
@@ -118,15 +117,6 @@ default WorldManager getWorldManager() {
         return DEFAULT_CHUNK_MANAGER;
     }
 
-    /**
-     * Returns the Java protocol version, if known
-     *
-     * @return the Java protocol version
-     */
-    default JavaVersion getJavaProtocolVersion() {
-        return JavaVersion.UNKNOWN;
-    }
-
     /**
      * Return the data folder where files get stored
      *

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

@@ -197,7 +197,6 @@
 import org.geysermc.geyser.util.InventoryUtils;
 import org.geysermc.geyser.util.LoginEncryptionUtils;
 import org.geysermc.geyser.util.MathUtils;
-import org.geysermc.geyser.util.version.JavaVersion;
 import org.geysermc.mcprotocollib.auth.GameProfile;
 import org.geysermc.mcprotocollib.network.BuiltinFlags;
 import org.geysermc.mcprotocollib.network.ClientSession;
@@ -559,9 +558,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
     @Setter
     private boolean oldSmithingTable = false;
 
-    @Getter @Setter
-    private JavaVersion javaProtocolVersion;
-
     /**
      * Whether to use the minecart_improvements experiment
      */
@@ -866,9 +862,6 @@ public GeyserSession(GeyserImpl geyser, BedrockServerSession bedrockServerSessio
         this.emotes = new HashSet<>();
         geyser.getSessionManager().getSessions().values().forEach(player -> this.emotes.addAll(player.getEmotes()));
 
-        // Attempt to set if possible - will be -1 if we're on a proxy that doesn't know about the backend
-        this.setJavaProtocolVersion(geyser.getBootstrap().getJavaProtocolVersion());
-
         this.remoteServer = geyser.defaultRemoteServer();
     }
 

core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java

@@ -26,7 +26,6 @@
 package org.geysermc.geyser.translator.protocol.java;
 
 import com.google.common.base.Charsets;
-import com.google.gson.JsonObject;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.cloudburstmc.protocol.bedrock.packet.TransferPacket;
@@ -44,8 +43,6 @@
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
-import org.geysermc.geyser.util.version.JavaVersion;
-import org.geysermc.geyser.util.JsonUtils;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket;
 
@@ -54,7 +51,6 @@
 @Translator(packet = ClientboundCustomPayloadPacket.class)
 public class JavaCustomPayloadTranslator extends PacketTranslator<ClientboundCustomPayloadPacket> {
     private final GeyserLogger logger = GeyserImpl.getInstance().getLogger();
-    private static final String VIA_SERVER_DETAILS_CHANNEL = "vv:server_details";
 
     @Override
     public void translate(GeyserSession session, ClientboundCustomPayloadPacket packet) {
@@ -67,36 +63,6 @@ public void translate(GeyserSession session, ClientboundCustomPayloadPacket pack
             return;
         }
 
-        if (channel.equals(VIA_SERVER_DETAILS_CHANNEL)) {
-            byte[] data = packet.getData();
-            String json = new String(data, StandardCharsets.UTF_8);
-            try {
-                JsonObject object = JsonUtils.parseJson(json);
-                int specVersion = object.get("specVersion").getAsInt();
-                if (specVersion == 1) {
-                    String versionType = object.get("versionType").getAsString();
-                    if (versionType.equals("RELEASE")) {
-                        int serverVersion = object.get("version").getAsInt();
-                        GeyserImpl.getInstance().getLogger().debug("Setting server version using viaversion server details payload: " + serverVersion);
-                        session.setJavaProtocolVersion(JavaVersion.lookup(serverVersion));
-                    } else {
-                        GeyserImpl.getInstance().getLogger().debug("Got unusual server version type payload: " + object);
-                    }
-                } else {
-                    logger.warning("Unknown spec version received on the vv:server_details channel! Version: " + specVersion);
-                    if (logger.isDebug()) {
-                        logger.debug(object);
-                    }
-                }
-            } catch (Exception e) {
-                logger.warning("Unable to parse vv:server_details payload! Reason: " + e.getMessage());
-                if (logger.isDebug()) {
-                    logger.debug(e);
-                }
-            }
-            return;
-        }
-
         if (channel.equals(PluginMessageChannels.FORM)) {
             session.ensureInEventLoop(() -> {
                 byte[] data = packet.getData();