Merge pull request #12 from Epicjii/dev

1.19.1 and Gui upgrade

README.md

@@ -1,13 +1,5 @@
 # Manhunt_Plugin
 
-This Plugin is for Paper 1.17.1 and 1.18.1
+This Plugin is for Paper 1.17.1 - 1.19
 
-Here is a good guide to installing this plugin: https://pingperfect.com/index.php/knowledgebase/829/Minecraft--PaperMC--How-to-install-plugins.html
-
-First run /hunters [list of hunters] to set the hunters for the game.
-
-Make sure when running the command that only one person runs the command.
-
-Run /target [target] to set the huntee and begins the game
-
-To end the hunt run /endhunt. The command should remove the compasses.
+Here is a good guide to installing this plugin: https://pingperfect.com/index.php/knowledgebase/829/Minecraft--PaperMC--How-to-install-plugins.html

build.gradle

@@ -1,17 +1,15 @@
-
-
 plugins {
     id 'java'
     id("xyz.jpenilla.run-paper") version("1.0.6")
 }
 tasks {
     runServer {
-        minecraftVersion("1.18.1")
+        minecraftVersion("1.19.1")
     }
 }
 
 group = 'plugin.manhunt'
-version = '2.0.6'
+version = '3.0.0'
 
 sourceCompatibility = '17'
 targetCompatibility = '17'
@@ -29,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT'
 }
 
 /*processResources {

src/main/java/plugin/manhunt/manhunt_plugin/ManhuntPlugin.java

@@ -1,14 +1,18 @@
 package plugin.manhunt.manhunt_plugin;
 
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
-import plugin.manhunt.manhunt_plugin.commands.Endgame;
-import plugin.manhunt.manhunt_plugin.commands.Hunters;
-import plugin.manhunt.manhunt_plugin.commands.ListGames;
-import plugin.manhunt.manhunt_plugin.commands.Target;
+import plugin.manhunt.manhunt_plugin.commands.CreateGame;
+import plugin.manhunt.manhunt_plugin.commands.EndGame;
+import plugin.manhunt.manhunt_plugin.commands.JoinGame;
+import plugin.manhunt.manhunt_plugin.game.GameData;
+import plugin.manhunt.manhunt_plugin.gui.JoinGui;
+import plugin.manhunt.manhunt_plugin.gui.TargetGui;
 
 public final class ManhuntPlugin extends JavaPlugin {
 
     public static ManhuntPlugin instance;
+    public static GameData gameData = new GameData();
 
     public static ManhuntPlugin getInstance() {
         return instance;
@@ -18,15 +22,19 @@ public static ManhuntPlugin getInstance() {
     public void onEnable() {
         // Plugin startup logic
         instance = this;
-        getCommand("hunters").setExecutor(new Hunters());
-        getCommand("target").setExecutor(new Target());
-        getCommand("endgame").setExecutor(new Endgame());
-        getCommand("listgames").setExecutor(new ListGames());
+
+        getServer().getPluginManager().registerEvents(new TargetGui(), this);
+        getServer().getPluginManager().registerEvents(new JoinGui(), this);
+
+        getCommand("endgame").setExecutor(new EndGame());
+        getCommand("newgame").setExecutor(new CreateGame());
+        getCommand("joingame").setExecutor(new JoinGame());
     }
 
     @Override
     public void onDisable() {
         // Plugin shutdown logic
+        HandlerList.unregisterAll();
     }
 
 }

src/main/java/plugin/manhunt/manhunt_plugin/commands/CreateGame.java

@@ -0,0 +1,27 @@
+package plugin.manhunt.manhunt_plugin.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import plugin.manhunt.manhunt_plugin.gui.TargetGui;
+
+public class CreateGame implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(
+            @NotNull CommandSender sender,
+            @NotNull Command command,
+            @NotNull String label,
+            @NotNull String[] args) {
+
+        if (!(sender instanceof Player)) {
+            return false;
+        }
+
+        TargetGui targetGui = new TargetGui();
+        targetGui.openNewGui((Player) sender);
+        return true;
+    }
+}

src/main/java/plugin/manhunt/manhunt_plugin/commands/Endgame.java → src/main/java/plugin/manhunt/manhunt_plugin/commands/EndGame.java

@@ -5,14 +5,14 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import plugin.manhunt.manhunt_plugin.ManhuntGame;
+import plugin.manhunt.manhunt_plugin.ManhuntPlugin;
+import plugin.manhunt.manhunt_plugin.game.ManhuntGame;
 
-import java.util.HashMap;
+public class EndGame implements CommandExecutor {
 
-public class Endgame implements CommandExecutor {
-    static HashMap<ManhuntGame, Player> currentGames = Target.currentGames;
 
     public static void endgame(ManhuntGame manhuntGame) {
         for (Player player : manhuntGame.players) {
@@ -23,8 +23,7 @@ public static void endgame(ManhuntGame manhuntGame) {
                 player.getInventory().remove(compass);
             }
         }
-        currentGames.remove(manhuntGame);
-        manhuntGame.unRegisterEvent();
+        ManhuntPlugin.gameData.removeGame(manhuntGame);
     }
 
     @Override
@@ -36,16 +35,17 @@ public boolean onCommand(
         if (!(sender instanceof Player)) {
             return false;
         }
-        for (ManhuntGame manhuntGame : currentGames.keySet()) {
+        for (ManhuntGame manhuntGame : ManhuntPlugin.gameData.currentGames) {
             if (manhuntGame.players.contains(sender)) {
                 for (Player player : manhuntGame.players) {
                     for (ItemStack compass : manhuntGame.activecompasses) {
                         player.getInventory().remove(compass);
                     }
                     player.sendRawMessage("The Manhunt has ended!");
+                    manhuntGame.players.remove(player);
                 }
-                currentGames.remove(manhuntGame);
-                manhuntGame.unRegisterEvent();
+                ManhuntPlugin.gameData.removeGame(manhuntGame);
+                HandlerList.unregisterAll(manhuntGame);
                 return true;
             }
         }

src/main/java/plugin/manhunt/manhunt_plugin/commands/JoinGame.java

@@ -0,0 +1,25 @@
+package plugin.manhunt.manhunt_plugin.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import plugin.manhunt.manhunt_plugin.gui.JoinGui;
+
+public class JoinGame implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(
+            @NotNull CommandSender sender,
+            @NotNull Command command,
+            @NotNull String label,
+            @NotNull String[] args) {
+
+        JoinGui joinGui = new JoinGui();
+        joinGui.openNewGui((Player) sender);
+
+
+        return true;
+    }
+}

src/main/java/plugin/manhunt/manhunt_plugin/game/GameData.java

@@ -0,0 +1,16 @@
+package plugin.manhunt.manhunt_plugin.game;
+
+import java.util.ArrayList;
+
+public class GameData {
+    public ArrayList<ManhuntGame> currentGames = new ArrayList<>();
+
+    public void addGame(ManhuntGame game) {
+        currentGames.add(game);
+    }
+
+    public void removeGame(ManhuntGame game) {
+        currentGames.remove(game);
+    }
+
+}