Refactor client version handling and improve ViaVersion support

Centralized client version retrieval in PlayerData to improve consistency and added support for ViaVersion integration. Updated multiple checks to use PlayerData methods instead of direct access, ensuring improved maintainability. Incremented project version to 1.5.3.

Author: SquareCodeFX

src/main/java/de/feelix/sierra/Sierra.java

@@ -16,6 +16,7 @@
 import de.feelix.sierraapi.events.EventBus;
 import de.feelix.sierraapi.server.SierraServer;
 import de.feelix.sierraapi.user.UserRepository;
+import io.github.retrooper.packetevents.util.viaversion.ViaVersionUtil;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -147,6 +148,8 @@ public void onEnable() {
         setPrefix();
         initManager.start();
 
+        ViaVersionUtil.checkIfViaIsPresent();
+
         SierraApiAccessor.setSierraApiInstance(this);
         this.getLogger().info("API is ready");
         LoaderAPI.triggerCallbacks();
@@ -208,4 +211,4 @@ public EventBus eventBus() {
     public SierraServer server() {
         return sierraServer;
     }
-}
+}

src/main/java/de/feelix/sierra/check/impl/frequency/FrequencyDetection.java

@@ -114,7 +114,7 @@ private void handleFlyingDelay(PacketReceiveEvent event, PlayerData data) {
             return;
         }
 
-         if(!event.getUser().getClientVersion().isOlderThan(ClientVersion.V_1_9)) {
+         if(!data.getClientVersion().isOlderThan(ClientVersion.V_1_9)) {
              return;
          }
 

src/main/java/de/feelix/sierra/check/impl/post/PostCheck.java

@@ -42,9 +42,7 @@ public PostCheck(PlayerData playerData) {
     private boolean hasSentFlyingPacket = false;
 
     private void handleFlyingPacket(PacketReceiveEvent event) {
-        if (!flags.isEmpty() && configEngine().config().getBoolean("prevent-post-packets", true) && event.getUser()
-            .getClientVersion()
-            .isOlderThan(ClientVersion.V_1_9)) {
+        if (!flags.isEmpty() && configEngine().config().getBoolean("prevent-post-packets", true)) {
 
             // Okay, the user might be cheating, let's double check
             // 1.8 clients have the idle packet, and this shouldn't false on 1.8 clients
@@ -158,4 +156,4 @@ public void handle(PacketSendEvent event, PlayerData playerData) {
             }
         }
     }
-}
+}

src/main/java/de/feelix/sierra/check/impl/protocol/ProtocolValidation.java

@@ -530,7 +530,7 @@ private void checkBlockPlacement(WrapperPlayClientPlayerBlockPlacement wrapper,
         }
 
         boolean isSequenceNegative = wrapper.getSequence() < 0;
-        boolean isNewerThanV119 = event.getUser().getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_19);
+        boolean isNewerThanV119 = playerData.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_19);
         ServerVersion currentVersion = PacketEvents.getAPI().getServerManager().getVersion();
         boolean isVersionV119OrNewer = currentVersion.isNewerThanOrEquals(ServerVersion.V_1_19);
 
@@ -640,7 +640,7 @@ private void checkNameItem(WrapperPlayClientNameItem wrapper, PacketReceiveEvent
 
     private void handlePlayerDigging(PacketReceiveEvent event, PlayerData playerData) {
 
-        ClientVersion playerVersion = event.getUser().getClientVersion();
+        ClientVersion playerVersion = playerData.getClientVersion();
         boolean isClientVersion19OrNewer = playerVersion.isNewerThanOrEquals(ClientVersion.V_1_19);
 
         ServerVersion currentVersion = PacketEvents.getAPI().getServerManager().getVersion();
@@ -657,7 +657,7 @@ private void handlePlayerDigging(PacketReceiveEvent event, PlayerData playerData
 
     private void checkPlayerDigging(WrapperPlayClientPlayerDigging dig, PacketReceiveEvent event) {
         boolean isSequenceNegative = dig.getSequence() < 0;
-        boolean isNewerVersion = event.getUser().getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_19);
+        boolean isNewerVersion = playerData.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_19);
         ServerVersion currentVersion = PacketEvents.getAPI().getServerManager().getVersion();
         boolean isVersion19OrNewer = currentVersion.isNewerThanOrEquals(ServerVersion.V_1_19);
 
@@ -671,7 +671,7 @@ private void checkPlayerDigging(WrapperPlayClientPlayerDigging dig, PacketReceiv
     }
 
     private void handleUseItem(PacketReceiveEvent event, PlayerData playerData) {
-        ClientVersion playerVersion = event.getUser().getClientVersion();
+        ClientVersion playerVersion = playerData.getClientVersion();
         boolean isClientVersionAtLeastV1_19 = playerVersion.isNewerThanOrEquals(ClientVersion.V_1_19);
 
         ServerVersion currentVersion = PacketEvents.getAPI().getServerManager().getVersion();

src/main/java/de/feelix/sierra/listener/PacketReceiveListener.java

@@ -48,10 +48,6 @@ public void onPacketReceive(PacketReceiveEvent event) {
 
         playerData.getTimingProcessor().getPacketReceiveTask().prepare();
 
-        if (playerData.getClientVersion() == null) {
-            playerData.setClientVersion(event.getUser().getClientVersion());
-        }
-
         playerData.getTransactionProcessor().handleTransactionClient(event);
 
         handleLocale(event, playerData);

src/main/java/de/feelix/sierra/manager/storage/PlayerData.java

@@ -1,5 +1,6 @@
 package de.feelix.sierra.manager.storage;
 
+import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.ProtocolPacketEvent;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.GameMode;
@@ -15,6 +16,7 @@
 import de.feelix.sierraapi.timing.TimingHandler;
 import de.feelix.sierraapi.user.settings.AlertSettings;
 import io.github.retrooper.packetevents.util.folia.FoliaScheduler;
+import io.github.retrooper.packetevents.util.viaversion.ViaVersionUtil;
 import lombok.Data;
 import de.feelix.sierraapi.check.CheckRepository;
 import de.feelix.sierraapi.user.impl.SierraUser;
@@ -76,6 +78,26 @@ public void pollData(Player bukkitPlayer) {
         sendTransaction();
     }
 
+    public ClientVersion getClientVersion() {
+        // Use ViaVersion cause its an early injector
+        if (ViaVersionUtil.getViaVersionAccessor() != null) {
+            this.clientVersion = ClientVersion.getById(ViaVersionUtil.getViaVersionAccessor().getProtocolVersion(user));
+            return this.clientVersion;
+        }
+
+        if (this.clientVersion == null) {
+            // First use players own sent client version
+            this.clientVersion= user.getClientVersion();
+
+            // If players version is still null use server version as client version
+            if (this.clientVersion == null) {
+                this.clientVersion = ClientVersion.getById(
+                    PacketEvents.getAPI().getServerManager().getVersion().getProtocolVersion());
+            }
+        }
+        return this.clientVersion;
+    }
+
     public void sendTransaction() {
         this.transactionProcessor.sendTransaction(true);
     }
@@ -167,7 +189,7 @@ public long existSince() {
 
     @Override
     public String version() {
-        return user.getClientVersion().name().replace("V_", "").replace("_", ".");
+        return getClientVersion().name().replace("V_", "").replace("_", ".");
     }
 
     @Override

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: Sierra
-version: '1.5.2'
+version: '1.5.3'
 author: Feelix
 main: de.feelix.sierra.Sierra
 description: Packet Analysis Tool for the Minecraft Protocol