feat: more achievements

Author: ArikSquad

configuration/achievements/bedwars/challenge.yml

@@ -234,11 +234,11 @@ achievements:
 
   - id: "bedwars.minefield"
     name: "Minefield"
-    description: "Place 10 traps in a single game"
+    description: "Place 3 traps in a single game"
     type: CHALLENGE
     points: 10
     trigger: "bedwars.traps_placed"
-    goal: 10
+    goal: 1
     perGame: true
 
   - id: "bedwars.not_today"
@@ -294,6 +294,13 @@ achievements:
     goal: 5
     perGame: true
 
+  - id: "bedwars.sneaky_rusher"
+    name: "Sneaky Rusher"
+    description: "Destroy a bed while being invisible"
+    points: 5
+    trigger: "bedwars.sneaky_rusher_trigger"
+    goal: 1
+
   - id: "bedwars.ultimate_defense"
     name: "Ultimate Defense"
     description: "Have 5 active upgrades at once"
@@ -311,11 +318,11 @@ achievements:
     goal: 10
     perGame: true
 
-  - id: "bed_wars.that_s_a_first"
+  - id: "bedwars.thats_a_first"
     name: "That's a First"
     description: "Win your first game of Bed Wars."
     type: CHALLENGE
     points: 5
-    trigger: "bedwars.thats_a_first_trigger"
+    trigger: "bedwars.wins"
     goal: 1
 

settings.gradle.kts

@@ -16,15 +16,15 @@ include(":pvp")
 
 include(":type.prototypelobby")
 include(":type.thefarmingislands")
-include("type.spidersden")
-include("type.theend")
-include("type.crimsonisle")
+include(":type.spidersden")
+include(":type.theend")
+include(":type.crimsonisle")
 include(":type.goldmine")
 include(":type.deepcaverns")
 include(":type.dwarvenmines")
-include("type.thepark")
-include("type.galatea")
-include("type.backwaterbayou")
+include(":type.thepark")
+include(":type.galatea")
+include(":type.backwaterbayou")
 include(":type.island")
 include(":type.hub")
 include(":type.dungeonhub")

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionGameBreak.java

@@ -6,6 +6,7 @@
 import net.minestom.server.event.player.PlayerBlockBreakEvent;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.item.ItemStack;
+import net.minestom.server.potion.PotionEffect;
 import net.minestom.server.tag.Tag;
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig;
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig.MapTeam;
@@ -63,7 +64,7 @@ public void run(PlayerBlockBreakEvent event) {
 					return;
 				}
 				if (!game.getTeamManager().isBedAlive(teamKey)) {
-					// Bed already destroyed logically, block might linger if not cleared perfectly
+					// Bed already destroyed logically; block might linger if not cleared perfectly
 					event.setCancelled(true);
 					return;
 				}
@@ -72,6 +73,10 @@ public void run(PlayerBlockBreakEvent event) {
 				player.getInstance().setBlock(feetPoint, Block.AIR);
 				player.getInstance().setBlock(headPoint, Block.AIR);
 
+				if (player.hasEffect(PotionEffect.INVISIBILITY)) {
+					player.getAchievementHandler().completeAchievement("bedwars.sneaky_rusher"); // break an bed while invisible
+				}
+
 				for (BedWarsPlayer p : game.getPlayers()) {
 					p.sendMessage(String.format("§c§lBED DESTRUCTION §r§cTeam %s's bed was destroyed by %s%s!",
 							teamKey.getName(), teamKey.chatColor(), player.getUsername()));

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionGamePlace.java

@@ -73,6 +73,7 @@ public void run(PlayerBlockPlaceEvent event) {
 		}
 
 		event.setBlock(event.getBlock().withTag(TypeBedWarsGameLoader.PLAYER_PLACED_TAG, true));
+		player.getAchievementHandler().addProgressByTrigger("bedwars.blocks_placed", 1);
 	}
 
 }

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionGamePlayerEvent.java

@@ -203,7 +203,7 @@ public void run(PlayerStartDiggingEvent event) {
 					player.sendMessage("§7You deposited x" + itemInHand.amount()
 							+ " " + itemInHand.material().name().toLowerCase().replace("_", " ")
 							+ " into your ender chest.");
-					player.getAchievementHandler().completeAchievement("bedwars.future_is_now");
+					player.getAchievementHandler().addProgressByTrigger("bedwars.chest_deposit", 1);
 				} else {
 					player.sendMessage("§cYour ender chest is full!");
 				}
@@ -267,7 +267,7 @@ public void run(PlayerStartDiggingEvent event) {
 
 				if (itemAdded) {
 					player.setItemInMainHand(ItemStack.AIR);
-					player.getAchievementHandler().completeAchievement("bedwars.future_is_now");
+					player.getAchievementHandler().addProgressByTrigger("bedwars.chest_deposit", 1);
 				} else {
 					player.sendMessage("§cThe team chest is full!");
 				}

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java

@@ -518,6 +518,7 @@ private void endGame(TeamKey winningTeam) {
 			// Record win for players on the winning team
 			if (finalWinningTeam != null && finalWinningTeam.getName().equalsIgnoreCase(player.getTeamName())) {
 				BedWarsStatsRecorder.recordWin(player, bedwarsGameType);
+				player.getAchievementHandler().addProgressByTrigger("bedwars.wins", 1);
 			}
 
 			if (player.getGameMode() != GameMode.SPECTATOR) {

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/TeamManager.java

@@ -15,6 +15,7 @@
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig.MapTeam;
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig.TeamKey;
 import net.swofty.type.bedwarsgame.TypeBedWarsGameLoader;
+import net.swofty.type.bedwarsgame.user.BedWarsPlayer;
 import org.tinylog.Logger;
 
 import java.util.*;
@@ -174,7 +175,7 @@ public void removeTeamTrap(TeamKey teamKey, String trapKey) {
 		}
 	}
 
-	public List<Player> getPlayersOnTeam(TeamKey teamKey) {
+	public List<BedWarsPlayer> getPlayersOnTeam(TeamKey teamKey) {
 		return game.getPlayers().stream()
 				.filter(player -> teamKey.getName().equals(player.getTag(Tag.String("team")))
 						&& player.isOnline()

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/gui/GUITeamShop.java

@@ -163,6 +163,12 @@ public void run(InventoryPreClickEvent event, HypixelPlayer p) {
 
 					Game playerGame = TypeBedWarsGameLoader.getPlayerGame(player);
 					if (playerGame == null || tag == null) return;
+					int trapSize = playerGame.getTeamManager().getTeamTraps(tag).size();
+					if (trapSize >= 3) {
+						player.sendMessage("§cYou can't have more traps than 3");
+						playClickSound(player);
+					}
+
 					Trap trap = traps.get(index);
 					int price = trap.getPrice(playerGame, tag);
 					int owned = Arrays.stream(player.getInventory().getItemStacks())
@@ -173,11 +179,17 @@ public void run(InventoryPreClickEvent event, HypixelPlayer p) {
 						playClickSound(player);
 						return;
 					}
+
 					BedWarsInventoryManipulator.removeItems(player, trap.getCurrency().getMaterial(), price);
 					playerGame.getTeamManager().addTeamTrap(tag, trap.getKey());
 					broadcastTeamPurchase(playerGame, tag, player, trap.getName());
 					playBuySound(player);
 					updateGUI(player);
+					if (trapSize == 2) {
+						for (BedWarsPlayer teamPlayer : game.getTeamManager().getPlayersOnTeam(player.getTeamKey())) {
+							teamPlayer.getAchievementHandler().completeAchievement("bedwars.minefield");
+						}
+					}
 				}
 
 				@Override