From ac42bb4ef9fc7eae08ceb6c59641f72898e04530 Mon Sep 17 00:00:00 2001 From: ZockerAxel Date: Mon, 9 Nov 2020 22:23:18 +0100 Subject: [PATCH] Update to MC 1.16.4 --- CrazyAdvancementAPI/plugin.yml | 2 +- .../crazy_advancements/Advancement.java | 42 +++++------ .../AdvancementDisplay.java | 2 +- .../AdvancementPacketReceiver.java | 10 +-- .../crazy_advancements/CrazyAdvancements.java | 20 +++-- .../crazy_advancements/JSONMessage.java | 4 +- .../crazy_advancements/NameKey.java | 2 +- .../manager/AdvancementManager.java | 74 ++++++++++--------- 8 files changed, 83 insertions(+), 73 deletions(-) diff --git a/CrazyAdvancementAPI/plugin.yml b/CrazyAdvancementAPI/plugin.yml index 8c643d3..4a9906a 100644 --- 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 index bffcaa2..828c637 100644 --- 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 prg = new HashMap<>(); @@ -448,7 +448,7 @@ public boolean isAnythingGrantedAfter(Player player) { private Set 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 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 index b15d61f..9f19361 100644 --- 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 index 5ed0d81..aac53b8 100644 --- 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 index 61e0897..e7c8383 100644 --- 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 index 85c8efa..8250355 100644 --- 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 index 8b45382..6957b25 100644 --- 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 { diff --git a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/manager/AdvancementManager.java b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/manager/AdvancementManager.java index 325ebf2..68dd2da 100644 --- a/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/manager/AdvancementManager.java +++ b/CrazyAdvancementAPI/src/eu/endercentral/crazy_advancements/manager/AdvancementManager.java @@ -18,8 +18,8 @@ import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; -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.common.reflect.TypeToken; @@ -40,21 +40,21 @@ import eu.endercentral.crazy_advancements.events.offline.OfflineCriteriaGrantEvent; import eu.endercentral.crazy_advancements.events.offline.OfflineCriteriaProgressChangeEvent; import eu.endercentral.crazy_advancements.exception.UnloadProgressFailedException; -import net.minecraft.server.v1_16_R2.AdvancementDisplay; -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.Criterion; -import net.minecraft.server.v1_16_R2.CriterionInstance; -import net.minecraft.server.v1_16_R2.CriterionProgress; -import net.minecraft.server.v1_16_R2.IChatBaseComponent; -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.AdvancementDisplay; +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.Criterion; +import net.minecraft.server.v1_16_R3.CriterionInstance; +import net.minecraft.server.v1_16_R3.CriterionProgress; +import net.minecraft.server.v1_16_R3.IChatBaseComponent; +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 AdvancementManager { +public final class AdvancementManager { private static HashMap accessible = new HashMap<>(); @@ -90,8 +90,15 @@ private static float getSmallestX(NameKey key) { private ArrayList players; private ArrayList advancements = new ArrayList<>(); - private AdvancementManager() { - players = new ArrayList<>(); + /** + * + * @param players All players that should be in the new manager from the start, can be changed at any time + */ + public AdvancementManager(Player... players) { + this.players = new ArrayList<>(); + for(Player player : players) { + this.addPlayer(player); + } } /** @@ -99,12 +106,11 @@ private AdvancementManager() { * * @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) { - AdvancementManager manager = new AdvancementManager(); - for(Player player : players) { - manager.addPlayer(player); - } + AdvancementManager manager = new AdvancementManager(players); return manager; } @@ -138,7 +144,7 @@ private void addPlayer(Player player, NameKey tab) { players.add(player); } - Collection advs = new ArrayList<>(); + Collection advs = new ArrayList<>(); Set remove = new HashSet<>(); Map prgs = new HashMap<>(); @@ -207,7 +213,7 @@ public MinecraftKey a() { advRequirements = advancement.getSavedCriteriaRequirements(); } - net.minecraft.server.v1_16_R2.Advancement adv = new net.minecraft.server.v1_16_R2.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); + net.minecraft.server.v1_16_R3.Advancement adv = new net.minecraft.server.v1_16_R3.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); advs.add(adv); @@ -240,7 +246,7 @@ public MinecraftKey a() { public void removePlayer(Player player) { players.remove(player); - Collection advs = new ArrayList<>(); + Collection advs = new ArrayList<>(); Set remove = new HashSet<>(); Map prgs = new HashMap<>(); @@ -259,7 +265,7 @@ public void removePlayer(Player player) { * @param advancementsAdded An array of all advancements that should be added
If you want to update the display of an advancement, the array must have a length of 1 */ public void addAdvancement(eu.endercentral.crazy_advancements.Advancement... advancementsAdded) { - HashMap> advancementsList = new HashMap<>(); + HashMap> advancementsList = new HashMap<>(); Set remove = new HashSet<>(); HashMap> progressList = new HashMap<>(); @@ -346,7 +352,7 @@ public MinecraftKey a() { AdvancementDisplay saveDisplay = new AdvancementDisplay(icon, display.getTitle().getBaseComponent(), display.getDescription().getBaseComponent(), backgroundTexture, display.getFrame().getNMS(), display.isToastShown(), display.isAnnouncedToChat(), true); saveDisplay.a(display.generateX() - getSmallestY(advancement.getTab()), display.generateY() - getSmallestX(advancement.getTab())); - net.minecraft.server.v1_16_R2.Advancement saveAdv = new net.minecraft.server.v1_16_R2.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), saveDisplay, advRewards, advCriteria, advRequirements); + net.minecraft.server.v1_16_R3.Advancement saveAdv = new net.minecraft.server.v1_16_R3.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), saveDisplay, advRewards, advCriteria, advRequirements); advancement.saveAdvancement(saveAdv); @@ -356,7 +362,7 @@ public MinecraftKey a() { boolean showToast = display.isToastShown() && getCriteriaProgress(player, advancement) < advancement.getSavedCriteria().size(); - Collection advs = advancementsList.containsKey(player) ? advancementsList.get(player) : new ArrayList<>(); + Collection advs = advancementsList.containsKey(player) ? advancementsList.get(player) : new ArrayList<>(); boolean hidden = !display.isVisible(player, advancement); advancement.saveHiddenStatus(player, hidden); @@ -365,7 +371,7 @@ public MinecraftKey a() { AdvancementDisplay advDisplay = new AdvancementDisplay(icon, display.getTitle().getBaseComponent(), display.getDescription().getBaseComponent(), backgroundTexture, display.getFrame().getNMS(), showToast, display.isAnnouncedToChat(), hidden ? hiddenBoolean : false); advDisplay.a(display.generateX() - getSmallestX(advancement.getTab()), display.generateY() - getSmallestY(advancement.getTab())); - net.minecraft.server.v1_16_R2.Advancement adv = new net.minecraft.server.v1_16_R2.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); + net.minecraft.server.v1_16_R3.Advancement adv = new net.minecraft.server.v1_16_R3.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); advs.add(adv); @@ -401,7 +407,7 @@ public MinecraftKey a() { * @param advancementsRemoved An array of advancements that should be removed */ public void removeAdvancement(Advancement... advancementsRemoved) { - Collection advs = new ArrayList<>(); + Collection advs = new ArrayList<>(); Set remove = new HashSet<>(); Map prgs = new HashMap<>(); @@ -473,7 +479,7 @@ public void updateProgress(Player player, Advancement... advancementsUpdated) { private void updateProgress(Player player, boolean alreadyGranted, boolean fireEvent, Advancement... advancementsUpdated) { if(players.contains(player)) { - Collection advs = new ArrayList<>(); + Collection advs = new ArrayList<>(); Set remove = new HashSet<>(); Map prgs = new HashMap<>(); @@ -553,7 +559,7 @@ public MinecraftKey a() { AdvancementDisplay advDisplay = new AdvancementDisplay(icon, display.getTitle().getBaseComponent(), display.getDescription().getBaseComponent(), backgroundTexture, display.getFrame().getNMS(), display.isToastShown(), display.isAnnouncedToChat(), hidden ? hiddenBoolean : false); advDisplay.a(display.generateX() - getSmallestX(advancement.getTab()), display.generateY() - getSmallestY(advancement.getTab())); - net.minecraft.server.v1_16_R2.Advancement adv = new net.minecraft.server.v1_16_R2.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); + net.minecraft.server.v1_16_R3.Advancement adv = new net.minecraft.server.v1_16_R3.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); advs.add(adv); } @@ -593,7 +599,7 @@ public void updateAllPossiblyAffectedVisibilities(Player player, Advancement fro */ public void updateVisibility(Player player, Advancement advancement) { if(players.contains(player)) { - Collection advs = new ArrayList<>(); + Collection advs = new ArrayList<>(); Set remove = new HashSet<>(); Map prgs = new HashMap<>(); @@ -665,7 +671,7 @@ public MinecraftKey a() { AdvancementDisplay advDisplay = new AdvancementDisplay(icon, display.getTitle().getBaseComponent(), display.getDescription().getBaseComponent(), backgroundTexture, display.getFrame().getNMS(), showToast, display.isAnnouncedToChat(), hidden ? hiddenBoolean : false); advDisplay.a(display.generateX() - getSmallestX(advancement.getTab()), display.generateY() - getSmallestY(advancement.getTab())); - net.minecraft.server.v1_16_R2.Advancement adv = new net.minecraft.server.v1_16_R2.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); + net.minecraft.server.v1_16_R3.Advancement adv = new net.minecraft.server.v1_16_R3.Advancement(advancement.getName().getMinecraftKey(), advancement.getParent() == null ? null : advancement.getParent().getSavedAdvancement(), advDisplay, advRewards, advCriteria, advRequirements); advs.add(adv);