3.21.3.4

.idea/jarRepositories.xml

@@ -46,16 +46,16 @@
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="BenCodez Repo" />
-      <option name="name" value="BenCodez Repo" />
-      <option name="url" value="https://nexus.bencodez.com/repository/maven-public/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="phoenix" />
       <option name="name" value="phoenix" />
       <option name="url" value="https://nexus.phoenixdevt.fr/repository/maven-public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="BenCodez Repo" />
+      <option name="name" value="BenCodez Repo" />
+      <option name="url" value="https://nexus.bencodez.com/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="ess-repo" />
       <option name="name" value="ess-repo" />

pom.xml

@@ -91,10 +91,6 @@
             <id>jeff-media-public</id>
             <url>https://hub.jeff-media.com/nexus/repository/jeff-media-public/</url>
         </repository>
-        <repository>
-            <id>BenCodez Repo</id>
-            <url>https://nexus.bencodez.com/repository/maven-public/</url>
-        </repository>
         <repository>
             <id>ess-repo</id>
             <url>https://repo.essentialsx.net/releases/</url>
@@ -126,7 +122,7 @@
         <dependency>
             <groupId>de.tr7zw</groupId>
             <artifactId>item-nbt-api</artifactId>
-            <version>2.13.1-SNAPSHOT</version>
+            <version>2.13.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -164,12 +160,6 @@
             <artifactId>commons-io</artifactId>
             <version>2.13.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.bencodez</groupId>
-            <artifactId>votingplugin</artifactId>
-            <version>LATEST</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
@@ -197,14 +187,13 @@
         <dependency>
             <groupId>com.github.Realizedd</groupId>
             <artifactId>TokenManager</artifactId>
-            <version>LATEST</version>
+            <version>3.2.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.arcaniax</groupId>
@@ -212,6 +201,12 @@
             <version>1.3.1</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.LoneDev6</groupId>
+            <artifactId>api-itemsadder</artifactId>
+            <version>3.6.1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>

resource/plugin.yml

@@ -1,4 +1,4 @@
-version: 3.21.3.3
+version: 3.21.3.4
 main: me.rockyhawk.commandpanels.CommandPanels
 name: CommandPanels
 author: RockyHawk

src/me/rockyhawk/commandpanels/CommandPanels.java

@@ -1,6 +1,5 @@
 package me.rockyhawk.commandpanels;
 
-import com.bencodez.votingplugin.VotingPluginHooks;
 import com.google.common.collect.ImmutableMultimap;
 import io.lumine.mythic.lib.api.item.NBTItem;
 import me.rockyhawk.commandpanels.api.CommandPanelsAPI;
@@ -77,7 +76,6 @@ import java.io.Reader;
 import java.util.*;
 
 public class CommandPanels extends JavaPlugin{
-    public VotingPluginHooks votingPlugin;
     public YamlConfiguration config;
     public Economy econ = null;
     public boolean openWithItem = false; //this will be true if there is a panel with open-with-item
@@ -246,10 +244,6 @@ public class CommandPanels extends JavaPlugin{
         if (!Bukkit.getVersion().contains("1.8")) {
             this.getServer().getPluginManager().registerEvents(new SwapItemEvent(this), this);
         }
-        //if VotingPlugin is enabled
-        if (getServer().getPluginManager().isPluginEnabled("VotingPlugin")) {
-            votingPlugin= VotingPluginHooks.getInstance();
-        }
         //if plugin ChestSort is enabled
         if(getServer().getPluginManager().isPluginEnabled("ChestSort")){
             this.getServer().getPluginManager().registerEvents(new UtilsChestSortEvent(this), this);

src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java

@@ -1,6 +1,5 @@
 package me.rockyhawk.commandpanels.classresources.placeholders;
 
-import com.bencodez.votingplugin.VotingPluginHooks;
 import com.earth2me.essentials.Essentials;
 import me.realized.tokenmanager.api.TokenManager;
 import me.rockyhawk.commandpanels.CommandPanels;
@@ -424,11 +423,6 @@ public class Placeholders {
                 return Long.toString(api.getTokens(p).orElse(0));
             }
         }
-        if (plugin.getServer().getPluginManager().isPluginEnabled("VotingPlugin")) {
-            if(identifier.equals("votingplugin-points")) {
-                return String.valueOf(VotingPluginHooks.getInstance().getUserManager().getVotingPluginUser(p).getPoints());
-            }
-        }
         //end nodes with PlaceHolders
         return "";
     }

src/me/rockyhawk/commandpanels/commandtags/CommandRunner.java

@@ -56,7 +56,7 @@ public class CommandRunner {
         }
     }
 
-    public void runMultiPaywall(Panel panel, PanelPosition position, Player p, List<String> paywalls, List<String> commands, ClickType click) {
+    public boolean runMultiPaywall(Panel panel, PanelPosition position, Player p, List<String> paywalls, List<String> commands, ClickType click) {
         boolean allPaywallsValid = true;
 
         // New list combining paywalls and commands
@@ -79,6 +79,9 @@ public class CommandRunner {
         if (allPaywallsValid) {
             plugin.commandRunner.runCommands(panel, position, p, allCommands, click);
         }
+
+        // Return output as boolean for usage if applicable
+        return allPaywallsValid;
     }
 
     //do this on startup to load listeners

src/me/rockyhawk/commandpanels/commandtags/paywalls/itempaywall/ItemPaywall.java

@@ -21,7 +21,7 @@ public class ItemPaywall implements Listener {
     @EventHandler
     public void commandTag(PaywallEvent e){
         if(e.name.equalsIgnoreCase("item-paywall=")){
-            //if player uses item-paywall= [Material] [Amount] <id:#> <IGNORENBT> WILL NOT TAKE CUSTOM ITEMS. IGNORENBT lets nbt items through. Useful for spawner edge cases.
+            //if player uses item-paywall= [Material] [Amount] <IGNORENBT> WILL NOT TAKE CUSTOM ITEMS. IGNORENBT lets nbt items through. Useful for spawner edge cases.
             //player can use item-paywall= [custom-item] [Amount]
             try {
                 boolean ignoreNBT = false;