Adding custom advancements & progression to TheEvent580

build.gradle

@@ -34,6 +34,9 @@ repositories {
     maven {
         url = 'https://repo.extendedclip.com/releases/'
     }
+    maven {
+        url = 'https://nexus.frengor.com/repository/public/'
+    }
 }
 
 dependencies {
@@ -44,6 +47,7 @@ dependencies {
     compileOnly 'net.citizensnpcs:citizens-main:2.0.37-SNAPSHOT'
     compileOnly 'me.clip:placeholderapi:2.11.6'
     compileOnly 'com.github.decentsoftware-eu:decentholograms:2.9.7'
+    compileOnly 'com.frengor:ultimateadvancementapi:2.7.1'
 
 
     //implementation "me.superneon4ik:NoxesiumUtils:2.0.0"

src/main/java/fr/thefox580/theevent5802/listeners/OnInventoryInteract.java

@@ -1,5 +1,7 @@
 package fr.thefox580.theevent5802.listeners;
 
+import com.fren_gor.ultimateAdvancementAPI.advancement.BaseAdvancement;
+import com.fren_gor.ultimateAdvancementAPI.advancement.display.AdvancementFrameType;
 import fr.thefox580.theevent5802.TheEvent580_2;
 import fr.thefox580.theevent5802.commands.Minecraftle;
 import fr.thefox580.theevent5802.games.build_masters.BuildMasters;
@@ -212,6 +214,20 @@ else if (event.getView().title().equals(Component.text("Do you want to start the
 
                     Voting.addAllGames();
 
+
+                    BaseAdvancement adv = plugin.getInstances().getAdvancementAPI().createAdvancement(
+                            "start",
+                            Material.LIME_CONCRETE,
+                            "Starting soon!",
+                            AdvancementFrameType.TASK,
+                            false,
+                            "TheEvent580 is starting",
+                            "in 3 minutes");
+
+                    for (Player loopPlayer : Bukkit.getOnlinePlayers()){
+                        adv.grant(loopPlayer);
+                    }
+
                     player.closeInventory();
                 } else if (event.getCurrentItem().getType() == Material.RED_CONCRETE){
                     player.closeInventory();

src/main/java/fr/thefox580/theevent5802/listeners/OnJoin.java

@@ -1,5 +1,7 @@
 package fr.thefox580.theevent5802.listeners;
 
+import com.fren_gor.ultimateAdvancementAPI.advancement.BaseAdvancement;
+import com.fren_gor.ultimateAdvancementAPI.events.PlayerLoadingCompletedEvent;
 import fr.thefox580.theevent5802.TheEvent580_2;
 import fr.thefox580.theevent5802.utils.*;
 import net.kyori.adventure.text.Component;
@@ -175,6 +177,31 @@ public void run() {
 
     }
 
+
+
+    @EventHandler
+    public void playerCompleteLoadingEvent(PlayerLoadingCompletedEvent event){
+        Player player = event.getPlayer();
+
+        plugin.getInstances().getAdvancementAPI().getProgressionTab().showTab(player);
+        plugin.getInstances().getAdvancementAPI().getCustomTab().showTab(player);
+
+        int game = 0;
+        if (game < (int) Variables.getVariable("jeu")){
+            int offset = 1;
+            if ((int) Variables.getVariable("jeu") > 3){
+                offset = 2;
+            }
+            while (game < (int) Variables.getVariable("jeu") + offset){
+                BaseAdvancement adv = plugin.getInstances().getAdvancementAPI().getProgressionAdvancement(game);
+                if (!adv.isGranted(player)){
+                    adv.grant(player);
+                }
+                game++;
+            }
+        }
+    }
+
     @NotNull
     private static Component getPlayerJoinComponent(PlayerManager playerManager) { //Setup join message
 

src/main/java/fr/thefox580/theevent5802/listeners/OnLeave.java

@@ -11,7 +11,10 @@
 
 public class OnLeave implements Listener {
 
+    private final TheEvent580_2 plugin;
+
     public OnLeave(TheEvent580_2 plugin){
+        this.plugin = plugin;
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
@@ -29,6 +32,9 @@ public void playerLeavesEvent(PlayerQuitEvent event){ //When a player leaves the
             }
         }
 
+        plugin.getInstances().getAdvancementAPI().getProgressionTab().hideTab(player);
+        plugin.getInstances().getAdvancementAPI().getCustomTab().hideTab(player);
+
         event.quitMessage(getPlayerLeaveComponent(playerManager));
     }
 

src/main/java/fr/thefox580/theevent5802/listeners/OnPlayerMove.java

@@ -1,6 +1,7 @@
 package fr.thefox580.theevent5802.listeners;
 
 import com.destroystokyo.paper.event.player.PlayerJumpEvent;
+import com.fren_gor.ultimateAdvancementAPI.advancement.BaseAdvancement;
 import fr.thefox580.theevent5802.TheEvent580_2;
 import fr.thefox580.theevent5802.games.build_masters.BuildMasters;
 import fr.thefox580.theevent5802.games.trials.Trials;
@@ -25,7 +26,10 @@
 
 public class OnPlayerMove implements Listener {
 
+    private final TheEvent580_2 plugin;
+
     public OnPlayerMove(TheEvent580_2 plugin){
+        this.plugin = plugin;
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
@@ -90,12 +94,20 @@ public void onPlayerSneakEvent(PlayerToggleSneakEvent event){
     public void onPlayerJumpEvent(PlayerJumpEvent event){
         Player player = event.getPlayer();
         if (player.getWorld().getName().equals("world")){
-            if (Objects.equals(Variables.getVariable("jeu_condi"), 0)
-                    && player.getLocation().add(0, -1, 0).getBlock().getType() == Material.DEEPSLATE_COAL_ORE
-                    && player.getY() <= 0){
-                player.teleport(new Location(player.getWorld(), 328.5, 69.5, 316.5, 150, 0));
-                player.removePotionEffect(PotionEffectType.NIGHT_VISION);
+            if (Variables.equals("jeu_condi", 0)){
+                if (player.getLocation().add(0, -1, 0).getBlock().getType() == Material.DEEPSLATE_COAL_ORE
+                        && player.getY() <= 0){
+                    player.teleport(new Location(player.getWorld(), 328.5, 69.5, 316.5, 150, 0));
+                    player.removePotionEffect(PotionEffectType.NIGHT_VISION);
+                } else if (player.getLocation().add(0, -2, 0).getBlock().getType() == Material.POWDER_SNOW){
+                    BaseAdvancement parkourAdv = plugin.getInstances().getAdvancementAPI().getCustomAdvancement(AdvancementsEnum.SECRETBASE);
+                    if (!parkourAdv.isGranted(player)){
+                        parkourAdv.grant(player);
+                        plugin.getInstances().getAdvancementAPI().getCounterAdvancement().incrementProgression(player);
+                    }
+                }
             }
+
         } else if (Variables.equals("jeu_condi", Game.TRIALS.getGameCondition())){
 
             Map<Player, Integer> jumps = TrialsTasks.getStats();

src/main/java/fr/thefox580/theevent5802/listeners/OnWorldInteract.java

@@ -1,5 +1,6 @@
 package fr.thefox580.theevent5802.listeners;
 
+import com.fren_gor.ultimateAdvancementAPI.advancement.BaseAdvancement;
 import fr.thefox580.theevent5802.TheEvent580_2;
 import fr.thefox580.theevent5802.games.build_masters.BuildMasters;
 import fr.thefox580.theevent5802.games.finder.Finder;
@@ -244,6 +245,13 @@ public void onPlayerClickEvent(PlayerInteractEvent event){
                     }
                 }
             }
+        }
+        else if (event.getClickedBlock().getType() == Material.LEVER){
+            BaseAdvancement parkourAdv = plugin.getInstances().getAdvancementAPI().getCustomAdvancement(AdvancementsEnum.HEROBRINE);
+            if (!parkourAdv.isGranted(player)){
+                parkourAdv.grant(player);
+                plugin.getInstances().getAdvancementAPI().getCounterAdvancement().incrementProgression(player);
+            }
         } else if (event.getAction() == Action.RIGHT_CLICK_BLOCK){
             if (event.getClickedBlock() == null){
                 TheEvent580_2.getPlugin(TheEvent580_2.class).getLogger().warning(player.getName() + " clicked on air");

src/main/java/fr/thefox580/theevent5802/tasks/SpawnTask.java

@@ -1,5 +1,6 @@
 package fr.thefox580.theevent5802.tasks;
 
+import com.fren_gor.ultimateAdvancementAPI.advancement.BaseAdvancement;
 import fr.thefox580.theevent5802.TheEvent580_2;
 import fr.thefox580.theevent5802.commands.Spawn;
 import fr.thefox580.theevent5802.utils.*;
@@ -17,10 +18,12 @@
 
 public class SpawnTask implements Runnable{
 
+    private final TheEvent580_2 plugin;
     private final BukkitTask task;
     private final List<Integer> modes = List.of(0, 1, 7, 8, 10, 11);
 
     public SpawnTask(TheEvent580_2 plugin){
+        this.plugin = plugin;
         this.task = Bukkit.getScheduler().runTaskTimer(plugin, this, 0, 1L);
         PluginStart.addTaskToList(task);
     }
@@ -80,6 +83,12 @@ public void run() {
 
                     SpawnParkour.updateText();
 
+                    BaseAdvancement parkourAdv = plugin.getInstances().getAdvancementAPI().getCustomAdvancement(AdvancementsEnum.HUBPARKOUR);
+                    if (!parkourAdv.isGranted(player)){
+                        parkourAdv.grant(player);
+                        plugin.getInstances().getAdvancementAPI().getCounterAdvancement().incrementProgression(player);
+                    }
+
                 }
             }
         } else {

src/main/java/fr/thefox580/theevent5802/tasks/timer/Mode4.java

@@ -1,5 +1,7 @@
 package fr.thefox580.theevent5802.tasks.timer;
 
+import com.fren_gor.ultimateAdvancementAPI.advancement.BaseAdvancement;
+import com.fren_gor.ultimateAdvancementAPI.advancement.display.AdvancementFrameType;
 import fr.thefox580.theevent5802.TheEvent580_2;
 import fr.thefox580.theevent5802.games.arms_race.ArmsRace;
 import fr.thefox580.theevent5802.games.bow_pvp.BowPVP;
@@ -14,6 +16,7 @@
 import net.kyori.adventure.title.Title;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.potion.PotionEffect;
@@ -71,18 +74,70 @@ else if (Timer.getSeconds() == 0){
             });
 
             switch (game){
-                case TRIALS -> Trials.startPreGame(plugin);
-                case PARKOUR -> Parkour.startPreGame(plugin);
-                case FINDER -> Finder.startPreGame(plugin);
-                case TAG -> Tag.startPreGame(plugin);
-                case SPLEEF -> Spleef.startPreGame(plugin);
-                case BUILD_MASTERS -> BuildMasters.startPreGame(plugin);
-                case ARMS_RACE -> ArmsRace.startPreGame(plugin);
-                case BOW_PVP -> BowPVP.startPreGame(plugin);
+                case TRIALS -> {
+                    Trials.startPreGame(plugin);
+                    createGameAdvancement("You better complete those tasks!");
+                }
+                case PARKOUR -> {
+                    Parkour.startPreGame(plugin);
+                    createGameAdvancement("Don't fail your jumps!");
+                }
+                case FINDER -> {
+                    Finder.startPreGame(plugin);
+                    createGameAdvancement("Did you get those blocks?");
+                }
+                case TAG -> {
+                    Tag.startPreGame(plugin);
+                    createGameAdvancement("QUICK RUN!!!!!!!!!!!!!1!!!!!!!!!!");
+                }
+                case SPLEEF -> {
+                    Spleef.startPreGame(plugin);
+                    createGameAdvancement("Tip : Make other player fall.");
+                }
+                case BUILD_MASTERS -> {
+                    BuildMasters.startPreGame(plugin);
+                    createGameAdvancement("Nobody finished that game since the mall arrived, have you?");
+                }
+                case ARMS_RACE -> {
+                    ArmsRace.startPreGame(plugin);
+                    createGameAdvancement("Kill people but don't get killed.");
+                }
+                case BOW_PVP -> {
+                    BowPVP.startPreGame(plugin);
+                    createGameAdvancement("SHOOT EVERYONE.");
+                }
             }
 
             task.cancel();
         }
 
     }
+
+    private void createGameAdvancement(String description){
+
+        String desc = String.valueOf((int) Variables.getVariable("jeu"));
+
+        if ((int) Variables.getVariable("jeu") == 1){
+            desc += "st";
+        } else if ((int) Variables.getVariable("jeu") == 2){
+            desc += "nd";
+        } else if ((int) Variables.getVariable("jeu") == 2){
+            desc += "rd";
+        } else {
+            desc += "th";
+        }
+
+        BaseAdvancement adv = plugin.getInstances().getAdvancementAPI().createAdvancement(
+                "game" + (int) Variables.getVariable("jeu"),
+                game.getMaterialBlock(),
+                "Game " + Variables.getVariable("jeu") + " : " + game.getIcon() + " " + game.getName(),
+                AdvancementFrameType.CHALLENGE,
+                false,
+                "The " + desc + " game is " + game.getName() + " ",
+                description);
+
+        for (Player player : Bukkit.getOnlinePlayers()){
+            adv.grant(player);
+        }
+    }
 }