Added ActionUtil

GiansCode · Mar 20, 2020 · 67e71e8 · 67e71e8
1 parent 637f4d1
commit 67e71e8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,11 @@
             <id>placeholderapi</id>
             <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
+
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -77,6 +82,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.GiansCode</groupId>
+            <artifactId>ActionUtil</artifactId>
+            <version>a1266cbbc7</version>
+            <scope>compile</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/src/main/java/io/alerium/itemshops/ItemShopsPlugin.java b/src/main/java/io/alerium/itemshops/ItemShopsPlugin.java
@@ -9,6 +9,7 @@
 import io.alerium.itemshops.shops.ShopManager;
 import io.alerium.itemshops.utils.commands.Command;
 import io.alerium.itemshops.utils.configuration.YAMLConfiguration;
+import io.samdev.actionutil.ActionUtil;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -27,6 +28,8 @@ public class ItemShopsPlugin extends JavaPlugin {
     @Getter private CoinsManager coinsManager;
     @Getter private ShopManager shopManager;
 
+    @Getter private ActionUtil actionUtil;
+
     @Override
     public void onEnable() {
         long time = System.currentTimeMillis();
@@ -59,6 +62,8 @@ private void registerInstances() {
 
         shopManager = new ShopManager();
         shopManager.enable();
+
+        actionUtil = ActionUtil.init(this);
     }
 
     private void registerCommands() {

diff --git a/src/main/java/io/alerium/itemshops/shops/objects/shops/ShopItem.java b/src/main/java/io/alerium/itemshops/shops/objects/shops/ShopItem.java
@@ -35,12 +35,9 @@ public BiConsumer<GUIInfo, InventoryClickEvent> getOnClick() {
             }
 
             for (String command : buyCommands) {
-                String commandExec = command.substring(command.indexOf("]")).replaceAll("%player%", player.getName()).replaceAll("%cost%", Integer.toString(cost));
+                String commandExec = command.replaceAll("%cost%", Integer.toString(cost));
 
-                if (command.startsWith("[CONSOLE]"))
-                    Bukkit.dispatchCommand(Bukkit.getConsoleSender(), commandExec);
-                else if (command.startsWith("[PLAYER]"))
-                    Bukkit.dispatchCommand(player, commandExec);
+                ItemShopsPlugin.getInstance().getActionUtil().executeActions(player, commandExec);
             }
 
             if (info instanceof ShopGUI && ((ShopGUI) info).isCloseOnBuy())

diff --git a/src/main/resources/shops/armor.yml b/src/main/resources/shops/armor.yml
@@ -29,5 +29,5 @@ items:
     column: 1
     cost: 10
     buy-commands:
-      - '[CONSOLE] kit diamond_armor %player%'
-      - '[PLAYER] me bought the Diamond Armor set in the /itemshop for %cost% Gold'
+      - '[CONSOLECOMMAND] kit diamond_armor %player_name%'
+      - '[PLAYERCOMMAND] me bought the Diamond Armor set in the /itemshop for %cost% Gold'