Update to Minecraft 1.19

ZockerAxel · Jun 7, 2022 · 7cec8bc · 7cec8bc
1 parent a728d6a
commit 7cec8bc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 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_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<Object>
 	}
 
 	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;