diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f24e756..36841ff 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -35,6 +35,9 @@ jobs: - name: Build with Gradle run: gradle clean build --parallel + env: + GITHUB_ACTOR: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/build.gradle b/build.gradle index 4f47a50..56a0bf2 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'com.github.drfiveminusmint' -version = 'Alpha-2.1' +version = 'Alpha-3.0' description = "brick ball" java.toolchain.languageVersion = JavaLanguageVersion.of(21) @@ -23,6 +23,13 @@ repositories { maven { url = uri("https://maven.enginehub.org/repo/") } + maven { + url = uri("https://maven.pkg.github.com/drfiveminusmint/fiveui") + credentials { + username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") + password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") + } + } } dependencies { @@ -30,4 +37,5 @@ dependencies { compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.10") compileOnly("com.sk89q.worldedit:worldedit-core:7.3.3") compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.3.3") + compileOnly("com.github.drfiveminusmint:fiveui:alpha-1.0.3") } \ No newline at end of file diff --git a/src/main/java/com/github/drfiveminusmint/brickball/Brickball.java b/src/main/java/com/github/drfiveminusmint/brickball/Brickball.java index 49d8e87..f6f8509 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/Brickball.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/Brickball.java @@ -12,15 +12,31 @@ import com.github.drfiveminusmint.brickball.scheduling.BrickballScheduler; import com.github.drfiveminusmint.brickball.scheduling.CreateMatchTask; import com.github.drfiveminusmint.brickball.scheduling.LoadStatsTask; +import com.github.drfiveminusmint.brickball.scheduling.matchmaking.Matchmaker; import com.github.drfiveminusmint.brickball.stats.FormatStats; +import com.github.drfiveminusmint.brickball.stats.Leaderboard; +import com.github.drfiveminusmint.brickball.ui.LobbyCreationMenu; +import com.github.drfiveminusmint.fiveUI.FiveUI; +import com.github.drfiveminusmint.fiveUI.container.Page; +import com.github.drfiveminusmint.fiveUI.element.LinkButton; +import com.github.drfiveminusmint.fiveUI.element.StaticButton; +import com.github.drfiveminusmint.fiveUI.util.ItemStackBuilder; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.event.ClickEvent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.Bukkit; +import org.bukkit.Material; import org.bukkit.World; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.InventoryType; import org.bukkit.plugin.java.JavaPlugin; import java.io.File; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Objects; import java.util.logging.Level; @@ -30,10 +46,14 @@ public final class Brickball extends JavaPlugin { private TemplateManager templateManager; private MatchManager matchManager; private LobbyList lobbyList; - private ArrayList formats = new ArrayList<>(); - private HashMap perFormatStats = new HashMap(); + private final ArrayList formats = new ArrayList<>(); + private final ArrayList backroundGenerateMaps = new ArrayList<>(); + private final HashMap perFormatStats = new HashMap<>(); + private final HashMap matchmakers = new HashMap<>(); + private final HashMap leaderboards = new HashMap<>(); private World matchWorld; private BrickballScheduler scheduler; + private Page mainUI; private boolean doBackgroundArenaGeneration = false; public static Brickball getInstance() { @@ -88,8 +108,10 @@ public void onEnable() { else getLogger().log(Level.INFO, "[Debug] Couldn't load map " + f.getName()); } + int numMatchmakers = 0; // Load formats and stats for (File file : formatsFolder.listFiles()) { + if (file.isDirectory()) continue; YamlConfiguration formatConfig = new YamlConfiguration(); try { formatConfig.load(file); @@ -100,7 +122,19 @@ public void onEnable() { // load stats from the CSV File statsFile = new File(statsFolder, format.getName() + ".csv"); if (!statsFile.exists()) statsFile.createNewFile(); - scheduler.submitTask(new LoadStatsTask(99, statsFile, formatStats)); + scheduler.submitTask(new LoadStatsTask(99, statsFile, formatStats, format)); + // create matchmakers if necessary + if (format.getDoMatchmaking()) { + Matchmaker matchmaker = new Matchmaker(format); + // stagger our matchmakers running + matchmaker.runTaskTimerAsynchronously(this, 20 + numMatchmakers++, 20); + matchmakers.put(format, matchmaker); + } + // Create leaderboards for rated modes + if (format.getIsRated()) { + Leaderboard board = new Leaderboard(format); + leaderboards.put(format, board); + } getLogger().log(Level.INFO, "Loaded format " + format.getName()); } catch (Exception e) { getLogger().log(Level.SEVERE, String.format("Error loading format file %s!", file.getName())); @@ -116,13 +150,58 @@ public void onEnable() { getServer().getPluginManager().registerEvents(new PlayerListener(), this); getServer().getPluginManager().registerEvents(new MatchEndListener(), this); - doBackgroundArenaGeneration = getConfig().getBoolean("preloadArenas", false); + for (Object o : getConfig().getList("backgroundGenerateMaps", new ArrayList<>())) { + if (o instanceof String s && templateManager.findTemplate(s) != null) + backroundGenerateMaps.add(templateManager.findTemplate(s)); + } + doBackgroundArenaGeneration = !backroundGenerateMaps.isEmpty(); if (doBackgroundArenaGeneration) { - int i = 0; - for (ArenaTemplate template : templateManager.templates.values()) { + for (ArenaTemplate template : backroundGenerateMaps) { scheduler.submitTask(new CreateMatchTask(template.getID(), -1)); } } + + // Create UI Pages + mainUI = new Page(Component.text("Brickball", NamedTextColor.DARK_RED, TextDecoration.BOLD), InventoryType.CHEST); + Page matchmakingUI = new Page(Component.text("Find Match", NamedTextColor.DARK_RED, TextDecoration.BOLD), InventoryType.CHEST); + Page leaderboardUI = new Page(Component.text("Leaderboards", NamedTextColor.GOLD, TextDecoration.BOLD), InventoryType.CHEST); + + // Build main UI page + mainUI.setElement(10, new LinkButton( + new ItemStackBuilder(Material.BRICK, 1) + .name(Component.text("Find Match", NamedTextColor.YELLOW)) + .itemStack(), + matchmakingUI)); + mainUI.setElement(13, new LinkButton( + new ItemStackBuilder(Material.NETHER_STAR, 1) + .name(Component.text("Leaderboards", NamedTextColor.YELLOW)) + .itemStack(), + leaderboardUI)); + StaticButton createCustomButton = new StaticButton(new ItemStackBuilder(Material.ANVIL, 1) + .name(Component.text("Create Custom Match", NamedTextColor.YELLOW)) + .itemStack()); + createCustomButton.setOnClick(((player, clickableElement, clickType) -> new LobbyCreationMenu(player))); + mainUI.setElement(16, createCustomButton); + + // Build matchmaking UI page + int i = 0; + for (BrickballFormat format : matchmakers.keySet()) { + StaticButton button = new StaticButton(format.getUnselectedDisplayItem()); + button.setOnClick(((player, clickableElement, clickType) -> startPlayerQueue(player, format))); + matchmakingUI.setElement(i++, button); + if (i >= matchmakingUI.getInventory().getSize()) + break; + } + matchmakingUI.setOnClose(((player, container) -> Bukkit.getScheduler().runTaskLater(this, () -> mainUI.display(player), 1))); + + // Build leaderboards page + i = 0; + for (BrickballFormat format : leaderboards.keySet()) { + leaderboardUI.setElement(i++, new LinkButton(format.getUnselectedDisplayItem(), leaderboards.get(format).getDisplayPage())); + if (i >= leaderboardUI.getInventory().getSize()) + break; + } + } public World getMatchWorld() {return matchWorld;} @@ -130,13 +209,47 @@ public void onEnable() { public ArrayList getFormats() { return formats; } public FormatStats getFormatStats(BrickballFormat format) {return perFormatStats.get(format);} + public boolean startPlayerQueue(Player player, BrickballFormat format) { + // check to see if the player can join the queue + for (Matchmaker matchmaker : matchmakers.values()) + if (matchmaker.hasPlayer(player)) + return false; + if (lobbyList.getLobbyByPlayer(player) != null) + return false; + // add the player to the queue + matchmakers.get(format).addPlayer(player); + player.sendMessage(Component.text("Joined the queue for ", NamedTextColor.GOLD) + .append(Component.text(format.getName(), NamedTextColor.YELLOW))); + player.sendMessage(Component.text("To leave the queue use ", NamedTextColor.GOLD) + .append( Component.text("/brickball leave", NamedTextColor.AQUA).clickEvent(ClickEvent.runCommand("/bb leave")))); + return true; + } + + public boolean endPlayerQueue(Player player) { + boolean result = false; + for (Matchmaker matchmaker : matchmakers.values()) + result |= matchmaker.removePlayer(player); + return result; + } + + public Leaderboard getLeaderboard(BrickballFormat format) { return leaderboards.get(format); } + public boolean isBackgroundGenerationEnabled() { return doBackgroundArenaGeneration; } + public ArrayList getBackroundGenerateMaps() { + return backroundGenerateMaps; + } + + public Page getMainUI() { return mainUI; } + @Override public void onDisable() { + FiveUI.getInstance().getUIManager().unregisterInterface(mainUI); matchManager.stopAllMatches(); scheduler.shutdown(); + for (Matchmaker matchmaker : matchmakers.values()) + matchmaker.cancel(); } } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/command/BrickballCommand.java b/src/main/java/com/github/drfiveminusmint/brickball/command/BrickballCommand.java index d3f1253..bd55d20 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/command/BrickballCommand.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/command/BrickballCommand.java @@ -39,7 +39,8 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command return true; } if (args.length < 1) { - player.sendMessage("Usage: /brickball (join/jointeam/create/leave/map/start/pause/unpause)"); + //player.sendMessage("Usage: /brickball (join/jointeam/create/leave/map/start/pause/unpause)"); + Brickball.getInstance().getMainUI().display(player); return true; } if (args[0].equalsIgnoreCase("join")) return joinCommand(player, args); @@ -49,7 +50,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command if (args[0].equalsIgnoreCase("map")) return mapCommand(player, args); if (args[0].equalsIgnoreCase("start")) return startCommand(player); if (args[0].equalsIgnoreCase("teamColor")) return teamColorCommand(player, args); - if (args[0].equalsIgnoreCase("setting")) return settingCommand(player, args); + if (args[0].equalsIgnoreCase("settings")) return settingCommand(player, args); if (args[0].equalsIgnoreCase("setmap")) return setMapCommand(player, args); if (args[0].equalsIgnoreCase("setworld")) return setWorldCommand(player, args); if (args[0].equalsIgnoreCase("admin")) return adminCommand(player, args); @@ -374,7 +375,11 @@ public boolean leaveCommand(Player player) { player.sendMessage("You have left the lobby."); return true; } - player.sendMessage(Component.text("You're not in a Brickball lobby.", NamedTextColor.RED)); + if (Brickball.getInstance().endPlayerQueue(player)) { + player.sendMessage("You have left the queue."); + return true; + } + player.sendMessage(Component.text("You're not in a Brickball lobby or queue.", NamedTextColor.RED)); return true; } @@ -408,10 +413,6 @@ public boolean teamCommand(Player player, String[] args) { // Alters match settings in the player's current lobby. // These changes propagate downwards to the active match if one is present. public boolean settingCommand(Player player, String[] args) { - if (args.length < 2) { - player.sendMessage("Usage: /brickball setting (setting) "); - return true; - } Lobby lobby = Brickball.getInstance().getLobbyList().getLobbyByPlayer(player); if (lobby == null) { player.sendMessage(Component.text("You're not in a Brickball lobby.", NamedTextColor.RED)); @@ -425,6 +426,10 @@ public boolean settingCommand(Player player, String[] args) { player.sendMessage(Component.text("You can't change match settings in a rated match.", NamedTextColor.RED)); return true; } + if (args.length < 2) { + lobby.getSettingsMenu().open(player); + return true; + } NamespacedKey key = MatchSettings.Setting.getKey(args[1]); if (key == null) { player.sendMessage(Component.text("Unknown match setting: " + args[1], NamedTextColor.RED)); @@ -584,7 +589,7 @@ public boolean startCommand(Player player) { result.add(key.getKey()); return result; } - if (args.length == 1) return List.of( "admin", "create", "host", "cancel", "join", "jointeam", "leave", "map", "pause", "ready", "setting", "setmap", "setworld", "start", "stats", "teamcolor", "unpause"); + if (args.length == 1) return List.of( "admin", "create", "host", "cancel", "join", "jointeam", "leave", "map", "pause", "ready", "settings", "setmap", "setworld", "start", "stats", "teamcolor", "unpause"); return null; } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/events/listener/MatchEndListener.java b/src/main/java/com/github/drfiveminusmint/brickball/events/listener/MatchEndListener.java index f4d6695..1fba195 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/events/listener/MatchEndListener.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/events/listener/MatchEndListener.java @@ -3,6 +3,8 @@ import com.github.drfiveminusmint.brickball.Brickball; import com.github.drfiveminusmint.brickball.events.event.MatchEndEvent; import com.github.drfiveminusmint.brickball.lobby.BrickballFormat; +import com.github.drfiveminusmint.brickball.stats.Leaderboard; +import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -14,5 +16,8 @@ public void onMatchEnd(MatchEndEvent event) { // update stats BrickballFormat format = event.getFormat(); Brickball.getInstance().getFormatStats(format).updateStats(event.getResult()); + // update leaderboards + final Leaderboard leaderboard = Brickball.getInstance().getLeaderboard(format); + Bukkit.getScheduler().runTaskAsynchronously(Brickball.getInstance(), leaderboard::update); } } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/events/listener/PlayerListener.java b/src/main/java/com/github/drfiveminusmint/brickball/events/listener/PlayerListener.java index 3eb5760..f189ad6 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/events/listener/PlayerListener.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/events/listener/PlayerListener.java @@ -190,6 +190,7 @@ public void onPlayerLogout (PlayerQuitEvent event) { Lobby lobby = Brickball.getInstance().getLobbyList().getLobbyByPlayer(event.getPlayer()); if (lobby != null) lobby.leave(event.getPlayer()); + Brickball.getInstance().endPlayerQueue(event.getPlayer()); } // effects that trigger when a player recieves the brick by any means diff --git a/src/main/java/com/github/drfiveminusmint/brickball/lobby/BrickballFormat.java b/src/main/java/com/github/drfiveminusmint/brickball/lobby/BrickballFormat.java index 01dd690..9a20950 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/lobby/BrickballFormat.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/lobby/BrickballFormat.java @@ -3,7 +3,13 @@ import com.github.drfiveminusmint.brickball.Brickball; import com.github.drfiveminusmint.brickball.arena.ArenaTemplate; import com.github.drfiveminusmint.brickball.match.MatchSettings; +import com.github.drfiveminusmint.fiveUI.util.ItemStackBuilder; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; +import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.inventory.ItemStack; import java.util.ArrayList; import java.util.Collection; @@ -12,11 +18,12 @@ public class BrickballFormat { private final String name; - private final boolean isRated; + private final boolean isRated, doMatchmaking; private final int minPlayersPerTeam, maxPlayersPerTeam; private final MatchSettings settings; private final List validMaps; private final String requiredPermission; + private final ItemStack inactiveDisplayItem, activeDisplayItem; public BrickballFormat(ConfigurationSection section) { this.name = section.getString("name"); @@ -25,6 +32,7 @@ public BrickballFormat(ConfigurationSection section) { this.minPlayersPerTeam = section.getInt("minPlayersPerTeam", 0); this.maxPlayersPerTeam = section.getInt("maxPlayersPerTeam", 99); this.isRated = section.getBoolean("isRated", false); + this.doMatchmaking = section.getBoolean("doMatchmaking", false); // if there is no such section, this will return a clone of the default settings this.settings = new MatchSettings(section.getConfigurationSection("overrideSettings")); // an empty map list indicates all maps are allowed @@ -37,11 +45,27 @@ public BrickballFormat(ConfigurationSection section) { Brickball.getInstance().getLogger().log(Level.WARNING, String.format("Cannot find map '%s' for format '%s'.", s, name)); } this.requiredPermission = section.getString("requiredPermission", ""); + ConfigurationSection itemSection = section.getConfigurationSection("displayItem"); + // Create the 'selected' and 'unselected' items for the lobby creation GUI + // The selected item has an enchantment glow. + ItemStackBuilder builder; + if (itemSection == null) { + builder = new ItemStackBuilder(Material.BRICK, 1); + } else { + builder = new ItemStackBuilder(Material.valueOf(itemSection.getString("type", "BRICK")), itemSection.getInt("quantity", 1)) + .name(Component.text(name, (this.isRated ? NamedTextColor.RED : NamedTextColor.AQUA))) + .addLore(Component.text(itemSection.getString("lore", ""))); + } + this.inactiveDisplayItem = builder.name(Component.text(name, (this.isRated ? NamedTextColor.RED : NamedTextColor.AQUA))).itemStack(); + this.activeDisplayItem = builder.name(Component.text(name, (this.isRated ? NamedTextColor.RED : NamedTextColor.AQUA), TextDecoration.BOLD)) + .setGlimmer(true).itemStack(); } public String getName() { return name; } - public boolean getIsRated() {return isRated;} + public boolean getIsRated() { return isRated; } + + public boolean getDoMatchmaking() { return doMatchmaking; } public int getMinPlayersPerTeam() { return minPlayersPerTeam; } public int getMaxPlayersPerTeam() { return maxPlayersPerTeam; } @@ -54,4 +78,7 @@ public Collection getValidMaps() { } public String getRequiredPermission() { return requiredPermission; } + + public ItemStack getUnselectedDisplayItem() { return inactiveDisplayItem; } + public ItemStack getSelectedDisplayItem() { return activeDisplayItem; } } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/lobby/Lobby.java b/src/main/java/com/github/drfiveminusmint/brickball/lobby/Lobby.java index 4ef2e8d..e3d7ffe 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/lobby/Lobby.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/lobby/Lobby.java @@ -5,6 +5,7 @@ import com.github.drfiveminusmint.brickball.match.BrickballMatch; import com.github.drfiveminusmint.brickball.match.MatchSettings; import com.github.drfiveminusmint.brickball.match.MatchState; +import com.github.drfiveminusmint.brickball.ui.SettingsMenu; import com.github.drfiveminusmint.brickball.util.BrickballColor; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.ForwardingAudience; @@ -14,7 +15,11 @@ import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; -import org.bukkit.scoreboard.*; +import org.bukkit.scoreboard.Criteria; +import org.bukkit.scoreboard.DisplaySlot; +import org.bukkit.scoreboard.Objective; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.Team; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,6 +44,7 @@ public class Lobby implements ForwardingAudience { private boolean isPrivate; private @Nullable BrickballMatch activeMatch; private ArenaTemplate nextMap; + private SettingsMenu settingsMenu; // Constructor // Automatically registers itself with the LobbyManager @@ -70,6 +76,8 @@ public Lobby(BrickballFormat format, boolean isPrivate) { // set initial map nextMap = (ArenaTemplate) format.getValidMaps().toArray() [new Random(System.currentTimeMillis()).nextInt(format.getValidMaps().size())]; + // create settings menu + settingsMenu = new SettingsMenu(this); } @@ -79,6 +87,9 @@ public Lobby(BrickballFormat format, boolean isPrivate) { // Returns false if the player cannot join this lobby public boolean join (Player player, int startingTeamID) { if (isPrivate && !invited.contains(player)) return false; + // Remove them from all queues + if (Brickball.getInstance().endPlayerQueue(player)) + player.sendMessage("You have left the queue."); // kick them to the spectators if their preferred team is full if (lobbyTeams[startingTeamID].getSize() >= format.getMaxPlayersPerTeam() && startingTeamID != lobbyTeams.length-1) { startingTeamID = lobbyTeams.length-1; @@ -93,7 +104,7 @@ public boolean join (Player player, int startingTeamID) { else player.setScoreboard(lobbyScoreboard); sendMessage(Component.text("[Brickball] ").append(player.displayName()).append(Component.text(" joined the lobby."))); - player.sendMessage(Component.text("Current map: ", NamedTextColor.GOLD).append(Component.text(nextMap.getID(), NamedTextColor.AQUA))); + //player.sendMessage(Component.text("Current map: ", NamedTextColor.GOLD).append(Component.text(nextMap.getID(), NamedTextColor.AQUA))); player.sendMessage(Component.text("[Join Team 1]", teamColors[0].textColor).clickEvent(ClickEvent.runCommand("/brickball jointeam 1"))); player.sendMessage(Component.text("[Join Team 2]", teamColors[1].textColor).clickEvent(ClickEvent.runCommand("/brickball jointeam 2"))); player.sendMessage(Component.text("[Ready]", NamedTextColor.AQUA).clickEvent(ClickEvent.runCommand("/brickball ready"))); @@ -229,6 +240,8 @@ public boolean shutdown() { if (activeMatch != null) Brickball.getInstance().getMatchManager().endMatch(activeMatch); Brickball.getInstance().getLobbyList().unregisterLobby(this); + if (settingsMenu != null) + settingsMenu.destroy(); return true; } @@ -307,10 +320,15 @@ public boolean setTeamColor(BrickballColor color, int teamID) { public void setHost(@Nullable Player newHost) { host = newHost;} public Player getHost() { return host;} public BrickballFormat getFormat() { return format; } + public ArenaTemplate getNextMap() { return nextMap; } public @Nullable MatchState getCurrentMatchState() { if (activeMatch == null) return null; return activeMatch.getState(); } + + public SettingsMenu getSettingsMenu() { + return settingsMenu; + } } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/lobby/LobbyList.java b/src/main/java/com/github/drfiveminusmint/brickball/lobby/LobbyList.java index d4fef51..fb9d782 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/lobby/LobbyList.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/lobby/LobbyList.java @@ -2,6 +2,7 @@ import net.kyori.adventure.audience.Audience; import org.bukkit.entity.Player; +import org.jetbrains.annotations.Nullable; import java.util.HashMap; import java.util.HashSet; @@ -11,6 +12,7 @@ public class LobbyList { private final HashMap playerMap = new HashMap<>(); // Gets the lobby the specified player is in + @Nullable public Lobby getLobbyByPlayer(Player player) { return playerMap.get(player); } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/match/BrickballMatch.java b/src/main/java/com/github/drfiveminusmint/brickball/match/BrickballMatch.java index 614f8a7..f47e4e6 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/match/BrickballMatch.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/match/BrickballMatch.java @@ -38,7 +38,11 @@ import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.scoreboard.*; +import org.bukkit.scoreboard.Criteria; +import org.bukkit.scoreboard.DisplaySlot; +import org.bukkit.scoreboard.Objective; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -286,7 +290,7 @@ boolean leaveMatch(Player player) { cleanupPlayer(player); sendMessage(Component.text("[Brickball] ").append(player.displayName()).append(Component.text(" left the match."))); if (players.remove(player)) { - if (host.equals(player)) { + if (host != null && host.equals(player)) { if (!players.isEmpty()) { host = (Player) players.toArray()[0]; host.sendMessage(Component.text("[Brickball] You are now the match host.")); diff --git a/src/main/java/com/github/drfiveminusmint/brickball/match/MatchManager.java b/src/main/java/com/github/drfiveminusmint/brickball/match/MatchManager.java index 53e0200..f67485a 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/match/MatchManager.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/match/MatchManager.java @@ -75,7 +75,7 @@ public BrickballMatch getMatchByPlayer(Player player) { } // restock preloaded arenas unless this was an automated start if (priority >= 0 && Brickball.getInstance().isBackgroundGenerationEnabled()) - Brickball.getInstance().getScheduler().submitTask(new ArenaRestockingTask(matches, Brickball.getInstance().getTemplateManager().templates.keySet())); + Brickball.getInstance().getScheduler().submitTask(new ArenaRestockingTask(matches, Brickball.getInstance().getBackroundGenerateMaps())); return newMatch; } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/match/MatchSettings.java b/src/main/java/com/github/drfiveminusmint/brickball/match/MatchSettings.java index 65a5a02..85ca60e 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/match/MatchSettings.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/match/MatchSettings.java @@ -3,11 +3,9 @@ import com.github.drfiveminusmint.brickball.Brickball; import org.bukkit.NamespacedKey; import org.bukkit.configuration.ConfigurationSection; -import org.checkerframework.checker.units.qual.N; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.naming.Name; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/ArenaRestockingTask.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/ArenaRestockingTask.java index 53f96c1..2c1df29 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/ArenaRestockingTask.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/ArenaRestockingTask.java @@ -1,12 +1,13 @@ package com.github.drfiveminusmint.brickball.scheduling; import com.github.drfiveminusmint.brickball.Brickball; +import com.github.drfiveminusmint.brickball.arena.ArenaTemplate; import com.github.drfiveminusmint.brickball.match.BrickballMatch; import com.github.drfiveminusmint.brickball.match.MatchState; import com.github.drfiveminusmint.brickball.util.Counter; import org.jetbrains.annotations.NotNull; -import java.util.Set; +import java.util.ArrayList; import java.util.concurrent.ConcurrentHashMap; public class ArenaRestockingTask implements PriorityTask { @@ -15,12 +16,12 @@ public class ArenaRestockingTask implements PriorityTask { private BrickballMatch[] matchList; private ConcurrentHashMap templateCounts = new ConcurrentHashMap<>(); - public ArenaRestockingTask(BrickballMatch[] matches, Set templateIDSet) + public ArenaRestockingTask(BrickballMatch[] matches, ArrayList templateIDSet) { matchList = matches; // Initialize counter - for (String template : templateIDSet) - templateCounts.put(template, new Counter()); + for (ArenaTemplate template : templateIDSet) + templateCounts.put(template.getID(), new Counter()); } @Override diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/BrickballTaskManager.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/BrickballTaskManager.java index bb4d904..80ceba7 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/BrickballTaskManager.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/BrickballTaskManager.java @@ -1,9 +1,7 @@ package com.github.drfiveminusmint.brickball.scheduling; -import com.github.drfiveminusmint.brickball.Brickball; -import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; -import java.util.concurrent.ConcurrentLinkedQueue; + import java.util.concurrent.PriorityBlockingQueue; public class BrickballTaskManager extends BukkitRunnable { diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/CopyRegionTask.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/CopyRegionTask.java index aef6b9f..57c25f6 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/CopyRegionTask.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/CopyRegionTask.java @@ -8,7 +8,6 @@ import com.sk89q.worldedit.function.operation.Operations; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.world.World; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/LoadStatsTask.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/LoadStatsTask.java index cca5497..421523e 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/LoadStatsTask.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/LoadStatsTask.java @@ -1,5 +1,7 @@ package com.github.drfiveminusmint.brickball.scheduling; +import com.github.drfiveminusmint.brickball.Brickball; +import com.github.drfiveminusmint.brickball.lobby.BrickballFormat; import com.github.drfiveminusmint.brickball.stats.FormatStats; import org.jetbrains.annotations.NotNull; @@ -9,11 +11,13 @@ public class LoadStatsTask implements IOTask { private final int priority; private final File file; private final FormatStats formatStats; + private final BrickballFormat format; - public LoadStatsTask(int priority, File origin, FormatStats destination) { + public LoadStatsTask(int priority, File origin, FormatStats destination, BrickballFormat format) { this.priority = priority; this.file = origin; this.formatStats = destination; + this.format = format; } @Override @@ -36,5 +40,7 @@ public int compareTo(@NotNull Object o) { @Override public void run() { formatStats.readFromFile(file); + if (Brickball.getInstance().getLeaderboard(format) != null) + Brickball.getInstance().getLeaderboard(format).update(); } } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/PriorityTask.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/PriorityTask.java index 37faf94..b5bf9cd 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/PriorityTask.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/PriorityTask.java @@ -1,6 +1,6 @@ package com.github.drfiveminusmint.brickball.scheduling; public interface PriorityTask extends Runnable, Comparable { - public int getPriority(); - public int getCount(); + int getPriority(); + int getCount(); } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/RegionCleanupTask.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/RegionCleanupTask.java index 5caef69..8e5235b 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/RegionCleanupTask.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/RegionCleanupTask.java @@ -4,15 +4,10 @@ import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; -import com.sk89q.worldedit.function.operation.Operation; -import com.sk89q.worldedit.function.operation.Operations; -import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.session.ClipboardHolder; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.block.BlockTypes; -import com.sk89q.worldguard.protection.util.WorldEditRegionConverter; import org.jetbrains.annotations.NotNull; import java.util.logging.Level; diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/SchematicsPasteTask.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/SchematicsPasteTask.java index 6478bb9..57f895d 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/SchematicsPasteTask.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/SchematicsPasteTask.java @@ -1,7 +1,6 @@ package com.github.drfiveminusmint.brickball.scheduling; import com.github.drfiveminusmint.brickball.match.BrickballMatch; -import com.github.drfiveminusmint.brickball.match.MatchState; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEditException; @@ -13,7 +12,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.awt.datatransfer.Clipboard; import java.util.List; public class SchematicsPasteTask implements SyncTask { diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/MatchCandidate.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/MatchCandidate.java new file mode 100644 index 0000000..c44c34c --- /dev/null +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/MatchCandidate.java @@ -0,0 +1,36 @@ +package com.github.drfiveminusmint.brickball.scheduling.matchmaking; + +import java.util.HashSet; + +public class MatchCandidate implements Cloneable { + private int highRating = -1, lowRating = Integer.MAX_VALUE; + private HashSet players = new HashSet<>(); + + public void addPlayer(QueueingPlayer player) { + if (player.getRating() > highRating) + highRating = player.getRating(); + if (player.getRating() < lowRating) + lowRating = player.getRating(); + players.add(player); + } + + public int getHighRating() { + return highRating; + } + + public int getLowRating() { + return lowRating; + } + + public HashSet getPlayers() { + return players; + } + + public MatchCandidate clone() { + MatchCandidate result = new MatchCandidate(); + result.lowRating = lowRating; result.highRating = highRating; + result.players = new HashSet<>(); + result.players.addAll(players); + return result; + } +} diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/Matchmaker.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/Matchmaker.java new file mode 100644 index 0000000..3df305a --- /dev/null +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/Matchmaker.java @@ -0,0 +1,216 @@ +package com.github.drfiveminusmint.brickball.scheduling.matchmaking; + +import com.github.drfiveminusmint.brickball.Brickball; +import com.github.drfiveminusmint.brickball.lobby.BrickballFormat; +import com.github.drfiveminusmint.brickball.lobby.Lobby; +import com.github.drfiveminusmint.brickball.stats.FormatStats; +import net.kyori.adventure.key.Key; +import net.kyori.adventure.sound.Sound; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.title.Title; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitRunnable; + +import java.util.Collection; +import java.util.HashSet; +import java.util.concurrent.PriorityBlockingQueue; +import java.util.logging.Level; + +public class Matchmaker extends BukkitRunnable { + private static final double HEURISTIC_TIME_COEFFICIENT = 5.0, HEURISTIC_TIME_POWER = 0.25; + private static final int HEURISTIC_MAX_TIME_BONUS = 100, HEURISTIC_UNFILLED_BONUS = 100; + private static final int MINIMUM_SCORE = 300; + + private final PriorityBlockingQueue queue = new PriorityBlockingQueue<>(); + private final BrickballFormat format; + + public Matchmaker(BrickballFormat format) { + this.format = format; + } + + @Override + public void run() { + // notify players who are in the queue (synchronously) + final int size = queue.size(); + for (QueueingPlayer player : queue) { + Bukkit.getScheduler().runTask(Brickball.getInstance(), () -> player.getPlayer().sendActionBar(Component.text("Players in queue: ") + .append(Component.text(size, (size > format.getMinPlayersPerTeam()*2) ? NamedTextColor.GREEN : NamedTextColor.YELLOW)) + .append(Component.text(" Queue time: ", NamedTextColor.WHITE)) + .append(Component.text(String.format("%02d:%02d", ((System.currentTimeMillis() - player.getJoinTime()) / 60000) % 60, ((System.currentTimeMillis() - player.getJoinTime()) / 1000) % 60), NamedTextColor.AQUA)))); + } + // don't bother if there aren't enough players to create a match + if (size < format.getMinPlayersPerTeam() * 2 || queue.isEmpty()) + return; + // Brickball.getInstance().getLogger().log(Level.INFO, "Attempting to matchmake for format " + format.getName()); + // Prioritize finding a match for the player who's been queueing the longest + // If absolutely no matches can be found for them, proceed to the next player in the queue. + HashSet removed = new HashSet<>(size/2 + 1); + while (!queue.isEmpty()) { + HashSet candidates = new HashSet<>(); + MatchCandidate firstCandidate = new MatchCandidate(); + QueueingPlayer firstPlayer = queue.poll(); + // store the players we've set aside + removed.add(firstPlayer); + firstCandidate.addPlayer(firstPlayer); + // add the base of our tree + candidates.add(firstCandidate); + + // build out the tree by adding players to existing candidates + HashSet processed = new HashSet<>(queue.size()); + while (!queue.isEmpty()) { + QueueingPlayer player = queue.poll(); + processed.add(player); + HashSet newCandidates = new HashSet<>(); + for (MatchCandidate candidate : candidates) + if (evaluateAddition(candidate, player) > 0) { + MatchCandidate clone = candidate.clone(); + clone.addPlayer(player); + newCandidates.add(clone); + } + candidates.addAll(newCandidates); + } + // We now have a set of candidates to create teams from + // For each candidate that has the right number of players, create the teams and score them + // Find the best scoring match + PreliminaryTeams teams = null; + int teamsScore = MINIMUM_SCORE; + for (MatchCandidate candidate : candidates) { + //Brickball.getInstance().getLogger().log(Level.INFO, "Match candidate found! " + players2String(candidate.getPlayers())); + if (candidate.getPlayers().size() >= 2 * format.getMinPlayersPerTeam()) { + PreliminaryTeams replacement = new PreliminaryTeams(candidate, format); + int score = scoreTeams(replacement); + //Brickball.getInstance().getLogger().log(Level.INFO, "Built teams: " + players2String(replacement.getTeam1())+ players2String(replacement.getTeam2())); + //Brickball.getInstance().getLogger().log(Level.INFO, "Teams scored " + score); + if (score > teamsScore) { + //Brickball.getInstance().getLogger().log(Level.INFO, "New high score!"); + teamsScore = score; + teams = replacement; + } + } + } + if (teams != null) { + // restore the queue + queue.addAll(processed); + queue.addAll(removed); + // prevent a race condition here by running this synchronously + final PreliminaryTeams finalTeams = teams; + Bukkit.getScheduler().runTask(Brickball.getInstance(), () -> { + // run sanity check + boolean sanityCheck = true; + for (QueueingPlayer player : finalTeams.getTeam1()) + if (Brickball.getInstance().getLobbyList().getLobbyByPlayer(player.getPlayer()) != null) { + // this player is already in a lobby + queue.remove(player); + sanityCheck = false; + } + for(QueueingPlayer player : finalTeams.getTeam2()) + if (Brickball.getInstance().getLobbyList().getLobbyByPlayer(player.getPlayer()) != null) { + // this player is already in a lobby + queue.remove(player); + sanityCheck = false; + } + // if any players are already in a lobby, reject this match + if (!sanityCheck) return; + // Match accepted, remove all players from all queues + for (QueueingPlayer player : finalTeams.getTeam1()) + Brickball.getInstance().endPlayerQueue(player.getPlayer()); + for (QueueingPlayer player : finalTeams.getTeam2()) + Brickball.getInstance().endPlayerQueue(player.getPlayer()); + // create the lobby and place players within + Lobby lobby = new Lobby(format, false); + for (QueueingPlayer player : finalTeams.getTeam1()) { + lobby.join(player.getPlayer(), 0); + player.getPlayer().playSound(Sound.sound(Key.key("ui.toast.challenge_complete"), Sound.Source.PLAYER, 1.0f, 1.0f)); + player.getPlayer().showTitle(Title.title(Component.text("Match Found!", NamedTextColor.GOLD), + Component.text("To ready use ", NamedTextColor.GOLD).append(Component.text("/brickball ready", NamedTextColor.AQUA)))); + } + for (QueueingPlayer player : finalTeams.getTeam2()) { + lobby.join(player.getPlayer(), 1); + player.getPlayer().playSound(Sound.sound(Key.key("ui.toast.challenge_complete"), Sound.Source.PLAYER, 1.0f, 1.0f)); + player.getPlayer().showTitle(Title.title(Component.text("Match Found!", NamedTextColor.GOLD), + Component.text("To ready use ", NamedTextColor.GRAY).append(Component.text("/brickball ready", NamedTextColor.AQUA)))); + } + }); + return; + } + // return processed players to the queue and start again + queue.addAll(processed); + } + // We've failed to find any matches, add all players to the queue and try again next cycle. + queue.addAll(removed); + } + + public void addPlayer(Player player) { + int rating = Brickball.getInstance().getFormatStats(format).getPlayerStat(player, FormatStats.TrackedStat.RATING); + if (rating <= 0) + rating = 1000; + queue.add(new QueueingPlayer(player, System.currentTimeMillis(), rating)); + } + + public boolean hasPlayer (Player player) { + for (QueueingPlayer other : queue) { + if (other.getPlayer() == player) + return true; + } + return false; + } + + public boolean removePlayer (Player player) { + for (QueueingPlayer other : queue) { + if (other.getPlayer() == player) { + return queue.remove(other); + } + } + return false; + } + + private int evaluateAddition(MatchCandidate candidate, QueueingPlayer player) { + int size = candidate.getPlayers().size(); + if (size >= format.getMaxPlayersPerTeam() * 2) + return -1; // never allow this + // Score whether this addition is likely to make the match better or worse + long time = System.currentTimeMillis(); + int ratingDifferencePenalty = Math.min( Math.min(candidate.getHighRating() - player.getRating(), 0), + Math.min(player.getRating() - candidate.getLowRating(), 0)); + int queueTimeBonus = Math.max((int) (HEURISTIC_TIME_COEFFICIENT * Math.pow(time - player.getJoinTime(), HEURISTIC_TIME_POWER)), HEURISTIC_MAX_TIME_BONUS); + int unfilledBonus = (size < format.getMinPlayersPerTeam()*2) ? HEURISTIC_UNFILLED_BONUS : 0; + return ratingDifferencePenalty + queueTimeBonus + unfilledBonus; + } + + private int scoreTeams(PreliminaryTeams teams) { + // Get data + int totalPlayers = teams.getTeam1().size() + teams.getTeam2().size(); + int sumRatingSquared = 0; + long totalWait = 0; + long time = System.currentTimeMillis(); + for (QueueingPlayer player : teams.getTeam1()) { + sumRatingSquared += (int) (Math.pow(player.getRating(), 2) + 1); + totalWait += time - player.getJoinTime(); + } + for (QueueingPlayer player : teams.getTeam2()) { + sumRatingSquared += (int) (Math.pow(player.getRating(), 2) + 1); + totalWait += time - player.getJoinTime(); + } + float meanRating = (teams.getTeam1Rating() + teams.getTeam2Rating()+ 0f) / totalPlayers; + double mqs = 10000f / + (Math.sqrt(sumRatingSquared - totalPlayers * Math.pow(meanRating,2)) + + Math.pow(Math.abs(teams.getTeam1Rating() - teams.getTeam2Rating()), 1.2) + + 100); + int finalScore = (int) (mqs * Math.pow((1.0d * totalWait) / totalPlayers, 0.25)); + if (teams.getTeam1().size() != teams.getTeam2().size()) + finalScore -= 100; // Penalty for different sized teams + return finalScore; + } + + private String players2String(Collection players) { + StringBuilder builder = new StringBuilder("["); + for (QueueingPlayer player : players) { + builder.append(player.getPlayer().getName()); + builder.append(" "); + } + builder.append("]"); + return builder.toString(); + } +} diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/PreliminaryTeams.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/PreliminaryTeams.java new file mode 100644 index 0000000..12693f5 --- /dev/null +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/PreliminaryTeams.java @@ -0,0 +1,60 @@ +package com.github.drfiveminusmint.brickball.scheduling.matchmaking; + +import com.github.drfiveminusmint.brickball.lobby.BrickballFormat; +import org.bukkit.entity.Player; + +import java.util.HashSet; +import java.util.LinkedList; + +public class PreliminaryTeams { + private LinkedList team1 = new LinkedList<>(), team2 = new LinkedList<>(); + private int team1Rating = 0, team2Rating = 0; + + public PreliminaryTeams(MatchCandidate candidate, BrickballFormat format) { + + HashSet playerSet = (HashSet) candidate.getPlayers().clone(); + while (!playerSet.isEmpty()) { + QueueingPlayer strongest = strongest(playerSet); + playerSet.remove(strongest); + if (team2.size() < (candidate.getPlayers().size()+1)/2) { + if (team1Rating <= team2Rating) { + team1.add(strongest); + team1Rating += strongest.getRating(); + } else { + team2.add(strongest); + team2Rating += strongest.getRating(); + } + } else { + team1.add(strongest); + team1Rating += strongest.getRating(); + } + } + } + + public LinkedList getTeam1() { + return team1; + } + + public LinkedList getTeam2() { + return team2; + } + + public int getTeam1Rating() { + return team1Rating; + } + + public int getTeam2Rating() { + return team2Rating; + } + + private QueueingPlayer strongest(HashSet players) { + int maxRating = -1; + QueueingPlayer result = null; + for (QueueingPlayer player : players) + if (player.getRating() > maxRating) { + maxRating = player.getRating(); + result = player; + } + return result; + } +} diff --git a/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/QueueingPlayer.java b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/QueueingPlayer.java new file mode 100644 index 0000000..1ee7c54 --- /dev/null +++ b/src/main/java/com/github/drfiveminusmint/brickball/scheduling/matchmaking/QueueingPlayer.java @@ -0,0 +1,33 @@ +package com.github.drfiveminusmint.brickball.scheduling.matchmaking; + +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +public class QueueingPlayer implements Comparable { + private final Player player; + private final long joinTime; + private final int rating; + public QueueingPlayer(Player player, long joinTime, int rating) { + this.player = player; + this.joinTime = joinTime; + this.rating = rating; + } + + public Player getPlayer() { + return player; + } + + public long getJoinTime() { + return joinTime; + } + + public int getRating() { + return rating; + } + + @Override + public int compareTo(@NotNull QueueingPlayer queueingPlayer) { + // if this fails we have bigger problems + return (int) (queueingPlayer.joinTime - joinTime); + } +} diff --git a/src/main/java/com/github/drfiveminusmint/brickball/stats/FormatStats.java b/src/main/java/com/github/drfiveminusmint/brickball/stats/FormatStats.java index 8b8a7d2..4e8e188 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/stats/FormatStats.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/stats/FormatStats.java @@ -11,10 +11,13 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import java.io.*; -import java.util.Collection; -import java.util.HashMap; -import java.util.UUID; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -254,6 +257,13 @@ public synchronized void writeToFile(File f) { } } + public Set getPlayers() { + HashSet players = new HashSet<>(); + for (UUID uuid : perPlayerStats.keySet()) + players.add(Bukkit.getOfflinePlayer(uuid)); + return players; + } + public enum TrackedStat { RATING, WINS, LOSSES, DRAWS, ROUND_WINS, ROUND_LOSSES, POINTS, KILLS, DEATHS } diff --git a/src/main/java/com/github/drfiveminusmint/brickball/stats/Leaderboard.java b/src/main/java/com/github/drfiveminusmint/brickball/stats/Leaderboard.java new file mode 100644 index 0000000..41d9e79 --- /dev/null +++ b/src/main/java/com/github/drfiveminusmint/brickball/stats/Leaderboard.java @@ -0,0 +1,81 @@ +package com.github.drfiveminusmint.brickball.stats; + +import com.github.drfiveminusmint.brickball.Brickball; +import com.github.drfiveminusmint.brickball.lobby.BrickballFormat; +import com.github.drfiveminusmint.fiveUI.container.Page; +import com.github.drfiveminusmint.fiveUI.element.DynamicButton; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.OfflinePlayer; +import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.event.inventory.InventoryType; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.SkullMeta; + +import java.util.LinkedList; +import java.util.List; + +public class Leaderboard { + private static final int MAX_SIZE = 27; + private final OfflinePlayer[] top = new OfflinePlayer[MAX_SIZE]; + private final Page displayPage; + private final BrickballFormat brickballFormat; + + public Leaderboard(BrickballFormat format) { + brickballFormat = format; + displayPage = new Page(Component.text("Leaderboard for " + format.getName(), + NamedTextColor.GOLD, + TextDecoration.BOLD), InventoryType.CHEST); + for (int i = 0; i < MAX_SIZE; i++) { + final int index = i; + DynamicButton button = new DynamicButton(() -> { + if (top[index] == null) + return null; + ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1); + SkullMeta headMeta = (SkullMeta) head.getItemMeta(); + headMeta.setOwningPlayer(top[index]); + headMeta.displayName(Component.text( + String.format("#%d: %s (%d)", index+1, top[index].getName(), + Brickball.getInstance().getFormatStats(format).getPlayerStat(top[index], FormatStats.TrackedStat.RATING)), + NamedTextColor.YELLOW, TextDecoration.BOLD)); + headMeta.lore(List.of(Component.text("Click to see full stats"))); + head.setItemMeta(headMeta); + return head; + }); + button.setOnClick(((player, clickableElement, clickType) -> { + Brickball.getInstance().getFormatStats(format).displayStats(player, top[index]); + player.closeInventory(InventoryCloseEvent.Reason.PLUGIN); + })); + displayPage.setElement(i, button); + } + } + + public Page getDisplayPage() { + return displayPage; + } + + // Updates the leaderboard + // Expensive, so only run this after a game, and try to run it asynchronously + public void update() { + LinkedList list = new LinkedList<>(); + for (OfflinePlayer player : Brickball.getInstance().getFormatStats(brickballFormat).getPlayers()) { + int pRating = Brickball.getInstance().getFormatStats(brickballFormat).getPlayerStat(player, FormatStats.TrackedStat.RATING); + for(int i = 0; i < MAX_SIZE; i++) { + if (list.size() <= i || Brickball.getInstance().getFormatStats(brickballFormat) + .getPlayerStat(list.get(i), FormatStats.TrackedStat.RATING) < pRating) { + list.add(i, player); // insert player here in the list and shift all others right + break; + } + } + // copy to our top players + // asynchronously modifying top[] probably doesn't matter here, because we're updating it next tick anyway + for(int i = 0; i < MAX_SIZE && i < list.size(); i++) + top[i] = list.get(i); + } + // This has to be run in the main thread + Bukkit.getScheduler().runTask(Brickball.getInstance(), displayPage::updateContents); + } +} diff --git a/src/main/java/com/github/drfiveminusmint/brickball/ui/LobbyCreationMenu.java b/src/main/java/com/github/drfiveminusmint/brickball/ui/LobbyCreationMenu.java new file mode 100644 index 0000000..2eec979 --- /dev/null +++ b/src/main/java/com/github/drfiveminusmint/brickball/ui/LobbyCreationMenu.java @@ -0,0 +1,89 @@ +package com.github.drfiveminusmint.brickball.ui; + +import com.github.drfiveminusmint.brickball.Brickball; +import com.github.drfiveminusmint.brickball.lobby.BrickballFormat; +import com.github.drfiveminusmint.brickball.lobby.Lobby; +import com.github.drfiveminusmint.fiveUI.FiveUI; +import com.github.drfiveminusmint.fiveUI.container.Page; +import com.github.drfiveminusmint.fiveUI.element.RadioButton; +import com.github.drfiveminusmint.fiveUI.element.SelectorButton; +import com.github.drfiveminusmint.fiveUI.element.StaticButton; +import com.github.drfiveminusmint.fiveUI.util.ItemStackBuilder; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.event.ClickEvent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.InventoryType; + +public class LobbyCreationMenu { + Player host; + BrickballFormat format; + boolean isPrivate; + + public LobbyCreationMenu(Player creator) { + host = creator; + // Create main page + Page mainPage = new Page(Component.text("Create Custom Match"), InventoryType.CHEST); + mainPage.setOnClose((player, container) -> FiveUI.getInstance().getUIManager().unregisterInterface(container)); + // Add buttons for all formats to the page + int formatsFound = 0; + for (BrickballFormat candidate : Brickball.getInstance().getFormats()) { + if (candidate.getRequiredPermission().equalsIgnoreCase("") + || host.hasPermission(candidate.getRequiredPermission())) { + RadioButton button = new RadioButton(candidate.getUnselectedDisplayItem(), candidate.getSelectedDisplayItem()); + button.setOnClick(((player, clickableElement, clickType) -> format = candidate)); + if (formatsFound != 0) + button.link((RadioButton) mainPage.getElement(formatsFound-1)); + mainPage.setElement(formatsFound++, button); + + } + } + // Privacy button + SelectorButton privateButton = new SelectorButton(new org.bukkit.inventory.ItemStack[] { + new ItemStackBuilder(Material.ENDER_EYE, 1) + .name(Component.text("Public Lobby", NamedTextColor.YELLOW, TextDecoration.BOLD)) + .addLore(Component.text("Other players will be able to see and join this lobby.")) + .itemStack(), + new ItemStackBuilder(Material.ENDER_PEARL, 1) + .name(Component.text("Private Lobby", NamedTextColor.YELLOW, TextDecoration.BOLD)) + .addLore(Component.text("Other players will not be able to join this lobby. Use /brickball invite.")) + .itemStack() + }); + privateButton.setOnEntry(((player, o) -> isPrivate = ((Integer) o) == 1)); + mainPage.setElement(18, privateButton); + + // Creation button + StaticButton createButton = new StaticButton(new ItemStackBuilder(Material.GREEN_CONCRETE, 1) + .name(Component.text("Create Match!", NamedTextColor.GREEN, TextDecoration.BOLD)) + .itemStack()); + createButton.setOnClick(((player, clickableElement, clickType) -> { + if (format == null) + return; + build(); + host.closeInventory(); + })); + mainPage.setElement(26, createButton); + + // Display + mainPage.display(host); + } + + public void build() { + Lobby newLobby = new Lobby(format, isPrivate); + if (!isPrivate) + Bukkit.getServer().broadcast(Component.text("[Brickball] ", NamedTextColor.GOLD) + .append(host.displayName()) + .append(Component.text(" has created a ", NamedTextColor.GOLD)) + .append(Component.text(format.getName(), NamedTextColor.YELLOW)).append(Component.text(" lobby. ", NamedTextColor.GOLD)) + .append(Component.text("Click to join!", NamedTextColor.AQUA)).clickEvent(ClickEvent.runCommand("/brickball join " + host.getName()))); + newLobby.invite(host, null); + newLobby.join(host, 2); // start as spectator + newLobby.setHost(host); + host.sendMessage(Component.text("[Start Match]", NamedTextColor.AQUA).clickEvent(ClickEvent.runCommand("/brickball start"))); + + + } +} diff --git a/src/main/java/com/github/drfiveminusmint/brickball/ui/SettingsMenu.java b/src/main/java/com/github/drfiveminusmint/brickball/ui/SettingsMenu.java new file mode 100644 index 0000000..f0c9d98 --- /dev/null +++ b/src/main/java/com/github/drfiveminusmint/brickball/ui/SettingsMenu.java @@ -0,0 +1,147 @@ +package com.github.drfiveminusmint.brickball.ui; + +import com.github.drfiveminusmint.brickball.Brickball; +import com.github.drfiveminusmint.brickball.arena.ArenaTemplate; +import com.github.drfiveminusmint.brickball.lobby.Lobby; +import com.github.drfiveminusmint.brickball.match.MatchSettings; +import com.github.drfiveminusmint.fiveUI.FiveUI; +import com.github.drfiveminusmint.fiveUI.container.Page; +import com.github.drfiveminusmint.fiveUI.container.TextInput; +import com.github.drfiveminusmint.fiveUI.element.*; +import com.github.drfiveminusmint.fiveUI.util.ItemStackBuilder; +import net.kyori.adventure.key.Key; +import net.kyori.adventure.sound.Sound; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.ClickType; +import org.bukkit.event.inventory.InventoryType; +import org.bukkit.inventory.ItemStack; + +public class SettingsMenu { + private final Lobby lobby; + private final Page mainPage, mapSelectionPage; + public SettingsMenu(Lobby linkedLobby) { + lobby = linkedLobby; + // Create GUI + mainPage = new Page(Component.text("Match Settings", NamedTextColor.DARK_GRAY, TextDecoration.BOLD), InventoryType.CHEST); + // Create toggle buttons for the boolean match settings + mainPage.setElement(0, createToggleButton(MatchSettings.Setting.BRICK_FUMBLING, "Brick Fumbling", Material.NETHER_BRICK, Material.BRICK)); + mainPage.setElement(1, createToggleButton(MatchSettings.Setting.DEATH_TURNOVERS, "Death Turnovers", Material.CHEST, Material.ENDER_CHEST)); + mainPage.setElement(2, createToggleButton(MatchSettings.Setting.NATURAL_REGENERATION, "Natural Regeneration", Material.GOLDEN_APPLE, Material.GLASS_BOTTLE)); + mainPage.setElement(3, createToggleButton(MatchSettings.Setting.RESPAWNING, "Respawning", Material.TOTEM_OF_UNDYING, Material.SKELETON_SKULL)); + // Create number prompt buttons for the integer match settings + mainPage.setElement(18, createNumberPromptButton(MatchSettings.Setting.ARROWS, mainPage, "Arrows", Material.ARROW, 1)); + mainPage.setElement(19, createNumberPromptButton(MatchSettings.Setting.STEAKS, mainPage, "Steaks", Material.COOKED_BEEF, 1)); + mainPage.setElement(20, createNumberPromptButton(MatchSettings.Setting.RESPAWN_DELAY, mainPage, "Respawn Delay (Seconds)", Material.SPAWNER, 20)); + mainPage.setElement(21, createNumberPromptButton(MatchSettings.Setting.SHOT_CLOCK, mainPage, "Shot Clock (Seconds)", Material.TNT, 1)); + mainPage.setElement(22, createNumberPromptButton(MatchSettings.Setting.TIMER, mainPage, "Match Time (Minutes)", Material.CLOCK, 60)); + mainPage.setElement(23, createNumberPromptButton(MatchSettings.Setting.POINTS_TO_WIN, mainPage, "Points to win", Material.GREEN_STAINED_GLASS, 1)); + + // Create map selection page + mapSelectionPage = new Page(Component.text("Select Map", NamedTextColor.DARK_GRAY, TextDecoration.BOLD), InventoryType.CHEST); + int mapsFound = 0; + for (ArenaTemplate map : lobby.getFormat().getValidMaps()) { + // possible TODO: map-specific button icons? + RadioButton button = new RadioButton( + new ItemStackBuilder(Material.NETHER_BRICK, 1) + .name(Component.text(map.getID(), NamedTextColor.GRAY)) + .itemStack(), + new ItemStackBuilder(Material.BRICK, 1) + .name(Component.text(map.getID(), NamedTextColor.YELLOW, TextDecoration.BOLD)) + .itemStack() + ); + // Link all maps after the first with the first button + if (mapsFound != 0) + button.link((RadioButton) mapSelectionPage.getElement(0)); + // Initialize the button corresponding to the current map as clicked + if (map.equals(lobby.getNextMap())) + button.setClicked(); + // When this button is clicked, set the next map to the corresponding ArenaTemplate + button.setOnClick(((player, clickableElement, clickType) -> lobby.setMap(map))); + mapSelectionPage.setElement(mapsFound++, button); + // Prevent overflow + if (mapsFound >= mapSelectionPage.getInventory().getSize()) + break; + } + // return to main page on closing + mapSelectionPage.setOnClose(((player, container) -> Bukkit.getScheduler().runTaskLater(Brickball.getInstance(), () -> mainPage.display(player), 1))); + + // Link main page to map selection page + mainPage.setElement(8, new LinkButton( + new ItemStackBuilder(Material.GRASS_BLOCK, 1) + .name(Component.text("Select next map...", NamedTextColor.AQUA, TextDecoration.ITALIC)) + .itemStack(), + mapSelectionPage + )); + } + + public void destroy() { + FiveUI.getInstance().getUIManager().unregisterInterface(mainPage); + } + + public void open(Player player) { + mainPage.display(player); + } + + private SelectorButton createToggleButton(NamespacedKey key, String humanName, Material trueMaterial, Material falseMaterial) { + SelectorButton result = new SelectorButton(new ItemStack[] { + new ItemStackBuilder(falseMaterial, 1) + .name(Component.text(humanName, NamedTextColor.GRAY)) + .addLore(Component.text("Disabled")) + .itemStack(), + new ItemStackBuilder(trueMaterial, 1) + .name(Component.text(humanName, NamedTextColor.AQUA, TextDecoration.BOLD)) + .addLore(Component.text("Enabled")) + .itemStack() + }); + if ((Boolean) lobby.getMatchSetting(key)) + result.setState(1); + result.setOnEntry(((player, o) -> lobby.setMatchSetting(key, (Integer) o == 1))); + return result; + } + + private DynamicButton createNumberPromptButton(NamespacedKey key, Page mainPage, String humanName, Material material, int displayDivisor) { + DynamicButton result = new DynamicButton(() -> { + int displayQuantity = (int) lobby.getMatchSetting(key) / displayDivisor; + if (displayQuantity < 1 || displayQuantity > 64) + displayQuantity = 1; + return new ItemStackBuilder(material, displayQuantity) + .name(Component.text(humanName, NamedTextColor.YELLOW)) + .addLore(Component.text("Click to edit")) + .itemStack(); + }); + result.setOnClick(((player, clickableElement, clickType) -> { + TextInput numberInput = new TextInput(Component.text(humanName, NamedTextColor.YELLOW, TextDecoration.BOLD), player); + numberInput.setOnClose((player1, container) -> { + // destroy the interface to prevent resource leak + FiveUI.getInstance().getUIManager().unregisterInterface(numberInput); + // return to main page + Bukkit.getScheduler().runTaskLater(Brickball.getInstance(), () -> mainPage.display(player), 1); + }); + numberInput.setElement(0, new StaticDisplay( + new ItemStackBuilder(material, 1) + .name(Component.text("0")) + .itemStack())); + // set the match setting to the number the user entered + // fractional values are supported in the input but are floored + numberInput.setOnEntry((player1, o) -> { + if (o == null) { + return; + } try { + double raw = Double.parseDouble((String) o); + lobby.setMatchSetting(key, (int) (raw * displayDivisor)); + mainPage.updateContents(); + player1.closeInventory(); + // There's no easy way to tell the player that they entered the number incorrectly here, unfortunately + } catch (NumberFormatException exception) { player.playSound(Sound.sound(Key.key("entity.blaze.death"), Sound.Source.BLOCK, 1f, 1f)); } + }); + numberInput.display(player); + })); + return result; + } +} diff --git a/src/main/java/com/github/drfiveminusmint/brickball/util/WGUtils.java b/src/main/java/com/github/drfiveminusmint/brickball/util/WGUtils.java index 6eb3d6c..3cd9ff9 100644 --- a/src/main/java/com/github/drfiveminusmint/brickball/util/WGUtils.java +++ b/src/main/java/com/github/drfiveminusmint/brickball/util/WGUtils.java @@ -1,7 +1,5 @@ package com.github.drfiveminusmint.brickball.util; -import com.github.drfiveminusmint.brickball.Brickball; -import com.github.drfiveminusmint.brickball.match.MatchState; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; @@ -15,13 +13,10 @@ import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import com.sk89q.worldguard.protection.regions.RegionType; -import org.checkerframework.checker.units.qual.C; import java.util.ArrayList; import java.util.List; import java.util.Set; -import java.util.logging.Level; public class WGUtils { public static final Set GLASS_ALL = Set.of(BlockTypes.BLACK_STAINED_GLASS.getDefaultState().toBaseBlock(),BlockTypes.WHITE_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.GRAY_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.RED_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.BLUE_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.YELLOW_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.GREEN_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.ORANGE_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.PURPLE_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.CYAN_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.MAGENTA_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.LIME_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.LIGHT_BLUE_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.PINK_STAINED_GLASS.getDefaultState().toBaseBlock(), BlockTypes.BROWN_STAINED_GLASS.getDefaultState().toBaseBlock()); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 024c31d..47d027e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -4,8 +4,8 @@ maxMatches: 16 arenaMaxSize: 240 # The default world to set up Brickball matches in. Don't set this to any world you care about. world: brickball -# Set to true to load in an arena from each template on server startup -preloadArenas: false +# List of maps to always keep a copy of loaded +backgroundGenerateMaps: [] # Default match settings defaultSettings: diff --git a/src/main/resources/formats/custom.yml b/src/main/resources/formats/custom.yml index c5aff6c..715cedf 100644 --- a/src/main/resources/formats/custom.yml +++ b/src/main/resources/formats/custom.yml @@ -5,6 +5,8 @@ minPlayersPerTeam: 0 maxPlayersPerTeam: 99 # Whether the format is rated isRated: false +# Whether this format supports matchmaking +doMatchmaking: false # Permitted maps, leave empty to allow all maps maps: # Override default match settings. Not all settings need to be defined here. @@ -12,4 +14,9 @@ overrideSettings: respawning: true # Permission required to create a lobby with this format requiredPermission: "brickball.create.custom" +# Item to display in the GUI to represent this format +displayItem: + type: brick + quantity: 1 + lore: "A custom game" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index a2fe263..1e63edb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,8 @@ name: Brickball -version: 2.1-Alpha +version: Alpha-3.0 main: com.github.drfiveminusmint.brickball.Brickball author: drfiveminusminus -depend: [WorldEdit, WorldGuard] +depend: [WorldEdit, WorldGuard, FiveUI] softdepend: [Multiverse-Core] api-version: '1.21' commands: