Update to Minecraft 1.19.4

ZockerAxel · Mar 17, 2023 · a835eef · a835eef
1 parent c4d6459
commit a835eef
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/src/eu/endercentral/crazy_advancements/AdvancementPacketReceiver.java b/src/eu/endercentral/crazy_advancements/AdvancementPacketReceiver.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import eu.endercentral.crazy_advancements.event.AdvancementScreenCloseEvent;
@@ -19,11 +19,13 @@
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.PacketPlayInAdvancements;
 import net.minecraft.network.protocol.game.PacketPlayInAdvancements.Status;
+import net.minecraft.server.network.PlayerConnection;
 
 public class AdvancementPacketReceiver {
 
 	private static HashMap<String, ChannelHandler> handlers = new HashMap<>();
 	private static Field channelField;
+	private static Field networkManagerField;
 
 	{
 		for(Field f : NetworkManager.class.getDeclaredFields()) {
@@ -33,6 +35,14 @@ public class AdvancementPacketReceiver {
 				break;
 			}
 		}
+
+		for(Field f : PlayerConnection.class.getDeclaredFields()) {
+			if(f.getType().isAssignableFrom(NetworkManager.class)) {
+				networkManagerField = f;
+				networkManagerField.setAccessible(true);
+				break;
+			}
+		}
 	}
 
 	interface PacketReceivingHandler {
@@ -64,7 +74,7 @@ protected void decode(ChannelHandlerContext chc, Packet<?> packet, List<Object>
 	}
 
 	public Channel getNettyChannel(Player p) {
-	    NetworkManager manager = ((CraftPlayer)p).getHandle().b.b;
+	    NetworkManager manager = getNetworkManager(p);
 	    Channel channel = null;
 	    try {
 	        channel = (Channel) channelField.get(manager);
@@ -74,6 +84,17 @@ public Channel getNettyChannel(Player p) {
 	    return channel;
 	}
 
+	public NetworkManager getNetworkManager(Player p) {
+		PlayerConnection connection = ((CraftPlayer) p).getHandle().b;
+		NetworkManager manager = null;
+		try {
+	        manager = (NetworkManager) networkManagerField.get(connection);
+	    } catch (IllegalArgumentException | IllegalAccessException e) {
+	        e.printStackTrace();
+	    }
+	    return manager;
+	}
+
 	public boolean close(Player p, ChannelHandler handler) {
 	    try {
 	        ChannelPipeline pipe = getNettyChannel(p).pipeline();

diff --git a/src/eu/endercentral/crazy_advancements/CrazyAdvancementsAPI.java b/src/eu/endercentral/crazy_advancements/CrazyAdvancementsAPI.java
@@ -17,7 +17,7 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

diff --git a/src/eu/endercentral/crazy_advancements/packet/AdvancementsPacket.java b/src/eu/endercentral/crazy_advancements/packet/AdvancementsPacket.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import eu.endercentral.crazy_advancements.NameKey;

diff --git a/src/eu/endercentral/crazy_advancements/packet/PacketConverter.java b/src/eu/endercentral/crazy_advancements/packet/PacketConverter.java
@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 
-import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
 
 import eu.endercentral.crazy_advancements.JSONMessage;
 import eu.endercentral.crazy_advancements.NameKey;

diff --git a/src/eu/endercentral/crazy_advancements/packet/ToastPacket.java b/src/eu/endercentral/crazy_advancements/packet/ToastPacket.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import eu.endercentral.crazy_advancements.advancement.ToastNotification;