Merge pull request #26 from ParallelMC/staging

v3.3.0

Author: UnknownSilicon

api/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '3.2.0'
+version = '3.3.0'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {
@@ -85,6 +85,11 @@ bukkit {
             permissionMessage = 'You do not have permission'
             aliases = ['cr',]
         }
+        town {
+            description = 'Base command for all Town commands'
+            usage = '/town'
+            permissionMessage = 'You do not have permission'
+        }
         depositexp {
             description = 'Deposit exp into the player\' s ender chest '
             usage = '/depositexp <amount | all>'

api/src/main/java/parallelmc/parallelutils/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(3, 2, 0);
+	public static final Version VERSION = new Version(3, 3, 0);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world2";
 }

modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/ParallelChat.java

@@ -259,6 +259,7 @@ UUID        varchar(36) not null,
         puPlugin.getCommand("reloademojis").setExecutor(new ParallelReloadEmojis());
 
         this.chatroomCommands = new ChatroomCommands();
+        puPlugin.getCommand("chatroom").setExecutor(chatroomCommands);
         addChatRoomCommand("create", new ParallelCreateChatroom());
         addChatRoomCommand("leave", new ParallelLeaveChatroom());
         addChatRoomCommand("join", new ParallelJoinChatroom());

modules/src/main/java/parallelmc/parallelutils/modules/paralleltowns/Config.java

@@ -0,0 +1,21 @@
+package parallelmc.parallelutils.modules.paralleltowns;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class Config implements parallelmc.parallelutils.Config {
+	@NotNull
+	@Override
+	public List<String> getHardDepends() {
+		return List.of("ParallelChat");
+	}
+
+	@NotNull
+	@Override
+	public List<String> getSoftDepends() {
+		return new ArrayList<>();
+	}
+}

modules/src/main/java/parallelmc/parallelutils/modules/paralleltowns/DisplayItem.java

@@ -0,0 +1,39 @@
+package parallelmc.parallelutils.modules.paralleltowns;
+
+import org.bukkit.Material;
+
+// an item that is displayed in the town list
+// simplifies having to store an ItemStack for this feature
+public class DisplayItem {
+    // the item's material
+    private Material material;
+
+    // if the item has any model data
+    private int modelData;
+
+    public DisplayItem(Material material) {
+        this.material = material;
+        this.modelData = -1;
+    }
+
+    public DisplayItem(Material material, int modelData) {
+        this.material = material;
+        this.modelData = modelData;
+    }
+
+    public Material getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(Material material) {
+        this.material = material;
+    }
+
+    public int getModelData() {
+        return modelData;
+    }
+
+    public void setModelData(int modelData) {
+        this.modelData = modelData;
+    }
+}

modules/src/main/java/parallelmc/parallelutils/modules/paralleltowns/GUIManager.java

@@ -0,0 +1,62 @@
+package parallelmc.parallelutils.modules.paralleltowns;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import parallelmc.parallelutils.modules.paralleltowns.gui.*;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+
+// helper class to manage all possible menus and submenus of the town gui
+public class GUIManager {
+    // a list of all players with the towns UI open
+    private final HashMap<UUID, GUIInventory> openGUIs = new HashMap<>();
+
+    public void openMainMenuForPlayer(Player player) {
+        openInventoryForPlayer(player, new MainMenuInventory());
+    }
+
+    public void openOptionsMenuForPlayer(Player player) {
+        openInventoryForPlayer(player, new OptionsInventory());
+    }
+
+    public void openMembersMenuForPlayer(Player player) {
+        openInventoryForPlayer(player, new MembersInventory());
+    }
+
+    public void openMemberOptionsMenuForPlayer(Player player, OfflinePlayer edit) {
+        openInventoryForPlayer(player, new MemberOptionsInventory(edit));
+    }
+
+    public void openTownConfirmationForPlayer(Player player, Town town, ConfirmationAction action) {
+        openInventoryForPlayer(player, new ConfirmationInventory(town, action));
+    }
+
+    public void openTownMemberConfirmationForPlayer(Player player, Town town, OfflinePlayer townMember, ConfirmationAction action) {
+        openInventoryForPlayer(player, new ConfirmationInventory(town, townMember, action));
+    }
+
+    public void openTownListMenuForPlayer(Player player) {
+        openInventoryForPlayer(player, new TownListInventory());
+    }
+
+    private void openInventoryForPlayer(Player player, GUIInventory type) {
+        type.onOpen(player);
+        player.openInventory(type.inventory);
+        openGUIs.put(player.getUniqueId(), type);
+    }
+
+    public boolean openInventoryExists(Inventory input) {
+        return openGUIs.values().stream().anyMatch(x -> x.inventory.equals(input));
+    }
+
+    public GUIInventory getOpenInventory(Player player) {
+        return openGUIs.get(player.getUniqueId());
+    }
+
+    public void closeMenu(Player player) {
+        openGUIs.remove(player.getUniqueId());
+    }
+}