Update to Minecraft 1.20.3

ZockerAxel · Dec 5, 2023 · 8f71161 · 8f71161
1 parent 5de694c
commit 8f71161
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 17 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_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import eu.endercentral.crazy_advancements.event.AdvancementScreenCloseEvent;

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_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_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/advancement/criteria/Criteria.java b/src/eu/endercentral/crazy_advancements/advancement/criteria/Criteria.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 
 import eu.endercentral.crazy_advancements.CrazyAdvancementsAPI;
 import net.minecraft.advancements.AdvancementRequirements;
@@ -107,6 +108,12 @@ public String[][] getRequirements() {
 	 * @return The Requirements
 	 */
 	public AdvancementRequirements getAdvancementRequirements() {
+		List<List<String>> requirements = new ArrayList<>();
+
+		for(String[] outer : this.requirements) {
+			requirements.add(Arrays.asList(outer));
+		}
+
 		return new AdvancementRequirements(requirements);
 	}
 

diff --git a/src/eu/endercentral/crazy_advancements/advancement/progress/AdvancementProgress.java b/src/eu/endercentral/crazy_advancements/advancement/progress/AdvancementProgress.java
@@ -1,6 +1,9 @@
 package eu.endercentral.crazy_advancements.advancement.progress;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.StreamSupport;
 
@@ -30,7 +33,13 @@ public class AdvancementProgress {
 	 */
 	@Deprecated(forRemoval = true, since = "2.1.15")
 	public AdvancementProgress(Map<String, Criterion<?>> criteria, String[][] requirements) {
-		nmsProgress.a(new AdvancementRequirements(requirements));
+		List<List<String>> requirementsList = new ArrayList<>();
+
+		for(String[] outer : requirements) {
+			requirementsList.add(Arrays.asList(outer));
+		}
+
+		nmsProgress.a(new AdvancementRequirements(requirementsList));
 	}
 
 	/**
@@ -40,7 +49,13 @@ public AdvancementProgress(Map<String, Criterion<?>> criteria, String[][] requir
 	 * @param requirements The Requirements
 	 */
 	public AdvancementProgress(String[][] requirements) {
-		nmsProgress.a(new AdvancementRequirements(requirements));
+		List<List<String>> requirementsList = new ArrayList<>();
+
+		for(String[] outer : requirements) {
+			requirementsList.add(Arrays.asList(outer));
+		}
+
+		nmsProgress.a(new AdvancementRequirements(requirementsList));
 	}
 
 	/**

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_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_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
@@ -1,9 +1,10 @@
 package eu.endercentral.crazy_advancements.packet;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Optional;
 
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
 
 import eu.endercentral.crazy_advancements.JSONMessage;
 import eu.endercentral.crazy_advancements.NameKey;
@@ -19,7 +20,7 @@
 
 public class PacketConverter {
 
-	private static final AdvancementRewards advancementRewards = new AdvancementRewards(0, new MinecraftKey[0], new MinecraftKey[0], null);
+	private static final AdvancementRewards advancementRewards = new AdvancementRewards(0, new ArrayList<MinecraftKey>(), new ArrayList<MinecraftKey>(), Optional.empty());
 
 	private static HashMap<NameKey, Float> smallestX = new HashMap<>();
 	private static HashMap<NameKey, Float> smallestY = new HashMap<>();
@@ -59,12 +60,8 @@ public static net.minecraft.advancements.Advancement toNmsAdvancement(Advancemen
 
 		ItemStack icon = CraftItemStack.asNMSCopy(display.getIcon());
 
-		MinecraftKey backgroundTexture = null;
 		boolean hasBackgroundTexture = display.getBackgroundTexture() != null;
-
-		if(hasBackgroundTexture) {
-			backgroundTexture = new MinecraftKey(display.getBackgroundTexture());
-		}
+		Optional<MinecraftKey> backgroundTexture = hasBackgroundTexture ? Optional.of(new MinecraftKey(display.getBackgroundTexture())) : Optional.empty();
 
 		float x = generateX(advancement.getTab(), display.generateX());
 		float y = generateY(advancement.getTab(), display.generateY());
@@ -87,9 +84,7 @@ public static net.minecraft.advancements.Advancement toNmsAdvancement(Advancemen
 	public static net.minecraft.advancements.Advancement toNmsToastAdvancement(ToastNotification notification) {
 		ItemStack icon = CraftItemStack.asNMSCopy(notification.getIcon());
 
-		MinecraftKey backgroundTexture = null;
-
-		net.minecraft.advancements.AdvancementDisplay advDisplay = new net.minecraft.advancements.AdvancementDisplay(icon, notification.getMessage().getBaseComponent(), new JSONMessage(new TextComponent("Toast Notification")).getBaseComponent(), backgroundTexture, notification.getFrame().getNMS(), true, false, true);
+		net.minecraft.advancements.AdvancementDisplay advDisplay = new net.minecraft.advancements.AdvancementDisplay(icon, notification.getMessage().getBaseComponent(), new JSONMessage(new TextComponent("Toast Notification")).getBaseComponent(), Optional.empty(), notification.getFrame().getNMS(), true, false, true);
 
 		net.minecraft.advancements.Advancement adv = new net.minecraft.advancements.Advancement(Optional.empty(), Optional.of(advDisplay), advancementRewards, ToastNotification.NOTIFICATION_CRITERIA.getCriteria(), ToastNotification.NOTIFICATION_CRITERIA.getAdvancementRequirements(), false);
 
@@ -105,7 +100,7 @@ public static net.minecraft.advancements.Advancement toNmsToastAdvancement(Toast
 	 */
 	@Deprecated(forRemoval = true, since = "2.1.15")
 	public static net.minecraft.advancements.Advancement createDummy(NameKey name) {
-		net.minecraft.advancements.Advancement adv = new net.minecraft.advancements.Advancement(Optional.empty(), Optional.empty(), null, new HashMap<>(), new AdvancementRequirements(new String[0][0]), false);
+		net.minecraft.advancements.Advancement adv = new net.minecraft.advancements.Advancement(Optional.empty(), Optional.empty(), null, new HashMap<>(), new AdvancementRequirements(new ArrayList<>()), false);
 		return adv;
 	}
 

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_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import eu.endercentral.crazy_advancements.advancement.ToastNotification;