4.0.7 Release

Bump io.papermc.hangar-publish-plugin from 0.1.2 to 0.1.3 (#568 )
Bumps io.papermc.hangar-publish-plugin from 0.1.2 to 0.1.3. --- updated-dependencies: - dependency-name: io.papermc.hangar-publish-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-11-04 17:00:20 -05:00 · 2025-03-31 01:08:03 +02:00 · 2025-03-29 14:47:08 +01:00 · 2025-03-29 14:46:44 +01:00 · 2025-03-29 14:46:14 +01:00 · 2025-03-28 19:07:24 +01:00
96 changed files with 218 additions and 189 deletions
@@ -1,4 +1,16 @@
-root = true
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+tab_width = 4

 [*.java]
-indent_style = tab
+ij_java_class_count_to_use_import_on_demand = 999999
+ij_java_names_count_to_use_import_on_demand = 999999
+ij_java_imports_layout = *, |, $*
+ij_java_generate_final_locals = true
+ij_java_generate_final_parameters = true
+
+[{*.json,*.yml}]
+indent_size = 2
@@ -7,22 +7,15 @@ jobs:
    steps:
      - name: Checkout Repository
        uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        with:
+          persist-credentials: false
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
          distribution: 'temurin'
          java-version: 17
          check-latest: true
-      - name: Cache Dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
      - name: Build with Gradle
        run: ./gradlew build
@@ -12,8 +12,10 @@ jobs:
    steps:
      - name: Checkout Repository
        uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        with:
+          persist-credentials: false
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
@@ -1,14 +0,0 @@
-name: Update Gradle Wrapper
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 0"
-
-jobs:
-  update-gradle-wrapper:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2
@@ -111,3 +111,6 @@ nb-configuration.xml
 ### Git ###
 # Don't exclude the .gitignore itself
 !/.gitignore
+
+### Run Folder (ViaProxy) ###
+common/run/
@@ -22,8 +22,8 @@ base {
 }

 dependencies {
-    compileOnly "com.viaversion:viaversion:5.0.4-SNAPSHOT"
-    compileOnly "com.viaversion:viabackwards:5.0.4-SNAPSHOT"
+    compileOnly "com.viaversion:viaversion:5.3.1"
+    compileOnly "com.viaversion:viabackwards:5.3.1"
 }

 publishing {
@@ -1,7 +1,7 @@
 plugins {
    id "vr.base-conventions"

-    id "io.papermc.hangar-publish-plugin" version "0.1.2"
+    id "io.papermc.hangar-publish-plugin" version "0.1.3"
    id "com.modrinth.minotaur" version "2.+"
 }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ tasks.register("runViaProxy", JavaExec) {
    dependsOn tasks.jar

    def viaProxyConfiguration = configurations.create("viaProxy")
-    viaProxyConfiguration.dependencies.add(dependencies.create("net.raphimc:ViaProxy:3.3.5-SNAPSHOT") {
+    viaProxyConfiguration.dependencies.add(dependencies.create("net.raphimc:ViaProxy:3.4.0-SNAPSHOT") {
        transitive = false
    })

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -86,7 +86,7 @@ public interface ViaRewindConfig extends Config {
 	/**
 	 * The particle to show the world border for the 1.8+ world border for 1.7.x clients
 	 *
-	 * @return the particle name (see <a href="https://wiki.vg/index.php?title=Protocol&oldid=7368#Particle_2">Particle registry for Packet</a>)
+	 * @return the particle name
 	 */
 	String getWorldBorderParticle();

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -70,4 +70,23 @@ public interface ViaRewindPlatform {
 	 * @return data folder
 	 */
 	File getDataFolder();
+
+	/**
+	 * Returns the platform's compression handler name. Only used in the 1.8 -> 1.7 protocol.
+	 *
+	 * @return the compression handler name
+	 */
+	default String compressHandlerName() {
+		return "compress";
+	}
+
+	/**
+	 * Returns the platform's decompression handler name. Only used in the 1.8 -> 1.7 protocol.
+	 *
+	 * @return the decompression handler name
+	 */
+	default String decompressHandlerName() {
+		return "decompress";
+	}
+
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ public class Protocol1_7_6_10To1_7_2_5 extends AbstractProtocol<ClientboundPacke

 	@Override
 	protected void registerPackets() {
-		this.registerClientbound(State.LOGIN, ClientboundLoginPackets.GAME_PROFILE, new PacketHandlers() {
+		this.registerClientbound(State.LOGIN, ClientboundLoginPackets.LOGIN_FINISHED, new PacketHandlers() {
 			@Override
 			public void register() {
 				map(Types.STRING, REMOVE_DASHES); // Uuid
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 */
 package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression;

+import com.viaversion.viarewind.ViaRewind;
 import com.viaversion.viarewind.api.minecraft.netty.EmptyChannelHandler;
 import com.viaversion.viarewind.api.minecraft.netty.ForwardMessageToByteEncoder;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.CompressionHandlerProvider;
@@ -26,15 +27,13 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelPipeline;

 public class TrackingCompressionHandlerProvider extends CompressionHandlerProvider {
-	public static final String COMPRESS_HANDLER_NAME = "compress";
-	public static final String DECOMPRESS_HANDLER_NAME = "decompress";

 	@Override
 	public void onHandleLoginCompressionPacket(UserConnection user, int threshold) {
 		final ChannelPipeline pipeline = user.getChannel().pipeline();
 		if (user.isClientSide()) {
-			pipeline.addBefore(Via.getManager().getInjector().getEncoderName(), COMPRESS_HANDLER_NAME, getEncoder(threshold));
-			pipeline.addBefore(Via.getManager().getInjector().getDecoderName(), DECOMPRESS_HANDLER_NAME, getDecoder(threshold));
+			pipeline.addBefore(Via.getManager().getInjector().getEncoderName(), ViaRewind.getPlatform().compressHandlerName(), getEncoder(threshold));
+			pipeline.addBefore(Via.getManager().getInjector().getDecoderName(), ViaRewind.getPlatform().decompressHandlerName(), getDecoder(threshold));
 		} else {
 			setCompressionEnabled(user, true); // We need to remove compression for 1.7 clients
 		}
@@ -47,12 +46,9 @@ public class TrackingCompressionHandlerProvider extends CompressionHandlerProvid

 			String compressor = null;
 			String decompressor = null;
-			if (pipeline.get(COMPRESS_HANDLER_NAME) != null) { // ViaVersion
-				compressor = COMPRESS_HANDLER_NAME;
-				decompressor = DECOMPRESS_HANDLER_NAME;
-			} else if (pipeline.get("compression-encoder") != null) { // Velocity
-				compressor = "compression-encoder";
-				decompressor = "compression-decoder";
+			if (pipeline.get(ViaRewind.getPlatform().compressHandlerName()) != null) {
+				compressor = ViaRewind.getPlatform().compressHandlerName();
+				decompressor = ViaRewind.getPlatform().decompressHandlerName();
 			}

 			if (compressor != null) { // We can neutralize the effect of compressor to the client
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -81,11 +81,11 @@ public class BlockItemPacketRewriter1_8 extends VRBlockItemRewriter<ClientboundP
 		protocol.registerClientbound(ClientboundPackets1_8.CONTAINER_SET_SLOT, new PacketHandlers() {
 			@Override
 			public void register() {
-				map(Types.UNSIGNED_BYTE); // Window id
+				map(Types.BYTE); // Window id
 				map(Types.SHORT); // Slot

 				handler(wrapper -> {
-					final short windowType = wrapper.user().get(InventoryTracker.class).get(wrapper.get(Types.UNSIGNED_BYTE, 0));
+					final short windowType = wrapper.user().get(InventoryTracker.class).get(wrapper.get(Types.BYTE, 0));
 					final short slot = wrapper.get(Types.SHORT, 0);
 					if (windowType == 4) { // Enchantment Table
 						if (slot == 1) {
@@ -100,7 +100,7 @@ public class BlockItemPacketRewriter1_8 extends VRBlockItemRewriter<ClientboundP
 				handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(RewindTypes.COMPRESSED_NBT_ITEM, 0)));

 				handler(wrapper -> {
-					final short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
+					final byte windowId = wrapper.get(Types.BYTE, 0);
 					if (windowId != 0) {
 						return;
 					}
@@ -224,7 +224,7 @@ public class BlockItemPacketRewriter1_8 extends VRBlockItemRewriter<ClientboundP
 		});

 		protocol.registerServerbound(ServerboundPackets1_7_2_5.CONTAINER_CLOSE, wrapper -> {
-			final short windowId = wrapper.passthrough(Types.UNSIGNED_BYTE);
+			final byte windowId = wrapper.passthrough(Types.BYTE);

 			wrapper.user().get(InventoryTracker.class).remove(windowId);
 		});
@@ -232,10 +232,10 @@ public class BlockItemPacketRewriter1_8 extends VRBlockItemRewriter<ClientboundP
 		protocol.registerServerbound(ServerboundPackets1_7_2_5.CONTAINER_CLICK, new PacketHandlers() {
 			@Override
 			public void register() {
-				map(Types.BYTE, Types.UNSIGNED_BYTE); // Window id
+				map(Types.BYTE); // Window id
 				map(Types.SHORT); // Slot
 				handler(wrapper -> {
-					final short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0); // Window id
+					final byte windowId = wrapper.get(Types.BYTE, 0); // Window id
 					final short slot = wrapper.get(Types.SHORT, 0);

 					final short windowType = wrapper.user().get(InventoryTracker.class).get(windowId);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -145,7 +145,11 @@ public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets

 				handler(wrapper -> {
 					final int entityId = wrapper.get(Types.VAR_INT, 0);
-					final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(wrapper.get(Types.BYTE, 0), true);
+					int data = wrapper.get(Types.INT, 3);
+					final EntityTypes1_8.EntityType type = EntityTypes1_8.ObjectType.getEntityType(wrapper.get(Types.BYTE, 0), data);
+					if (type == null) {
+						return;
+					}

 					int x = wrapper.get(Types.INT, 0);
 					int y = wrapper.get(Types.INT, 1);
@@ -154,8 +158,6 @@ public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets
 					byte pitch = wrapper.get(Types.BYTE, 1);
 					byte yaw = wrapper.get(Types.BYTE, 2);

-					int data = wrapper.get(Types.INT, 3);
-
 					if (type == EntityTypes1_8.ObjectType.ITEM_FRAME.getType()) {
 						yaw = switch (yaw) {
 							case -128 -> {
@@ -184,7 +186,7 @@ public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets
 						hologram.setPosition(x / 32.0, y / 32.0, z / 32.0);
 						hologram.setRotation(yaw * 360f / 256, pitch * 360f / 256);
 						hologram.setHeadYaw(yaw * 360f / 256);
-					} else if (type != null && type.isOrHasParent(EntityTypes1_8.EntityType.FALLING_BLOCK)) {
+					} else if (type.isOrHasParent(EntityTypes1_8.EntityType.FALLING_BLOCK)) {
 						int blockId = data & 0xFFF;
 						int blockData = data >> 12 & 0xF;
 						final IdAndData replace = protocol.getItemRewriter().handleBlock(blockId, blockData);
@@ -264,7 +266,7 @@ public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets
 				handler(wrapper -> {
 					final short typeId = wrapper.get(Types.UNSIGNED_BYTE, 0);

-					final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(typeId, false);
+					final EntityTypes1_8.EntityType type = EntityTypes1_8.EntityType.findById(typeId);
 					if (type == EntityTypes1_8.EntityType.ARMOR_STAND) {
 						wrapper.cancel();
 						final int entityId = wrapper.get(Types.VAR_INT, 0);
@@ -695,11 +697,11 @@ public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets

 	@Override
 	public EntityTypes1_8.EntityType typeFromId(int type) {
-		return EntityTypes1_8.getTypeFromId(type, false);
+		return EntityTypes1_8.EntityType.findById(type);
 	}

 	@Override
-	public EntityTypes1_8.EntityType objectTypeFromId(int type) {
-		return EntityTypes1_8.getTypeFromId(type, true);
+	public EntityTypes1_8.EntityType objectTypeFromId(int type, int data) {
+		return EntityTypes1_8.ObjectType.getEntityType(type, data);
 	}
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -107,7 +107,7 @@ public class BlockItemPacketRewriter1_9 extends VRBlockItemRewriter<ClientboundP
 		});

 		protocol.registerClientbound(ClientboundPackets1_9.CONTAINER_SET_SLOT, wrapper -> {
-			final byte windowId = wrapper.passthrough(Types.UNSIGNED_BYTE).byteValue();
+			final byte windowId = wrapper.passthrough(Types.BYTE);
 			final short slot = wrapper.passthrough(Types.SHORT);
 			final Item item = wrapper.passthrough(Types.ITEM1_8);

@@ -131,14 +131,14 @@ public class BlockItemPacketRewriter1_9 extends VRBlockItemRewriter<ClientboundP
 		});

 		protocol.registerServerbound(ServerboundPackets1_8.CONTAINER_CLOSE, wrapper -> {
-			final short windowId = wrapper.passthrough(Types.UNSIGNED_BYTE);
+			final byte windowId = wrapper.passthrough(Types.BYTE);
 			wrapper.user().get(WindowTracker.class).remove(windowId);
 		});

 		protocol.registerServerbound(ServerboundPackets1_8.CONTAINER_CLICK, new PacketHandlers() {
 			@Override
 			public void register() {
-				map(Types.UNSIGNED_BYTE); // Window id
+				map(Types.BYTE); // Window id
 				map(Types.SHORT); // Slot
 				map(Types.BYTE); // Button
 				map(Types.SHORT); // Action number
@@ -146,7 +146,7 @@ public class BlockItemPacketRewriter1_9 extends VRBlockItemRewriter<ClientboundP
 				map(Types.ITEM1_8); // Clicked item
 				handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
 				handler(wrapper -> {
-					final short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
+					final byte windowId = wrapper.get(Types.BYTE, 0);
 					final String windowType = wrapper.user().get(WindowTracker.class).get(windowId);

 					if (windowType != null && windowType.equalsIgnoreCase("minecraft:brewing_stand")) {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -97,10 +97,11 @@ public class EntityPacketRewriter1_9 extends VREntityRewriter<ClientboundPackets
 				handler(wrapper -> {
 					final int entityId = wrapper.get(Types.VAR_INT, 0);
 					final int entityType = wrapper.get(Types.BYTE, 0);
-					final EntityTypes1_9.EntityType type = EntityTypes1_9.getTypeFromId(entityType, true);
+					int data = wrapper.get(Types.INT, 3);
+					final EntityTypes1_9.EntityType type = EntityTypes1_9.ObjectType.getEntityType(entityType, data);

 					// Cancel new entities which can't be handled properly
-					if (type == EntityTypes1_9.EntityType.AREA_EFFECT_CLOUD || type == EntityTypes1_9.EntityType.SPECTRAL_ARROW || type == EntityTypes1_9.EntityType.DRAGON_FIREBALL) {
+					if (type == null || type == EntityTypes1_9.EntityType.AREA_EFFECT_CLOUD || type == EntityTypes1_9.EntityType.SPECTRAL_ARROW || type == EntityTypes1_9.EntityType.DRAGON_FIREBALL) {
 						wrapper.cancel();
 						return;
 					}
@@ -115,8 +116,6 @@ public class EntityPacketRewriter1_9 extends VREntityRewriter<ClientboundPackets
 						wrapper.set(Types.INT, 1, y);
 					}

-					int data = wrapper.get(Types.INT, 3);
-
 					if (type.isOrHasParent(EntityTypes1_9.EntityType.ARROW) && data != 0) {
 						wrapper.set(Types.INT, 3, --data);
 					}
@@ -325,11 +324,12 @@ public class EntityPacketRewriter1_9 extends VREntityRewriter<ClientboundPackets
 			public void register() {
 				handler(wrapper -> {
 					final EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
-					final int vehicle = tracker.getVehicle(tracker.clientEntityId());
-					if (vehicle == -1) {
+					final Integer vehicle = tracker.getVehicle(tracker.clientEntityId());
+					if (vehicle == null) {
 						wrapper.cancel();
-					}
-					wrapper.write(Types.VAR_INT, vehicle);
+					} else {
+                        wrapper.write(Types.VAR_INT, vehicle);
+                    }
 				});
 				map(Types.DOUBLE, Protocol1_9To1_8.DOUBLE_TO_INT_TIMES_32); // X
 				map(Types.DOUBLE, Protocol1_9To1_8.DOUBLE_TO_INT_TIMES_32); // Y
@@ -340,6 +340,7 @@ public class EntityPacketRewriter1_9 extends VREntityRewriter<ClientboundPackets
 					if (wrapper.isCancelled()) {
 						return;
 					}
+
 					final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
 					double x = wrapper.get(Types.INT, 0) / 32d;
 					double y = wrapper.get(Types.INT, 1) / 32d;
@@ -348,6 +349,10 @@ public class EntityPacketRewriter1_9 extends VREntityRewriter<ClientboundPackets
 				});
 				create(Types.BOOLEAN, true);
 				handler(wrapper -> {
+                    if (wrapper.isCancelled()) {
+                        return;
+                    }
+
 					final int entityId = wrapper.get(Types.VAR_INT, 0);
 					final EntityType type = wrapper.user().getEntityTracker(Protocol1_9To1_8.class).entityType(entityId);
 					if (type == EntityTypes1_9.EntityType.BOAT) {
@@ -623,11 +628,11 @@ public class EntityPacketRewriter1_9 extends VREntityRewriter<ClientboundPackets

 	@Override
 	public EntityTypes1_9.EntityType typeFromId(int type) {
-		return EntityTypes1_9.getTypeFromId(type, false);
+		return EntityTypes1_9.EntityType.findById(type);
 	}

 	@Override
-	public EntityTypes1_9.EntityType objectTypeFromId(int type) {
-		return EntityTypes1_9.getTypeFromId(type, true);
+	public EntityTypes1_9.EntityType objectTypeFromId(int type, int data) {
+		return EntityTypes1_9.ObjectType.getEntityType(type, data);
 	}
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -280,14 +280,14 @@ public class PlayerPacketRewriter1_9 extends RewriterBase<Protocol1_9To1_8> {
 				map(Types.DOUBLE); // Z
 				map(Types.BOOLEAN); // On ground
 				handler(wrapper -> {
-					wrapper.user().get(PlayerPositionTracker.class).sendAnimations();
-
-					final PlayerPositionTracker pos = wrapper.user().get(PlayerPositionTracker.class);
-					if (pos.getConfirmId() != -1) {
+					final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
+					storage.sendAnimations();
+					if (storage.getConfirmId() != -1) {
 						return;
 					}
-					pos.setPos(wrapper.get(Types.DOUBLE, 0), wrapper.get(Types.DOUBLE, 1), wrapper.get(Types.DOUBLE, 2));
-					pos.setOnGround(wrapper.get(Types.BOOLEAN, 0));
+
+					storage.setPos(wrapper.get(Types.DOUBLE, 0), wrapper.get(Types.DOUBLE, 1), wrapper.get(Types.DOUBLE, 2));
+					storage.setOnGround(wrapper.get(Types.BOOLEAN, 0));
 				});
 				handler(wrapper -> wrapper.user().get(BossBarStorage.class).updateLocation());
 			}
@@ -300,13 +300,15 @@ public class PlayerPacketRewriter1_9 extends RewriterBase<Protocol1_9To1_8> {
 				map(Types.FLOAT); // Pitch
 				map(Types.BOOLEAN); // On ground
 				handler(wrapper -> {
-					wrapper.user().get(PlayerPositionTracker.class).sendAnimations();
+					final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
+					storage.sendAnimations();
+					if (storage.getConfirmId() != -1) {
+						return;
+					}

-					PlayerPositionTracker pos = wrapper.user().get(PlayerPositionTracker.class);
-					if (pos.getConfirmId() != -1) return;
-					pos.setYaw(wrapper.get(Types.FLOAT, 0));
-					pos.setPitch(wrapper.get(Types.FLOAT, 1));
-					pos.setOnGround(wrapper.get(Types.BOOLEAN, 0));
+					storage.setYaw(wrapper.get(Types.FLOAT, 0));
+					storage.setPitch(wrapper.get(Types.FLOAT, 1));
+					storage.setOnGround(wrapper.get(Types.BOOLEAN, 0));
 				});
 				handler(wrapper -> wrapper.user().get(BossBarStorage.class).updateLocation());
 			}
@@ -320,7 +322,7 @@ public class PlayerPacketRewriter1_9 extends RewriterBase<Protocol1_9To1_8> {
 			final float pitch = wrapper.passthrough(Types.FLOAT);
 			final boolean onGround = wrapper.passthrough(Types.BOOLEAN);

-			PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
+			final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
 			storage.sendAnimations();
 			if (storage.getConfirmId() != -1) {
 				if (storage.getPosX() == x && storage.getPosY() == y && storage.getPosZ() == z && storage.getYaw() == yaw && storage.getPitch() == pitch) {
@@ -419,9 +421,9 @@ public class PlayerPacketRewriter1_9 extends RewriterBase<Protocol1_9To1_8> {
 			final float forward = wrapper.passthrough(Types.FLOAT);

 			final EntityTracker1_9 tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
-			final int vehicle = tracker.getVehicle(tracker.clientEntityId());
+			final Integer vehicle = tracker.getVehicle(tracker.clientEntityId());

-			if (vehicle != -1 && tracker.entityType(vehicle) == EntityTypes1_9.EntityType.BOAT) {
+			if (vehicle != null && tracker.entityType(vehicle) == EntityTypes1_9.EntityType.BOAT) {
 				final PacketWrapper paddleBoat = PacketWrapper.create(ServerboundPackets1_9.PADDLE_BOAT, wrapper.user());
 				paddleBoat.write(Types.BOOLEAN, forward != 0.0f || sideways < 0.0f);
 				paddleBoat.write(Types.BOOLEAN, forward != 0.0f || sideways > 0.0f);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -74,11 +74,11 @@ public class EntityTracker1_9 extends EntityTrackerBase {
 		return false;
 	}

-	public int getVehicle(final int passenger) {
+	public Integer getVehicle(final int passenger) {
 		for (Map.Entry<Integer, IntList> vehicle : vehicles.int2ObjectEntrySet()) {
 			if (vehicle.getValue().contains(passenger)) return vehicle.getKey();
 		}
-		return -1;
+		return null;
 	}

 	public Int2IntMap getStatus() {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@ import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.libs.mcstructs.core.TextFormatting;
-import com.viaversion.viaversion.libs.mcstructs.text.ATextComponent;
+import com.viaversion.viaversion.libs.mcstructs.text.TextComponent;
+import com.viaversion.viaversion.libs.mcstructs.text.TextFormatting;
 import com.viaversion.viaversion.libs.mcstructs.text.components.StringComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.components.TranslationComponent;
 import com.viaversion.viaversion.libs.mcstructs.text.serializer.TextComponentSerializer;
@@ -90,7 +90,7 @@ public class WindowTracker extends StoredObject {
 		openWindow.write(Types.UNSIGNED_BYTE, windowId);
 		openWindow.write(Types.STRING, "minecraft:brewing_stand");

-		ATextComponent title = new StringComponent().
+		TextComponent title = new StringComponent().
 			append(new TranslationComponent("container.brewing")).
 			append(new StringComponent(": " + TextFormatting.DARK_GRAY)).
 			append(new StringComponent(amount + " " + TextFormatting.DARK_RED)).
@@ -103,7 +103,7 @@ public class WindowTracker extends StoredObject {
 		Item[] items = user.get(WindowTracker.class).getBrewingItems(windowId);
 		for (int i = 0; i < items.length; i++) {
 			PacketWrapper setSlot = PacketWrapper.create(ClientboundPackets1_8.CONTAINER_SET_SLOT, user);
-			setSlot.write(Types.UNSIGNED_BYTE, windowId);
+			setSlot.write(Types.BYTE, (byte) windowId);
 			setSlot.write(Types.SHORT, (short) i);
 			setSlot.write(Types.ITEM1_8, items[i]);
 			setSlot.scheduleSend(Protocol1_9To1_8.class);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.libs.gson.JsonParser;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
 import com.viaversion.viaversion.util.ComponentUtil;

 import java.util.logging.Level;
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
@Deprecated
 public class ChatUtil {
 	private static final Pattern UNUSED_COLOR_PATTERN = Pattern.compile("(?>(?>§[0-fk-or])*(§r|\\Z))|(?>(?>§[0-f])*(§[0-f]))");
-	private static final ComponentRewriter<ClientboundPacketType> LEGACY_REWRITER = new ComponentRewriter<ClientboundPacketType>(null, ComponentRewriter.ReadType.JSON) {
+	private static final JsonNBTComponentRewriter<ClientboundPacketType> LEGACY_REWRITER = new JsonNBTComponentRewriter<>(null, JsonNBTComponentRewriter.ReadType.JSON) {
 		@Override
 		protected void handleTranslate(JsonObject object, String translate) {
 			String text = Protocol1_12_2To1_13.MAPPINGS.getMojangTranslation().get(translate);
@@ -29,7 +29,6 @@ emulate-world-border: true
 always-show-original-mob-name: true
 #
 # The particle to show the world border for the 1.8+ world border for 1.7.x clients
-# sees https://wiki.vg/index.php?title=Protocol&oldid=7368#Particle_2
 world-border-particle: 'fireworksSpark'
 #
 # If enabled, 1.8 players on 1.9+ servers can use /offhand to switch items between their main hand and offhand.
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
  },
  "depends": {
    "viafabric": ">=0.4.14",
-    "viabackwards": ">=5.0.4"
+    "viabackwards": ">=5.3.1"
  },
  "custom": {
    "modmenu:api": true,
@@ -4,10 +4,10 @@ org.gradle.parallel=true

 # project
 maven_group=com.viaversion
-maven_version=4.0.4
+maven_version=4.0.7
 maven_description=ViaBackwards addon to allow 1.8.x and 1.7.x clients on newer server versions.

 # Smile emoji
-mcVersions=1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8
-mcVersionRange=1.8-1.21.4
+mcVersions=1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8
+mcVersionRange=1.8-1.21.5
 velocityVersion=3.3
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2024 ViaVersion and contributors
+ * Copyright (C) 2018-2025 ViaVersion and contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -68,4 +68,15 @@ public class VelocityPlugin implements ViaRewindPlatform {
 	public Logger getLogger() {
 		return this.logger;
 	}
+
+	@Override
+	public String compressHandlerName() {
+		return "compression-encoder";
+	}
+
+	@Override
+	public String decompressHandlerName() {
+		return "compression-decoder";
+	}
+
 }
Author	SHA1	Message	Date
FlorianMichael	bbc1d77939	4.0.7 Release	2025-03-31 01:08:03 +02:00
dependabot[bot]	fa36428391	Bump io.papermc.hangar-publish-plugin from 0.1.2 to 0.1.3 (#568 ) Bumps io.papermc.hangar-publish-plugin from 0.1.2 to 0.1.3. --- updated-dependencies: - dependency-name: io.papermc.hangar-publish-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-03-29 14:47:08 +01:00
FlorianMichael	b6dee43620	Update VV api usage	2025-03-29 14:46:44 +01:00
FlorianMichael	371c25f9d0	Update MCStructs to 3.0.0	2025-03-29 14:46:14 +01:00
FlorianMichael	a41bbc2d67	4.0.6 Release	2025-03-28 19:07:24 +01:00
Nassim Jahnke	de84a8fffc	Replace deprecated class use	2025-03-26 13:47:29 +01:00
Nassim Jahnke	22ff1416c2	Fix serverbound container_close container types Fixes #566	2025-03-13 13:58:14 +01:00
FlorianMichael	00b74ef2dd	Update container id types	2025-03-12 18:31:20 +01:00
FlorianMichael	8d5b348318	Fix data field getting in ADD_ENTITY handler in 1.9->1.8	2025-03-09 01:06:11 +01:00
FlorianMichael	51f001ac3e	Don't use -1 as indicator in EntityTracker1_9#getVehicle	2025-02-26 20:21:50 +01:00
FlorianMichael	e27caba231	Cleanup code here and there	2025-02-25 21:40:03 +01:00
FlorianMichael	07aab015ea	Auto: Gradle 8.13, .editorconfig	2025-02-25 18:44:28 +01:00
FlorianMichael	6bcf8d8895	Update ViaProxy, exclude run folder in .gitignore	2025-02-12 16:28:41 +01:00
FlorianMichael	43c42f44f6	Move handler names to the platform As needs platform handling it should be directly exposed to the wrapper rather than being in the storage	2025-02-12 16:25:37 +01:00
FlorianMichael	295d87d49f	Add functions to allow changing the handler names in TrackingCompressionHandlerProvider	2025-01-28 19:01:45 +01:00
FlorianMichael	ab97e248da	Auto: Gradle 8.12.1	2025-01-24 15:44:23 +01:00
FlorianMichael	276b9ba386	Update VV API usage	2025-01-10 22:44:59 +01:00
FlorianMichael	351ff79187	4.0.5 Release	2025-01-01 21:29:53 +01:00
FlorianMichael	87ed2160c9	Auto: 2025	2025-01-01 01:07:59 +01:00
FlorianMichael	668ed3c455	Auto: Gradle 8.12	2024-12-22 02:12:08 +01:00
FlorianMichael	3a0c742878	Auto: Migrate to setup-gradle action	2024-12-17 00:29:36 +01:00
FlorianMichael	bc7b33f28a	Handle unknown entity types correctly	2024-12-16 01:27:26 +01:00
FlorianMichael	657dcaa682	Do not persist credentials	2024-12-15 18:05:25 +01:00
FlorianMichael	3676906fbf	Remove wiki.vg references	2024-12-13 22:50:24 +01:00
FlorianMichael	dc9dbe9900	Bump version to 4.0.5-SNAPSHOT	2024-12-13 22:50:06 +01:00