diff --git a/src/me/rockyhawk/commandPanels/commandpanels.java b/src/me/rockyhawk/commandPanels/commandpanels.java index d2f9455..a9d46a4 100644 --- a/src/me/rockyhawk/commandPanels/commandpanels.java +++ b/src/me/rockyhawk/commandPanels/commandpanels.java @@ -428,11 +428,7 @@ public class commandpanels extends JavaPlugin { return null; } if (onOpen != 3) { - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - this.setName(s, PlaceholderAPI.setPlaceholders(p, pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".name")), PlaceholderAPI.setPlaceholders(p, (List) pconfig.getList("panels." + panels + ".item." + item.split("\\s")[c] + section + ".lore")), p, true); - } else { - this.setName(s, pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".name"), pconfig.getList("panels." + panels + ".item." + item.split("\\s")[c] + section + ".lore"), p, true); - } + this.setName(s, papi(p, pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".name")), papi(p, pconfig.getStringList("panels." + panels + ".item." + item.split("\\s")[c] + section + ".lore")), p, true); }else{ this.setName(s, pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".name"), pconfig.getList("panels." + panels + ".item." + item.split("\\s")[c] + section + ".lore"), p, false); } @@ -628,6 +624,7 @@ public class commandpanels extends JavaPlugin { } } + //regular string papi public String papi(Player p, String setpapi) { if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { setpapi = PlaceholderAPI.setPlaceholders(p, setpapi); @@ -635,6 +632,25 @@ public class commandpanels extends JavaPlugin { return ChatColor.translateAlternateColorCodes('&',setpapi); } + //papi except if it is a String List + public List papi(Player p, List setpapi) { + try { + if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { + setpapi = PlaceholderAPI.setPlaceholders(p, setpapi); + } + }catch(Exception ignore){ + //this will be ignored as it is probably a null + return null; + } + int tempInt = 0; + //change colour + for(String temp : setpapi){ + setpapi.set(tempInt,ChatColor.translateAlternateColorCodes('&',temp)); + tempInt += 1; + } + return setpapi; + } + public void commandTags(Player p, String command) { String tag = config.getString("config.format.tag") + " "; //set cp placeholders @@ -652,28 +668,16 @@ public class commandpanels extends JavaPlugin { boolean isop = p.isOp(); try { p.setOp(true); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - Bukkit.dispatchCommand(p, ChatColor.translateAlternateColorCodes('&', PlaceholderAPI.setPlaceholders(p, command.replace("op=", "").trim()))); - } else { - Bukkit.dispatchCommand(p, ChatColor.translateAlternateColorCodes('&', command.replace("op=", "").trim())); - } + Bukkit.dispatchCommand(p, ChatColor.translateAlternateColorCodes('&', papi(p, command.replace("op=", "").trim()))); p.setOp(isop); } catch (Exception exc) { p.setOp(isop); debug(exc); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + PlaceholderAPI.setPlaceholders(p, config.getString("config.format.error") + " op=: Error in op command!"))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.error") + " op=: Error in op command!")); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, config.getString("config.format.error") + " op=: Error in op command!"))); } } else if (command.split("\\s")[0].equalsIgnoreCase("console=")) { //if player uses console= it will perform command in the console - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', PlaceholderAPI.setPlaceholders(p, command.replace("console=", "").trim()))); - } else { - Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', command.replace("console=", "").trim())); - } + Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', papi(p, command.replace("console=", "").trim()))); } else if (command.split("\\s")[0].equalsIgnoreCase("buy=")) { //if player uses buy= it will be eg. buy= try { @@ -697,11 +701,7 @@ public class commandpanels extends JavaPlugin { } } catch (Exception buy) { debug(buy); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + PlaceholderAPI.setPlaceholders(p, config.getString("config.format.error") + " " + "commands: " + command))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.error") + " " + "commands: " + command)); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, config.getString("config.format.error") + " " + "commands: " + command))); } } else if (command.split("\\s")[0].equalsIgnoreCase("tokenbuy=")) { //if player uses tokenbuy= it will be eg. tokenbuy= @@ -729,11 +729,7 @@ public class commandpanels extends JavaPlugin { } } catch (Exception buy) { debug(buy); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + PlaceholderAPI.setPlaceholders(p, config.getString("config.format.error") + " " + "commands: " + command))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.error") + " " + "commands: " + command)); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, config.getString("config.format.error") + " " + "commands: " + command))); } } else if (command.split("\\s")[0].equalsIgnoreCase("sell=")) { //if player uses sell= it will be eg. sell= [enchanted:KNOCKBACK:1] [potion:JUMP] @@ -808,11 +804,7 @@ public class commandpanels extends JavaPlugin { } } catch (Exception sell) { debug(sell); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + PlaceholderAPI.setPlaceholders(p, config.getString("config.format.error") + " " + "commands: " + command))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.error") + " " + "commands: " + command)); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, config.getString("config.format.error") + " " + "commands: " + command))); } } else if (command.split("\\s")[0].equalsIgnoreCase("tokensell=")) { //if player uses tokensell= it will be eg. tokensell= [enchanted:KNOCKBACK:1] [potion:JUMP] @@ -870,19 +862,11 @@ public class commandpanels extends JavaPlugin { } } catch (Exception sell) { debug(sell); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + PlaceholderAPI.setPlaceholders(p, config.getString("config.format.error") + " " + "commands: " + command))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.error") + " " + "commands: " + command)); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, config.getString("config.format.error") + " " + "commands: " + command))); } } else if (command.split("\\s")[0].equalsIgnoreCase("msg=")) { //if player uses msg= it will send the player a message - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', PlaceholderAPI.setPlaceholders(p, command.replace("msg=", "").trim()))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', command.replace("msg=", "").trim())); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', papi(p, command.replace("msg=", "").trim()))); } else if (command.split("\\s")[0].equalsIgnoreCase("sound=")) { //if player uses sound= it will play a sound (sound= [sound]) try { @@ -918,11 +902,7 @@ public class commandpanels extends JavaPlugin { } } catch (Exception buyc) { debug(buyc); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + PlaceholderAPI.setPlaceholders(p, config.getString("config.format.error") + " " + "commands: " + command))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.error") + " " + "commands: " + command)); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, config.getString("config.format.error") + " " + "commands: " + command))); } } else if (command.split("\\s")[0].equalsIgnoreCase("buycommand=")) { //if player uses buycommand [price] [command] @@ -948,11 +928,7 @@ public class commandpanels extends JavaPlugin { } } catch (Exception buyc) { debug(buyc); - if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + PlaceholderAPI.setPlaceholders(p, config.getString("config.format.error") + " " + "commands: " + command))); - } else { - p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.error") + " " + "commands: " + command)); - } + p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, config.getString("config.format.error") + " " + "commands: " + command))); } } else if (command.split("\\s")[0].equalsIgnoreCase("teleport=")) { //if player uses teleport= x y z (optional other player) @@ -1284,7 +1260,7 @@ public class commandpanels extends JavaPlugin { lore.add(ChatColor.GRAY + "- When entering a value,"); lore.add(ChatColor.GRAY + " type 'remove' to set a"); lore.add(ChatColor.GRAY + " value to default, and use"); - lore.add(ChatColor.GRAY + " " + config.getString("config.input-cancel") + " to cancel."); + lore.add(ChatColor.GRAY + " '" + config.getString("config.input-cancel") + "' to cancel."); setName(temp, ChatColor.WHITE + "Panel Editor Tips", lore, p, true); i.setItem(53, temp); if (pageNumber != 1) { diff --git a/src/me/rockyhawk/commandPanels/commands/commandpanel.java b/src/me/rockyhawk/commandPanels/commands/commandpanel.java index 98d34c8..cfd36fd 100644 --- a/src/me/rockyhawk/commandPanels/commands/commandpanel.java +++ b/src/me/rockyhawk/commandPanels/commands/commandpanel.java @@ -79,7 +79,7 @@ public class commandpanel implements CommandExecutor { } if (nfound) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(sp, plugin.config.getString("config.format.nopanel")))); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(sp, plugin.config.getString("config.format.nopanel")))); } else { sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.nopanel"))); } @@ -146,7 +146,7 @@ public class commandpanel implements CommandExecutor { } if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(sp, plugin.config.getString("config.format.perms")))); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(sp, plugin.config.getString("config.format.perms")))); return true; } else { sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.perms"))); @@ -174,7 +174,7 @@ public class commandpanel implements CommandExecutor { } if (nfound) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(sp, plugin.config.getString("config.format.nopanel")))); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(sp, plugin.config.getString("config.format.nopanel")))); } else { sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.nopanel"))); } @@ -197,7 +197,7 @@ public class commandpanel implements CommandExecutor { s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(cf.getString("panels." + panels + ".open-with-item.material")))), 1); }catch(Exception n){ if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(sp, plugin.config.getString("config.format.error") + " open-with-item: material"))); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(sp, plugin.config.getString("config.format.error") + " open-with-item: material"))); } else { sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " open-with-item: material")); } @@ -222,7 +222,7 @@ public class commandpanel implements CommandExecutor { } if (!cf.contains("panels." + panels + ".open-with-item")) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(sp, plugin.config.getString("config.format.noitem")))); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(sp, plugin.config.getString("config.format.noitem")))); return true; } else { sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.noitem"))); @@ -230,7 +230,7 @@ public class commandpanel implements CommandExecutor { } } if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(sp, plugin.config.getString("config.format.perms")))); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(sp, plugin.config.getString("config.format.perms")))); return true; } else { sender.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.perms"))); @@ -291,7 +291,7 @@ public class commandpanel implements CommandExecutor { } if (nfound) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.nopanel")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.nopanel")))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.nopanel"))); } @@ -345,7 +345,7 @@ public class commandpanel implements CommandExecutor { } if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.perms")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.perms")))); return true; } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.perms"))); @@ -365,7 +365,7 @@ public class commandpanel implements CommandExecutor { if (nfound) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.nopanel")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.nopanel")))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.nopanel"))); } @@ -389,7 +389,7 @@ public class commandpanel implements CommandExecutor { }catch(Exception n){ plugin.debug(n); if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " open-with-item: material"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " open-with-item: material"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " open-with-item: material")); } @@ -405,7 +405,7 @@ public class commandpanel implements CommandExecutor { } if (!cf.contains("panels." + panels + ".open-with-item")) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.noitem")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.noitem")))); return true; } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.noitem"))); @@ -413,7 +413,7 @@ public class commandpanel implements CommandExecutor { } } if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.perms")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.perms")))); return true; } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.perms"))); @@ -430,7 +430,7 @@ public class commandpanel implements CommandExecutor { } if (nfound) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.nopanel")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.nopanel")))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.nopanel"))); } @@ -464,7 +464,7 @@ public class commandpanel implements CommandExecutor { } if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.perms")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.perms")))); return true; } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.perms"))); @@ -486,7 +486,7 @@ public class commandpanel implements CommandExecutor { if (nfound) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.nopanel")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.nopanel")))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.nopanel"))); } @@ -510,7 +510,7 @@ public class commandpanel implements CommandExecutor { }catch(Exception n){ plugin.debug(n); if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " open-with-item: material"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " open-with-item: material"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " open-with-item: material")); } @@ -535,7 +535,7 @@ public class commandpanel implements CommandExecutor { } if (!cf.contains("panels." + panels + ".open-with-item")) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.noitem")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.noitem")))); return true; } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.noitem"))); @@ -543,7 +543,7 @@ public class commandpanel implements CommandExecutor { } } if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.perms")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.perms")))); return true; } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.perms"))); diff --git a/src/me/rockyhawk/commandPanels/commands/commandpanelcustom.java b/src/me/rockyhawk/commandPanels/commands/commandpanelcustom.java index 00ff5c6..a9bbacf 100644 --- a/src/me/rockyhawk/commandPanels/commands/commandpanelcustom.java +++ b/src/me/rockyhawk/commandPanels/commands/commandpanelcustom.java @@ -43,7 +43,7 @@ public class commandpanelcustom implements Listener { tpanels = ""; if(!plugin.checkPanels(temp)){ if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + ": File with no Panels found!"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + ": File with no Panels found!"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + ": File with no Panels found!")); } diff --git a/src/me/rockyhawk/commandPanels/ingameEditor/cpIngameEditCommand.java b/src/me/rockyhawk/commandPanels/ingameEditor/cpIngameEditCommand.java index 6873d5f..db7fb08 100644 --- a/src/me/rockyhawk/commandPanels/ingameEditor/cpIngameEditCommand.java +++ b/src/me/rockyhawk/commandPanels/ingameEditor/cpIngameEditCommand.java @@ -84,7 +84,7 @@ public class cpIngameEditCommand implements CommandExecutor { if (oset.size() < opanels.size()) { //there are duplicate panel names if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " panels: You cannot have duplicate panel names!"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " panels: You cannot have duplicate panel names!"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " panels: You cannot have duplicate panel names!")); } @@ -104,7 +104,7 @@ public class cpIngameEditCommand implements CommandExecutor { if (set.size() < apanels.size()) { //there are duplicate panel names if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " title: You cannot have duplicate title names!"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " title: You cannot have duplicate title names!"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " title: You cannot have duplicate title names!")); } @@ -154,7 +154,7 @@ public class cpIngameEditCommand implements CommandExecutor { String tag = plugin.config.getString("config.format.tag") + " "; if(!pconfig.contains("panels." + panels)) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.nopanel")))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.nopanel")))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.nopanel"))); } @@ -162,7 +162,7 @@ public class cpIngameEditCommand implements CommandExecutor { } if(!pconfig.contains("panels." + panels + ".perm")) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " perm: Missing config section!"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " perm: Missing config section!"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " perm: Missing config section!")); } @@ -170,7 +170,7 @@ public class cpIngameEditCommand implements CommandExecutor { } if(!pconfig.contains("panels." + panels + ".rows")) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " rows: Missing config section!"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " rows: Missing config section!"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " rows: Missing config section!")); } @@ -178,7 +178,7 @@ public class cpIngameEditCommand implements CommandExecutor { } if(!pconfig.contains("panels." + panels + ".title")) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " title: Missing config section!"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " title: Missing config section!"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " title: Missing config section!")); } @@ -186,7 +186,7 @@ public class cpIngameEditCommand implements CommandExecutor { } if(!pconfig.contains("panels." + panels + ".item")) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { - p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + PlaceholderAPI.setPlaceholders(p, plugin.config.getString("config.format.error") + " item: Missing config section!"))); + p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + " item: Missing config section!"))); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.config.getString("config.format.error") + " item: Missing config section!")); } diff --git a/src/me/rockyhawk/commandPanels/openWithItem/utilsOpenWithItem.java b/src/me/rockyhawk/commandPanels/openWithItem/utilsOpenWithItem.java index a725210..7967917 100644 --- a/src/me/rockyhawk/commandPanels/openWithItem/utilsOpenWithItem.java +++ b/src/me/rockyhawk/commandPanels/openWithItem/utilsOpenWithItem.java @@ -67,13 +67,13 @@ public class utilsOpenWithItem implements Listener { } @EventHandler public void onPlayerUse(PlayerInteractEvent e){ - //item right or left clicked + //item right clicked only (not left because that causes issues when things are interacted with) if(!plugin.openWithItem){ //if none of the panels have open-with-item return; } try { - if(e.getAction() != Action.RIGHT_CLICK_AIR && e.getAction() != Action.RIGHT_CLICK_BLOCK && Objects.requireNonNull(e.getItem()).getType() == Material.AIR){ + if(e.getAction() != Action.RIGHT_CLICK_AIR && e.getAction() != Action.RIGHT_CLICK_BLOCK || Objects.requireNonNull(e.getItem()).getType() == Material.AIR){ return; } if (plugin.panelFiles == null) {