From 7cec8bcae570402bce153877ea3a94832689cb7f Mon Sep 17 00:00:00 2001 From: ZockerAxel Date: Tue, 7 Jun 2022 19:39:40 +0200 Subject: [PATCH] Update to Minecraft 1.19 --- .../crazy_advancements/AdvancementPacketReceiver.java | 4 ++-- .../crazy_advancements/CrazyAdvancementsAPI.java | 2 +- .../crazy_advancements/manager/AdvancementManager.java | 5 +++-- .../crazy_advancements/packet/AdvancementsPacket.java | 2 +- .../crazy_advancements/packet/PacketConverter.java | 2 +- .../endercentral/crazy_advancements/packet/ToastPacket.java | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/eu/endercentral/crazy_advancements/AdvancementPacketReceiver.java b/src/eu/endercentral/crazy_advancements/AdvancementPacketReceiver.java index 990deb9..c769ac3 100644 --- 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_18_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import eu.endercentral.crazy_advancements.event.AdvancementScreenCloseEvent; @@ -64,7 +64,7 @@ protected void decode(ChannelHandlerContext chc, Packet packet, List } public Channel getNettyChannel(Player p) { - NetworkManager manager = ((CraftPlayer)p).getHandle().b.a; + NetworkManager manager = ((CraftPlayer)p).getHandle().b.b; Channel channel = null; try { channel = (Channel) channelField.get(manager); diff --git a/src/eu/endercentral/crazy_advancements/CrazyAdvancementsAPI.java b/src/eu/endercentral/crazy_advancements/CrazyAdvancementsAPI.java index abcb7e3..c11618f 100644 --- 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_18_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R1.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/manager/AdvancementManager.java b/src/eu/endercentral/crazy_advancements/manager/AdvancementManager.java index 3c43360..3eed7ec 100644 --- a/src/eu/endercentral/crazy_advancements/manager/AdvancementManager.java +++ b/src/eu/endercentral/crazy_advancements/manager/AdvancementManager.java @@ -14,7 +14,6 @@ import java.util.Set; import java.util.UUID; -import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -103,7 +102,9 @@ public NameKey getName() { * @param player Player to add */ public void addPlayer(Player player) { - Validate.notNull(player); + if(player == null) { + throw new RuntimeException("Player may not be null"); + } if(!players.contains(player)) { players.add(player); } diff --git a/src/eu/endercentral/crazy_advancements/packet/AdvancementsPacket.java b/src/eu/endercentral/crazy_advancements/packet/AdvancementsPacket.java index 80d1e37..a10c368 100644 --- 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_18_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R1.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 index ff6d84f..2163e17 100644 --- 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_18_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_19_R1.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 index d0aa5fa..158c9e1 100644 --- 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_18_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import eu.endercentral.crazy_advancements.advancement.ToastNotification;