Add Corporation Query Command

FloLoFlo · Sep 14, 2023 · 569fcb9 · 569fcb9
1 parent ff0742d
commit 569fcb9
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/abstraction/src/main/java/us/teaminceptus/novaconomy/abstraction/CommandWrapper.java b/abstraction/src/main/java/us/teaminceptus/novaconomy/abstraction/CommandWrapper.java
@@ -3098,6 +3098,16 @@ default void corporationInfo(Player p) {
         if (!corp.isOwner(p)) corp.addView();
     }
 
+    default void queryCorporation(Player p, Corporation corp) {
+        if (!p.hasPermission("novaconomy.user.corporation.query")) {
+            p.sendMessage(ERROR_PERMISSION_ARGUMENT);
+            return;
+        }
+
+        p.openInventory(generateCorporationData(corp, p, SortingType.BUSINESS_NAME_ASCENDING));
+        if (!corp.isOwner(p)) corp.addView();
+    }
+
     default void createCorporation(Player p, String name, Material icon) {
         if (!p.hasPermission("novaconomy.user.corporation.manage")) {
             p.sendMessage(ERROR_PERMISSION_ARGUMENT);

diff --git a/nms/1_13_R2/src/main/java/us/teaminceptus/novaconomy/CommandWrapperV2.java b/nms/1_13_R2/src/main/java/us/teaminceptus/novaconomy/CommandWrapperV2.java
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static java.util.Arrays.asList;
 import static us.teaminceptus.novaconomy.abstraction.Wrapper.*;
 import static us.teaminceptus.novaconomy.util.NovaUtil.format;
 
@@ -749,6 +748,12 @@ public void corporationInfo(Player p) {
             NovaSound.ENTITY_ARROW_HIT_PLAYER.playSuccess(p);
         }
 
+        @Subcommand("query")
+        public void queryCorporation(Player p, Corporation corp) {
+            wrapper.queryCorporation(p, corp);
+            NovaSound.ENTITY_ARROW_HIT_PLAYER.playSuccess(p);
+        }
+
         @Subcommand("create")
         @CommandPermission("novaconomy.user.corporation.manage")
         public void createCorporation(Player p, @Length(Corporation.MAX_NAME_LENGTH) String name, Material icon) {

diff --git a/nms/1_8_R1/src/main/java/us/teaminceptus/novaconomy/CommandWrapperV1.java b/nms/1_8_R1/src/main/java/us/teaminceptus/novaconomy/CommandWrapperV1.java
@@ -13,6 +13,7 @@
 import us.teaminceptus.novaconomy.api.business.Business;
 import us.teaminceptus.novaconomy.api.corporation.Corporation;
 import us.teaminceptus.novaconomy.api.economy.Economy;
+import us.teaminceptus.novaconomy.util.NovaSound;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -1517,6 +1518,25 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                         createCorporation(p, name, icon);
                         break;
                     }
+                    case "query": {
+                        if (!(sender instanceof Player)) return false;
+                        Player p = (Player) sender;
+
+                        if (args.length < 2) {
+                            p.sendMessage(getMessage("error.argument.corporation"));
+                            return false;
+                        }
+
+                        Corporation c = Corporation.byName(args[1]);
+                        if (c == null) {
+                            p.sendMessage(getMessage("error.corporation.inexistent"));
+                            return false;
+                        }
+
+                        queryCorporation(p, c);
+                        NovaSound.ENTITY_ARROW_HIT_PLAYER.playSuccess(p);
+                        break;
+                    }
                     case "delete": {
                         if (!(sender instanceof Player)) return false;
                         Player p = (Player) sender;

diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml
@@ -266,6 +266,12 @@ permissions:
     children:
       novaconomy.user.corporation: true
 
+  novaconomy.user.corporation.query:
+    description: Access to Querying about other Corporations
+    default: true
+    children:
+      novaconomy.user.corporation: true
+
   # User Market
   novaconomy.user.market:
     description: Access to all Novaconomy Market User Actions and Commands