From 85b21f8c42efb75762cee218ced716eb662435d6 Mon Sep 17 00:00:00 2001 From: David Luedtke Date: Thu, 7 Dec 2023 04:01:46 +0100 Subject: [PATCH 1/2] update 1.20.3 --- API/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API/pom.xml b/API/pom.xml index 73305b5d..ca87eee9 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -36,7 +36,7 @@ org.inventivetalent reflectionhelper - 1.18.12-SNAPSHOT + 1.18.13-SNAPSHOT From 06605ec160457b1a296833248edb5bae4678778f Mon Sep 17 00:00:00 2001 From: David Luedtke Date: Thu, 7 Dec 2023 14:57:42 +0100 Subject: [PATCH 2/2] fix 1.20.3 not using ServerCommonPacketListenerImpl for NetworkManager field resolving --- .../packetlistener/channel/ChannelAbstract.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/API/src/org/inventivetalent/packetlistener/channel/ChannelAbstract.java b/API/src/org/inventivetalent/packetlistener/channel/ChannelAbstract.java index f25d679a..deac0ad3 100644 --- a/API/src/org/inventivetalent/packetlistener/channel/ChannelAbstract.java +++ b/API/src/org/inventivetalent/packetlistener/channel/ChannelAbstract.java @@ -21,18 +21,19 @@ public abstract class ChannelAbstract { static final Class EntityPlayer = nmsClassResolver.resolveSilent("EntityPlayer", "server.level.EntityPlayer"); static final Class PlayerConnection = nmsClassResolver.resolveSilent("PlayerConnection", "server.network.PlayerConnection"); + static final Class ServerCommonPacketListenerImpl = nmsClassResolver.resolveSilent("server.network.ServerCommonPacketListenerImpl", "PlayerConnection", "server.network.PlayerConnection"); static final Class NetworkManager = nmsClassResolver.resolveSilent("NetworkManager", "network.NetworkManager"); static final Class Packet = nmsClassResolver.resolveSilent("Packet", "network.protocol.Packet"); static final Class ServerConnection = nmsClassResolver.resolveSilent("ServerConnection", "server.network.ServerConnection"); static final Class MinecraftServer = nmsClassResolver.resolveSilent("MinecraftServer", "server.MinecraftServer"); protected static final FieldResolver entityPlayerFieldResolver = new FieldResolver(EntityPlayer); - protected static final FieldResolver playerConnectionFieldResolver = new FieldResolver(PlayerConnection); + protected static final FieldResolver serverCommonPacketListenerImplFieldResolver = new FieldResolver(ServerCommonPacketListenerImpl); protected static final FieldResolver networkManagerFieldResolver = new FieldResolver(NetworkManager); protected static final FieldResolver minecraftServerFieldResolver = new FieldResolver(MinecraftServer); protected static final FieldResolver serverConnectionFieldResolver = new FieldResolver(ServerConnection); - static final FieldAccessor networkManager = playerConnectionFieldResolver.resolveByFirstTypeAccessor(NetworkManager); + static final FieldAccessor networkManager = serverCommonPacketListenerImplFieldResolver.resolveByFirstTypeAccessor(NetworkManager); static final FieldAccessor playerConnection = entityPlayerFieldResolver.resolveByFirstTypeAccessor(PlayerConnection); static final FieldAccessor serverConnection = minecraftServerFieldResolver.resolveByFirstTypeAccessor(ServerConnection); static final FieldAccessor connectionList = serverConnectionFieldResolver.resolveByLastTypeAccessor(List.class);