Update to MC 1.16.4

ZockerAxel · Nov 9, 2020 · ac42bb4 · ac42bb4
1 parent 24298e0
commit ac42bb4
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 73 deletions.
diff --git a/CrazyAdvancementAPI/plugin.yml b/CrazyAdvancementAPI/plugin.yml
@@ -1,6 +1,6 @@
 main: eu.endercentral.crazy_advancements.CrazyAdvancements
 name: CrazyAdvancementsAPI
-version: 1.13.9
+version: 1.13.11
 api-version: 1.13
 load: startup
 author: ZockerAxel

diff --git a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/Advancement.java b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/Advancement.java
@@ -14,8 +14,8 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Warning;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 
 import com.google.gson.Gson;
@@ -25,20 +25,20 @@
 import com.google.gson.annotations.SerializedName;
 
 import eu.endercentral.crazy_advancements.AdvancementDisplay.AdvancementFrame;
-import net.minecraft.server.v1_16_R2.AdvancementProgress;
-import net.minecraft.server.v1_16_R2.AdvancementRewards;
-import net.minecraft.server.v1_16_R2.ChatMessageType;
-import net.minecraft.server.v1_16_R2.ChatModifier;
-import net.minecraft.server.v1_16_R2.Criterion;
-import net.minecraft.server.v1_16_R2.CriterionInstance;
-import net.minecraft.server.v1_16_R2.EnumChatFormat;
-import net.minecraft.server.v1_16_R2.IChatBaseComponent;
-import net.minecraft.server.v1_16_R2.IChatBaseComponent.ChatSerializer;
-import net.minecraft.server.v1_16_R2.ItemStack;
-import net.minecraft.server.v1_16_R2.LootSerializationContext;
-import net.minecraft.server.v1_16_R2.MinecraftKey;
-import net.minecraft.server.v1_16_R2.PacketPlayOutAdvancements;
-import net.minecraft.server.v1_16_R2.PacketPlayOutChat;
+import net.minecraft.server.v1_16_R3.AdvancementProgress;
+import net.minecraft.server.v1_16_R3.AdvancementRewards;
+import net.minecraft.server.v1_16_R3.ChatMessageType;
+import net.minecraft.server.v1_16_R3.ChatModifier;
+import net.minecraft.server.v1_16_R3.Criterion;
+import net.minecraft.server.v1_16_R3.CriterionInstance;
+import net.minecraft.server.v1_16_R3.EnumChatFormat;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent.ChatSerializer;
+import net.minecraft.server.v1_16_R3.ItemStack;
+import net.minecraft.server.v1_16_R3.LootSerializationContext;
+import net.minecraft.server.v1_16_R3.MinecraftKey;
+import net.minecraft.server.v1_16_R3.PacketPlayOutAdvancements;
+import net.minecraft.server.v1_16_R3.PacketPlayOutChat;
 
 public class Advancement {
 
@@ -298,8 +298,8 @@ public MinecraftKey a() {
 
 		advRequirements = Arrays.stream(fixedRequirements.toArray()).toArray(String[][]::new);
 
-		net.minecraft.server.v1_16_R2.AdvancementDisplay saveDisplay = new net.minecraft.server.v1_16_R2.AdvancementDisplay(icon, display.getTitle().getBaseComponent(), display.getDescription().getBaseComponent(), backgroundTexture, display.getFrame().getNMS(), true, display.isAnnouncedToChat(), true);
-		net.minecraft.server.v1_16_R2.Advancement saveAdv = new net.minecraft.server.v1_16_R2.Advancement(notName, getParent() == null ? null : getParent().getSavedAdvancement(), saveDisplay, advRewards, advCriteria, advRequirements);
+		net.minecraft.server.v1_16_R3.AdvancementDisplay saveDisplay = new net.minecraft.server.v1_16_R3.AdvancementDisplay(icon, display.getTitle().getBaseComponent(), display.getDescription().getBaseComponent(), backgroundTexture, display.getFrame().getNMS(), true, display.isAnnouncedToChat(), true);
+		net.minecraft.server.v1_16_R3.Advancement saveAdv = new net.minecraft.server.v1_16_R3.Advancement(notName, getParent() == null ? null : getParent().getSavedAdvancement(), saveDisplay, advRewards, advCriteria, advRequirements);
 
 
 		HashMap<MinecraftKey, AdvancementProgress> prg = new HashMap<>();
@@ -448,7 +448,7 @@ public boolean isAnythingGrantedAfter(Player player) {
 	private Set<String> savedCriterionNames = null;
 	@SerializedName("criteriaRequirements")
 	private String[][] savedCriteriaRequirements = null;
-	private transient net.minecraft.server.v1_16_R2.Advancement savedAdvancement = null;
+	private transient net.minecraft.server.v1_16_R3.Advancement savedAdvancement = null;
 
 	private transient HashMap<String, Boolean> savedHiddenStatus;
 
@@ -486,11 +486,11 @@ public String[][] getSavedCriteriaRequirements() {
 	}
 
 	@Warning(reason = "Unsafe")
-	public void saveAdvancement(net.minecraft.server.v1_16_R2.Advancement save) {
+	public void saveAdvancement(net.minecraft.server.v1_16_R3.Advancement save) {
 		savedAdvancement = save;
 	}
 
-	public net.minecraft.server.v1_16_R2.Advancement getSavedAdvancement() {
+	public net.minecraft.server.v1_16_R3.Advancement getSavedAdvancement() {
 		return savedAdvancement;
 	}
 

diff --git a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/AdvancementDisplay.java b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/AdvancementDisplay.java
@@ -8,7 +8,7 @@
 
 import com.google.gson.annotations.SerializedName;
 
-import net.minecraft.server.v1_16_R2.AdvancementFrameType;
+import net.minecraft.server.v1_16_R3.AdvancementFrameType;
 
 public class AdvancementDisplay {
 

diff --git a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/AdvancementPacketReceiver.java b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/AdvancementPacketReceiver.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import eu.endercentral.crazy_advancements.events.AdvancementScreenCloseEvent;
@@ -15,10 +15,10 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.codec.MessageToMessageDecoder;
-import net.minecraft.server.v1_16_R2.NetworkManager;
-import net.minecraft.server.v1_16_R2.Packet;
-import net.minecraft.server.v1_16_R2.PacketPlayInAdvancements;
-import net.minecraft.server.v1_16_R2.PacketPlayInAdvancements.Status;
+import net.minecraft.server.v1_16_R3.NetworkManager;
+import net.minecraft.server.v1_16_R3.Packet;
+import net.minecraft.server.v1_16_R3.PacketPlayInAdvancements;
+import net.minecraft.server.v1_16_R3.PacketPlayInAdvancements.Status;
 
 public class AdvancementPacketReceiver {
 

diff --git a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/CrazyAdvancements.java b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/CrazyAdvancements.java
@@ -9,14 +9,16 @@
 import java.util.List;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Warning;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.craftbukkit.v1_16_R2.command.ProxiedNativeCommandSender;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_16_R3.command.ProxiedNativeCommandSender;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -29,10 +31,10 @@
 
 import eu.endercentral.crazy_advancements.AdvancementDisplay.AdvancementFrame;
 import eu.endercentral.crazy_advancements.manager.AdvancementManager;
-import net.minecraft.server.v1_16_R2.PacketPlayOutAdvancements;
-import net.minecraft.server.v1_16_R2.PacketPlayOutSelectAdvancementTab;
+import net.minecraft.server.v1_16_R3.PacketPlayOutAdvancements;
+import net.minecraft.server.v1_16_R3.PacketPlayOutSelectAdvancementTab;
 
-public class CrazyAdvancements extends JavaPlugin implements Listener {
+public final class CrazyAdvancements extends JavaPlugin implements Listener {
 
 	public static UUID CHAT_MESSAGE_UUID = new UUID(0, 0);
 
@@ -58,7 +60,7 @@ public CrazyAdvancements() {
 	@Override
 	public void onLoad() {
 		instance = this;
-		fileAdvancementManager = AdvancementManager.getNewAdvancementManager();
+		fileAdvancementManager = new AdvancementManager();
 	}
 
 	@Override
@@ -134,7 +136,9 @@ public void onDisable() {
 	 * 
 	 * @param players All players that should be in the new manager from the start, can be changed at any time
 	 * @return the generated advancement manager
+	 * @deprecated Use the AdvancementManager constructor instead of this method
 	 */
+	@Deprecated(since = "1.13.10")
 	public static AdvancementManager getNewAdvancementManager(Player... players) {
 		return AdvancementManager.getNewAdvancementManager(players);
 	}
@@ -162,9 +166,9 @@ public static void setActiveTab(Player player, String rootAdvancement) {
 	 * Sets the active tab
 	 * 
 	 * @param player The player whose Tab should be changed
-	 * @param rootAdvancementThe name of the tab to change to
+	 * @param rootAdvancement The name of the tab to change to
 	 */
-	public static void setActiveTab(Player player, NameKey rootAdvancement) {
+	public static void setActiveTab(Player player, @Nullable NameKey rootAdvancement) {
 		setActiveTab(player, rootAdvancement, true);
 	}
 

diff --git a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/JSONMessage.java b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/JSONMessage.java
@@ -1,7 +1,7 @@
 package eu.endercentral.crazy_advancements;
 
-import net.minecraft.server.v1_16_R2.IChatBaseComponent;
-import net.minecraft.server.v1_16_R2.IChatBaseComponent.ChatSerializer;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent;
+import net.minecraft.server.v1_16_R3.IChatBaseComponent.ChatSerializer;
 
 public class JSONMessage {
 

diff --git a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/NameKey.java b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/NameKey.java
@@ -1,6 +1,6 @@
 package eu.endercentral.crazy_advancements;
 
-import net.minecraft.server.v1_16_R2.MinecraftKey;
+import net.minecraft.server.v1_16_R3.MinecraftKey;
 
 public class NameKey {