chore: cleanup for now-public repo

Timongcraft · Timongcraft · commit dd7c252799fc · 2025-04-13T11:17:56.000+02:00
chore: remove unnecessary mapping entries chore: update player loaded world api -> see PaperMC/Velocity#1541
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.timongcraft</groupId>
     <artifactId>VeloProtocol</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/src/generated/java/de/timongcraft/veloprotocol/network/protocol/blockentities/VeloBlockEntityTypes.java b/src/generated/java/de/timongcraft/veloprotocol/network/protocol/blockentities/VeloBlockEntityTypes.java
@@ -151,8 +151,8 @@ private static int[] getProtocolIds(String name) {
         int[] protocolIds = new int[ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size()];
 
         for (int i = 0; i < ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size(); i++) {
-            Integer nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:block_entity_type").getOrDefault(name, null);
-            protocolIds[i] = nameProtocolId != null ? nameProtocolId : -1;
+            int nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:block_entity_type").getOrDefault(name, -1);
+            protocolIds[i] = nameProtocolId;
         }
 
         return protocolIds;
diff --git a/src/generated/java/de/timongcraft/veloprotocol/network/protocol/datacomponents/VeloDataComponentTypes.java b/src/generated/java/de/timongcraft/veloprotocol/network/protocol/datacomponents/VeloDataComponentTypes.java
@@ -253,8 +253,8 @@ private static int[] getProtocolIds(String name) {
         int[] protocolIds = new int[ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size()];
 
         for (int i = 0; i < ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size(); i++) {
-            Integer nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:data_component_type").getOrDefault(name, null);
-            protocolIds[i] = nameProtocolId != null ? nameProtocolId : -1;
+            int nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:data_component_type").getOrDefault(name, -1);
+            protocolIds[i] = nameProtocolId;
         }
 
         return protocolIds;
diff --git a/src/generated/java/de/timongcraft/veloprotocol/network/protocol/effects/VeloEntityEffects.java b/src/generated/java/de/timongcraft/veloprotocol/network/protocol/effects/VeloEntityEffects.java
@@ -132,8 +132,8 @@ private static int[] getProtocolIds(String name) {
         int[] protocolIds = new int[ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size()];
 
         for (int i = 0; i < ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size(); i++) {
-            Integer nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:mob_effect").getOrDefault(name, null);
-            protocolIds[i] = nameProtocolId != null ? nameProtocolId : -1;
+            int nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:mob_effect").getOrDefault(name, -1);
+            protocolIds[i] = nameProtocolId;
         }
 
         return protocolIds;
diff --git a/src/main/java/de/timongcraft/veloprotocol/apis/PlayerLoadedWorldApi.java b/src/main/java/de/timongcraft/veloprotocol/apis/PlayerLoadedWorldApi.java
@@ -12,10 +12,12 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Duration;
-import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
+@SuppressWarnings("removal")
+@Deprecated(since = "1.3.3", forRemoval = true) // will be removed when the pull request is merged - https://github.com/PaperMC/Velocity/pull/1541
 @Beta
 public class PlayerLoadedWorldApi {
 
@@ -33,36 +35,32 @@ public static void register(Object pluginMainClass, ProxyServer proxyServer, @Nu
     private final ProxyServer proxyServer;
     private final Object pluginMainClass;
     private final Duration timeout;
-    private final Map<UUID, PlayerClientLoadedWorldEvent.Cause> loadingPlayers;
+    private final Set<UUID> loadingPlayers;
 
     private PlayerLoadedWorldApi(Object pluginMainClass, ProxyServer proxyServer, @Nullable Duration timeout) {
         this.proxyServer = proxyServer;
         this.pluginMainClass = pluginMainClass;
         this.timeout = timeout != null ? timeout : NOTCHIAN_TIMEOUT;
-        loadingPlayers = new ConcurrentHashMap<>();
+        loadingPlayers = ConcurrentHashMap.newKeySet();
     }
 
     @Subscribe
     public void onPostConnect(ServerPostConnectEvent event) {
         if (event.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_21_4)) return;
-        loadingPlayers.put(event.getPlayer().getUniqueId(), PlayerClientLoadedWorldEvent.Cause.SERVER_JOIN);
+        loadingPlayers.add(event.getPlayer().getUniqueId());
 
         proxyServer.getScheduler().buildTask(pluginMainClass, () -> {
-            PlayerClientLoadedWorldEvent.Cause cause = loadingPlayers.remove(event.getPlayer().getUniqueId());
-            if (cause == null) return;
+            loadingPlayers.remove(event.getPlayer().getUniqueId());
             if (!event.getPlayer().isActive()) return;
-
-            proxyServer.getEventManager().fireAndForget(new PlayerClientLoadedWorldEvent(event.getPlayer(), cause, true));
+            proxyServer.getEventManager().fireAndForget(new PlayerClientLoadedWorldEvent(event.getPlayer(), true));
         }).delay(timeout).schedule();
     }
 
     @Subscribe
     public void onClientLoadedWorldPacket(PacketReceiveEvent event) {
         if (!(event.getPacket() instanceof PlayerLoadedWorldPacket)) return;
-        PlayerClientLoadedWorldEvent.Cause cause = loadingPlayers.remove(event.getPlayer().getUniqueId());
-        if (cause == null) return;
-
-        proxyServer.getEventManager().fireAndForget(new PlayerClientLoadedWorldEvent(event.getPlayer(), cause, false));
+        loadingPlayers.remove(event.getPlayer().getUniqueId());
+        proxyServer.getEventManager().fireAndForget(new PlayerClientLoadedWorldEvent(event.getPlayer(), false));
     }
 
     @Subscribe
diff --git a/src/main/java/de/timongcraft/veloprotocol/events/PlayerClientLoadedWorldEvent.java b/src/main/java/de/timongcraft/veloprotocol/events/PlayerClientLoadedWorldEvent.java
@@ -3,44 +3,33 @@
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.velocitypowered.api.proxy.Player;
-import org.jetbrains.annotations.ApiStatus;
-
-//todo: respawn timeout event - requires decoded respawn packets
-//todo: normal respawn by allowing after a respawn packet
 
 /**
- * Called when a player is marked as loaded.
+ * Called when a player is marked as loaded by the client.
  *
  * <p>Note: This event may be fired in the following scenarios:
  * <br>- If the player notifies the server after loading the world (closing the downloading terrain screen)
- * <br>- If the player has not notified the server within 60 ticks after joining the server / respawning (RESPAWN NOT IMPLEMENTED) - ({@link #timeout} = true)
- * <br>- If the player respawned (NOT IMPLEMENTED)
+ * <br>- If the player has <u>not</u> notified the server within 1500ms after joining the server - ({@link #timeout} = true)
  */
 @Beta
-public class PlayerClientLoadedWorldEvent {
+@Deprecated(since = "1.3.3", forRemoval = true) // will be removed when the pull request is merged - https://github.com/PaperMC/Velocity/pull/1541
+public final class PlayerClientLoadedWorldEvent {
 
     private final Player player;
-    private final Cause cause;
     private final boolean timeout;
 
-    @ApiStatus.Internal
-    public PlayerClientLoadedWorldEvent(Player player, Cause cause, boolean timeout) {
+    public PlayerClientLoadedWorldEvent(Player player, boolean timeout) {
         this.player = Preconditions.checkNotNull(player, "player");
-        this.cause = Preconditions.checkNotNull(cause, "cause");
         this.timeout = timeout;
     }
 
     public Player getPlayer() {
         return player;
     }
 
-    public Cause getCause() {
-        return cause;
-    }
-
     /**
      * True if the event was triggered because the server has not been notified by the player
-     * for 60 ticks after the player joined the server or respawned.
+     * for 1500ms after the player joined the server.
      *
      * @return true if the event was triggered because of a timeout
      */
@@ -50,30 +39,10 @@ public boolean isTimeout() {
 
     @Override
     public String toString() {
-        return "PlayerClientLoadedWorldEvent{" +
-                "player=" + player +
-                ", cause=" + cause +
-                ", timeout=" + timeout +
-                '}';
-    }
-
-    /**
-     * Represents the possible causes for the event.
-     */
-    public enum Cause {
-
-        /**
-         * The player joined a server and loaded the first world
-         */
-        SERVER_JOIN,
-        /**
-         * The player respawned.
-         *
-         * <p>Note: This will also be triggered on dimension switches
-         */
-        // TODO: implement
-        RESPAWN
-
+        return "PlayerClientLoadedWorldEvent{"
+                + "player=" + player
+                + ", timeout=" + timeout
+                + '}';
     }
 
 }
diff --git a/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/BlockEntityDataPacket.java b/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/BlockEntityDataPacket.java
@@ -26,15 +26,8 @@ public static void register(boolean encodeOnly) {
                 .stateRegistry(StateRegistry.PLAY)
                 .mapping(0x0A, ProtocolVersion.MINECRAFT_1_18_2, encodeOnly)
                 .mapping(0x07, ProtocolVersion.MINECRAFT_1_19, encodeOnly)
-                .mapping(0x07, ProtocolVersion.MINECRAFT_1_19_1, encodeOnly)
-                .mapping(0x07, ProtocolVersion.MINECRAFT_1_19_3, encodeOnly)
                 .mapping(0x08, ProtocolVersion.MINECRAFT_1_19_4, encodeOnly)
-                .mapping(0x08, ProtocolVersion.MINECRAFT_1_20, encodeOnly)
                 .mapping(0x07, ProtocolVersion.MINECRAFT_1_20_2, encodeOnly)
-                .mapping(0x07, ProtocolVersion.MINECRAFT_1_20_3, encodeOnly)
-                .mapping(0x07, ProtocolVersion.MINECRAFT_1_20_5, encodeOnly)
-                .mapping(0x07, ProtocolVersion.MINECRAFT_1_21, encodeOnly)
-                .mapping(0x07, ProtocolVersion.MINECRAFT_1_21_2, encodeOnly)
                 .mapping(0x06, ProtocolVersion.MINECRAFT_1_21_5, encodeOnly)
                 .register();
     }
diff --git a/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/BlockUpdatePacket.java b/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/BlockUpdatePacket.java
@@ -24,15 +24,8 @@ public static void register(boolean encodeOnly) {
                 .stateRegistry(StateRegistry.PLAY)
                 .mapping(0x0C, ProtocolVersion.MINECRAFT_1_18_2, encodeOnly)
                 .mapping(0x09, ProtocolVersion.MINECRAFT_1_19, encodeOnly)
-                .mapping(0x09, ProtocolVersion.MINECRAFT_1_19_1, encodeOnly)
-                .mapping(0x09, ProtocolVersion.MINECRAFT_1_19_3, encodeOnly)
                 .mapping(0x0A, ProtocolVersion.MINECRAFT_1_19_4, encodeOnly)
-                .mapping(0x0A, ProtocolVersion.MINECRAFT_1_20, encodeOnly)
                 .mapping(0x09, ProtocolVersion.MINECRAFT_1_20_2, encodeOnly)
-                .mapping(0x09, ProtocolVersion.MINECRAFT_1_20_3, encodeOnly)
-                .mapping(0x09, ProtocolVersion.MINECRAFT_1_20_5, encodeOnly)
-                .mapping(0x09, ProtocolVersion.MINECRAFT_1_21, encodeOnly)
-                .mapping(0x09, ProtocolVersion.MINECRAFT_1_21_2, encodeOnly)
                 .mapping(0x08, ProtocolVersion.MINECRAFT_1_21_5, encodeOnly)
                 .register();
     }
diff --git a/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/EntityEffectPacket.java b/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/EntityEffectPacket.java
@@ -34,11 +34,9 @@ public static void register(boolean encodeOnly) {
                 .mapping(0x69, ProtocolVersion.MINECRAFT_1_19_1, encodeOnly)
                 .mapping(0x68, ProtocolVersion.MINECRAFT_1_19_3, encodeOnly)
                 .mapping(0x6C, ProtocolVersion.MINECRAFT_1_19_4, encodeOnly)
-                .mapping(0x6C, ProtocolVersion.MINECRAFT_1_20, encodeOnly)
                 .mapping(0x6E, ProtocolVersion.MINECRAFT_1_20_2, encodeOnly)
                 .mapping(0x72, ProtocolVersion.MINECRAFT_1_20_3, encodeOnly)
                 .mapping(0x76, ProtocolVersion.MINECRAFT_1_20_5, encodeOnly)
-                .mapping(0x76, ProtocolVersion.MINECRAFT_1_21, encodeOnly)
                 .mapping(0x7D, ProtocolVersion.MINECRAFT_1_21_2, encodeOnly)
                 .register();
     }
diff --git a/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/PlayerLoadedWorldPacket.java b/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/PlayerLoadedWorldPacket.java
@@ -14,6 +14,7 @@
  * (latest) Resource Id: 'minecraft:player_loaded'
  */
 @SuppressWarnings("unused")
+@Deprecated(since = "1.3.3", forRemoval = true) // will be removed when the pull request is merged - https://github.com/PaperMC/Velocity/pull/1541
 @Beta
 @Since(ProtocolVersion.MINECRAFT_1_21_4)
 public class PlayerLoadedWorldPacket extends VeloPacket {
diff --git a/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/RemoveEntityEffectPacket.java b/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/RemoveEntityEffectPacket.java
@@ -26,11 +26,8 @@ public static void register(boolean encodeOnly) {
                 .mapping(0x3C, ProtocolVersion.MINECRAFT_1_19_1, encodeOnly)
                 .mapping(0x3B, ProtocolVersion.MINECRAFT_1_19_3, encodeOnly)
                 .mapping(0x3F, ProtocolVersion.MINECRAFT_1_19_4, encodeOnly)
-                .mapping(0x3F, ProtocolVersion.MINECRAFT_1_20, encodeOnly)
                 .mapping(0x41, ProtocolVersion.MINECRAFT_1_20_2, encodeOnly)
-                .mapping(0x41, ProtocolVersion.MINECRAFT_1_20_3, encodeOnly)
                 .mapping(0x43, ProtocolVersion.MINECRAFT_1_20_5, encodeOnly)
-                .mapping(0x43, ProtocolVersion.MINECRAFT_1_21, encodeOnly)
                 .mapping(0x48, ProtocolVersion.MINECRAFT_1_21_2, encodeOnly)
                 .mapping(0x47, ProtocolVersion.MINECRAFT_1_21_5, encodeOnly)
                 .register();
diff --git a/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/SignEditorOpenPacket.java b/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/SignEditorOpenPacket.java
@@ -25,11 +25,8 @@ public static void register(boolean encodeOnly) {
                 .mapping(0x2E, ProtocolVersion.MINECRAFT_1_19_1, encodeOnly)
                 .mapping(0x2D, ProtocolVersion.MINECRAFT_1_19_3, encodeOnly)
                 .mapping(0x31, ProtocolVersion.MINECRAFT_1_19_4, encodeOnly)
-                .mapping(0x31, ProtocolVersion.MINECRAFT_1_20, encodeOnly)
                 .mapping(0x32, ProtocolVersion.MINECRAFT_1_20_2, encodeOnly)
-                .mapping(0x32, ProtocolVersion.MINECRAFT_1_20_3, encodeOnly)
                 .mapping(0x34, ProtocolVersion.MINECRAFT_1_20_5, encodeOnly)
-                .mapping(0x34, ProtocolVersion.MINECRAFT_1_21, encodeOnly)
                 .mapping(0x36, ProtocolVersion.MINECRAFT_1_21_2, encodeOnly)
                 .mapping(0x35, ProtocolVersion.MINECRAFT_1_21_5, encodeOnly)
                 .register();
diff --git a/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/SignUpdatePacket.java b/src/main/java/de/timongcraft/veloprotocol/network/protocol/packets/SignUpdatePacket.java
@@ -26,13 +26,9 @@ public static void register(boolean encodeOnly) {
                 .mapping(0x2B, ProtocolVersion.MINECRAFT_1_18_2, encodeOnly)
                 .mapping(0x2D, ProtocolVersion.MINECRAFT_1_19, encodeOnly)
                 .mapping(0x2E, ProtocolVersion.MINECRAFT_1_19_1, encodeOnly)
-                .mapping(0x2E, ProtocolVersion.MINECRAFT_1_19_3, encodeOnly)
-                .mapping(0x2E, ProtocolVersion.MINECRAFT_1_19_4, encodeOnly)
-                .mapping(0x2E, ProtocolVersion.MINECRAFT_1_20, encodeOnly)
                 .mapping(0x31, ProtocolVersion.MINECRAFT_1_20_2, encodeOnly)
                 .mapping(0x32, ProtocolVersion.MINECRAFT_1_20_3, encodeOnly)
                 .mapping(0x35, ProtocolVersion.MINECRAFT_1_20_5, encodeOnly)
-                .mapping(0x35, ProtocolVersion.MINECRAFT_1_21, encodeOnly)
                 .mapping(0x37, ProtocolVersion.MINECRAFT_1_21_2, encodeOnly)
                 .mapping(0x39, ProtocolVersion.MINECRAFT_1_21_4, encodeOnly)
                 .mapping(0x3A, ProtocolVersion.MINECRAFT_1_21_5, encodeOnly)

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ private static int[] getProtocolIds(String name) {`
`151`	`151`	`int[] protocolIds = new int[ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size()];`
`152`	`152`
`153`	`153`	`for (int i = 0; i < ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size(); i++) {`
`154`		`- Integer nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:block_entity_type").getOrDefault(name, null);`
`155`		`- protocolIds[i] = nameProtocolId != null ? nameProtocolId : -1;`
	`154`	`+ int nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:block_entity_type").getOrDefault(name, -1);`
	`155`	`+ protocolIds[i] = nameProtocolId;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`return protocolIds;`
Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,8 @@ private static int[] getProtocolIds(String name) {`
`253`	`253`	`int[] protocolIds = new int[ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size()];`
`254`	`254`
`255`	`255`	`for (int i = 0; i < ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size(); i++) {`
`256`		`- Integer nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:data_component_type").getOrDefault(name, null);`
`257`		`- protocolIds[i] = nameProtocolId != null ? nameProtocolId : -1;`
	`256`	`+ int nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:data_component_type").getOrDefault(name, -1);`
	`257`	`+ protocolIds[i] = nameProtocolId;`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`return protocolIds;`
Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,8 @@ private static int[] getProtocolIds(String name) {`
`132`	`132`	`int[] protocolIds = new int[ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size()];`
`133`	`133`
`134`	`134`	`for (int i = 0; i < ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.size(); i++) {`
`135`		`- Integer nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:mob_effect").getOrDefault(name, null);`
`136`		`- protocolIds[i] = nameProtocolId != null ? nameProtocolId : -1;`
	`135`	`+ int nameProtocolId = ProtocolMappingsCache.RESOURCE_PROTOCOL_MAPPINGS.get(i).mappings().get("minecraft:mob_effect").getOrDefault(name, -1);`
	`136`	`+ protocolIds[i] = nameProtocolId;`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`return protocolIds;`