From e167a198ae0a519daa7cf35abfd01e7885a3b563 Mon Sep 17 00:00:00 2001 From: p0t4t0sandwich Date: Mon, 16 Dec 2024 21:06:53 -0600 Subject: [PATCH 1/2] Fixed argument registry for Velocity networks that have 1.20.5+ servers --- src/main/java/org/adde0109/ambassador/Ambassador.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java index a5d3edb..80f51d9 100644 --- a/src/main/java/org/adde0109/ambassador/Ambassador.java +++ b/src/main/java/org/adde0109/ambassador/Ambassador.java @@ -40,6 +40,9 @@ import java.nio.file.Path; import java.util.concurrent.TimeUnit; import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19; +import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19_1; +import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19_3; +import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_20_3; import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet; @Plugin(id = "ambassador", name = "Ambassador", version = "1.4.4", authors = {"adde0109"}) @@ -134,8 +137,8 @@ public class Ambassador { Method argumentRegistry = ArgumentPropertyRegistry.class.getDeclaredMethod("register", ArgumentIdentifier.class, Class.class, ArgumentPropertySerializer.class); argumentRegistry.setAccessible(true); - argumentRegistry.invoke(null,ArgumentIdentifier.id("forge:enum", mapSet(MINECRAFT_1_19, 50)), EnumArgumentProperty.class, EnumArgumentPropertySerializer.ENUM); - argumentRegistry.invoke(null,ArgumentIdentifier.id("forge:modid", mapSet(MINECRAFT_1_19, 51)), ModIdArgumentProperty.class, + argumentRegistry.invoke(null,ArgumentIdentifier.id("forge:enum", mapSet(MINECRAFT_1_19, -255)), EnumArgumentProperty.class, EnumArgumentPropertySerializer.ENUM); + argumentRegistry.invoke(null,ArgumentIdentifier.id("forge:modid", mapSet(MINECRAFT_1_19, -254)), ModIdArgumentProperty.class, new ArgumentPropertySerializer<>() { @Override public ModIdArgumentProperty deserialize(ByteBuf buf, ProtocolVersion protocolVersion) { From 1567e538a022f018d0991132506c0fd6279ae573 Mon Sep 17 00:00:00 2001 From: p0t4t0sandwich Date: Mon, 16 Dec 2024 22:06:44 -0600 Subject: [PATCH 2/2] Cleaned up imports --- src/main/java/org/adde0109/ambassador/Ambassador.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java index 80f51d9..f2e2521 100644 --- a/src/main/java/org/adde0109/ambassador/Ambassador.java +++ b/src/main/java/org/adde0109/ambassador/Ambassador.java @@ -18,9 +18,7 @@ import java.util.Map; import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.proxy.VelocityServer; -import com.velocitypowered.proxy.connection.MinecraftConnection; import com.velocitypowered.proxy.network.ConnectionManager; -import com.velocitypowered.proxy.protocol.StateRegistry; import com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier; import com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentPropertyRegistry; import com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentPropertySerializer; @@ -40,9 +38,6 @@ import java.nio.file.Path; import java.util.concurrent.TimeUnit; import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19; -import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19_1; -import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19_3; -import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_20_3; import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet; @Plugin(id = "ambassador", name = "Ambassador", version = "1.4.4", authors = {"adde0109"})