Fork/CommandPanels
2
0
Fork 0
forked from Upstream/CommandPanels
Code Pull Requests Actions Releases 1 Activity

3.2.1 Additions

Browse Source
This commit is contained in:
rockyhawk64 2020-07-06 08:57:51 +10:00
parent 70ac48fa7c
commit bc85898af8
3 changed files with 228 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/plugin.yml
View File

@ -1,4 +1,4 @@
version: 3.2.0 version: 3.2.1
main: me.rockyhawk.commandPanels.commandpanels main: me.rockyhawk.commandPanels.commandpanels
name: CommandPanels name: CommandPanels
author: RockyHawk author: RockyHawk

264
src/me/rockyhawk/commandPanels/commandpanels.java
View File

@ -35,7 +35,6 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.libs.org.apache.commons.io.IOUtils; import org.bukkit.craftbukkit.libs.org.apache.commons.io.IOUtils;
import org.bukkit.craftbukkit.libs.org.apache.commons.io.input.CharSequenceReader; import org.bukkit.craftbukkit.libs.org.apache.commons.io.input.CharSequenceReader;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.enchantments.EnchantmentWrapper;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
@ -69,17 +68,17 @@ public class commandpanels extends JavaPlugin {
this.setupEconomy(); this.setupEconomy();
this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
new Metrics(this); new Metrics(this);
this.getCommand("commandpanel").setExecutor(new commandpanel(this)); Objects.requireNonNull(this.getCommand("commandpanel")).setExecutor(new commandpanel(this));
this.getCommand("commandpanel").setTabCompleter(new cpTabComplete(this)); Objects.requireNonNull(this.getCommand("commandpanel")).setTabCompleter(new cpTabComplete(this));
this.getCommand("commandpanelgenerate").setTabCompleter(new tabCompleteGenerate(this)); Objects.requireNonNull(this.getCommand("commandpanelgenerate")).setTabCompleter(new tabCompleteGenerate(this));
this.getCommand("commandpaneledit").setTabCompleter(new cpTabCompleteIngame(this)); Objects.requireNonNull(this.getCommand("commandpaneledit")).setTabCompleter(new cpTabCompleteIngame(this));
this.getCommand("commandpanelgenerate").setExecutor(new commandpanelsgenerate(this)); Objects.requireNonNull(this.getCommand("commandpanelgenerate")).setExecutor(new commandpanelsgenerate(this));
this.getCommand("commandpanelreload").setExecutor(new commandpanelsreload(this)); Objects.requireNonNull(this.getCommand("commandpanelreload")).setExecutor(new commandpanelsreload(this));
this.getCommand("commandpaneldebug").setExecutor(new commandpanelsdebug(this)); Objects.requireNonNull(this.getCommand("commandpaneldebug")).setExecutor(new commandpanelsdebug(this));
this.getCommand("commandpanelclose").setExecutor(new commandpanelclose(this)); Objects.requireNonNull(this.getCommand("commandpanelclose")).setExecutor(new commandpanelclose(this));
this.getCommand("commandpanelversion").setExecutor(new commandpanelversion(this)); Objects.requireNonNull(this.getCommand("commandpanelversion")).setExecutor(new commandpanelversion(this));
this.getCommand("commandpanellist").setExecutor(new commandpanelslist(this)); Objects.requireNonNull(this.getCommand("commandpanellist")).setExecutor(new commandpanelslist(this));
this.getCommand("commandpaneledit").setExecutor(new cpIngameEditCommand(this)); Objects.requireNonNull(this.getCommand("commandpaneledit")).setExecutor(new cpIngameEditCommand(this));
this.getServer().getPluginManager().registerEvents(new utils(this), this); this.getServer().getPluginManager().registerEvents(new utils(this), this);
this.getServer().getPluginManager().registerEvents(new editorUtils(this), this); this.getServer().getPluginManager().registerEvents(new editorUtils(this), this);
this.getServer().getPluginManager().registerEvents(new newGenUtils(this), this); this.getServer().getPluginManager().registerEvents(new newGenUtils(this), this);
@ -98,7 +97,6 @@ public class commandpanels extends JavaPlugin {
this.config.addDefault("config.input-cancel", "cancel"); this.config.addDefault("config.input-cancel", "cancel");
this.config.addDefault("config.input-cancelled", "&cCancelled!"); this.config.addDefault("config.input-cancelled", "&cCancelled!");
List<String> inputMessage = new ArrayList(); List<String> inputMessage = new ArrayList();
//webhook test #2
inputMessage.add("%cp-tag%&aEnter Input for Command"); inputMessage.add("%cp-tag%&aEnter Input for Command");
inputMessage.add("&cType &4%cp-args% &cto Cancel the command"); inputMessage.add("&cType &4%cp-args% &cto Cancel the command");
this.config.addDefault("config.input-message", inputMessage); this.config.addDefault("config.input-message", inputMessage);
@ -116,7 +114,7 @@ public class commandpanels extends JavaPlugin {
this.config.addDefault("config.format.tag", "&6[&bCommandPanels&6]"); this.config.addDefault("config.format.tag", "&6[&bCommandPanels&6]");
this.config.addDefault("config.format.offline", "Offline"); this.config.addDefault("config.format.offline", "Offline");
this.config.addDefault("config.format.offlineHeadValue", "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmU1Mjg2YzQ3MGY2NmZmYTFhMTgzMzFjYmZmYjlhM2MyYTQ0MjRhOGM3MjU5YzQ0MzZmZDJlMzU1ODJhNTIyIn19fQ=="); this.config.addDefault("config.format.offlineHeadValue", "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmU1Mjg2YzQ3MGY2NmZmYTFhMTgzMzFjYmZmYjlhM2MyYTQ0MjRhOGM3MjU5YzQ0MzZmZDJlMzU1ODJhNTIyIn19fQ==");
if (!this.panelsf.exists() || this.panelsf.list().length == 0) { if (!this.panelsf.exists() || Objects.requireNonNull(this.panelsf.list()).length == 0) {
try { try {
FileConfiguration exampleFileConfiguration = YamlConfiguration.loadConfiguration(getReaderFromStream(this.getResource("example.yml"))); FileConfiguration exampleFileConfiguration = YamlConfiguration.loadConfiguration(getReaderFromStream(this.getResource("example.yml")));
exampleFileConfiguration.save(new File(this.panelsf + File.separator + "example.yml")); exampleFileConfiguration.save(new File(this.panelsf + File.separator + "example.yml"));
@ -133,7 +131,7 @@ public class commandpanels extends JavaPlugin {
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Could not save the config file!"); Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Could not save the config file!");
} }
try { try {
if (!this.config.getString("config.version").equals("3.0")) { if (!Objects.equals(this.config.getString("config.version"), "3.0")) {
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Config version doesn't match the recommended version. You may run into issues."); Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Config version doesn't match the recommended version. You may run into issues.");
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Either remove the config and generate a new one, or restore the original version of the plugin initially being used."); Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Either remove the config and generate a new one, or restore the original version of the plugin initially being used.");
} }
@ -141,7 +139,7 @@ public class commandpanels extends JavaPlugin {
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Could not find config version! Your config may be missing some information!"); Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Could not find config version! Your config may be missing some information!");
} }
if (this.config.getString("config.update-notifications").equalsIgnoreCase("true")) { if (Objects.requireNonNull(this.config.getString("config.update-notifications")).equalsIgnoreCase("true")) {
githubNewUpdate(); githubNewUpdate();
} }
@ -157,19 +155,19 @@ public class commandpanels extends JavaPlugin {
public Inventory openGui(String panels, Player p, YamlConfiguration pconfig, int onOpen, int animateValue) { public Inventory openGui(String panels, Player p, YamlConfiguration pconfig, int onOpen, int animateValue) {
String tag = this.config.getString("config.format.tag") + " "; String tag = this.config.getString("config.format.tag") + " ";
if (Integer.parseInt(pconfig.getString("panels." + panels + ".rows")) < 7 && Integer.parseInt(pconfig.getString("panels." + panels + ".rows")) > 0) { if (Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".rows"))) < 7 && Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".rows"))) > 0) {
Inventory i; Inventory i;
if (onOpen != 3) { if (onOpen != 3) {
//use the regular inventory //use the regular inventory
i = Bukkit.createInventory((InventoryHolder) null, Integer.parseInt(pconfig.getString("panels." + panels + ".rows")) * 9, ChatColor.translateAlternateColorCodes('&', pconfig.getString("panels." + panels + ".title"))); i = Bukkit.createInventory((InventoryHolder) null, Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".rows"))) * 9, ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(pconfig.getString("panels." + panels + ".title"))));
} else { } else {
//this means it is the Editor window //this means it is the Editor window
i = Bukkit.createInventory((InventoryHolder) null, Integer.parseInt(pconfig.getString("panels." + panels + ".rows")) * 9, ChatColor.translateAlternateColorCodes('&', ChatColor.GRAY + "Editing Panel: " + pconfig.getString("panels." + panels + ".title"))); i = Bukkit.createInventory((InventoryHolder) null, Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".rows"))) * 9, ChatColor.translateAlternateColorCodes('&', ChatColor.GRAY + "Editing Panel: " + pconfig.getString("panels." + panels + ".title")));
} }
String item = ""; String item = "";
String key; String key;
for (Iterator var6 = pconfig.getConfigurationSection("panels." + panels + ".item").getKeys(false).iterator(); var6.hasNext(); item = item + key + " ") { for (Iterator var6 = Objects.requireNonNull(pconfig.getConfigurationSection("panels." + panels + ".item")).getKeys(false).iterator(); var6.hasNext(); item = item + key + " ") {
key = (String) var6.next(); key = (String) var6.next();
} }
@ -185,7 +183,7 @@ public class commandpanels extends JavaPlugin {
if (onOpen != 3) { if (onOpen != 3) {
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasvalue")) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasvalue")) {
//loop through possible hasvalue 1,2,3,etc //loop through possible hasvalue 1,2,3,etc
for (int count = 0; pconfig.getConfigurationSection("panels." + panels + ".item." + item.split("\\s")[c]).getKeys(false).size() > count; count++) { for (int count = 0; Objects.requireNonNull(pconfig.getConfigurationSection("panels." + panels + ".item." + item.split("\\s")[c])).getKeys(false).size() > count; count++) {
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasvalue" + count)) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasvalue" + count)) {
boolean outputValue = true; boolean outputValue = true;
//outputValue will default to true //outputValue will default to true
@ -218,7 +216,7 @@ public class commandpanels extends JavaPlugin {
} }
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm")) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm")) {
//loop through possible noperm/hasperm 1,2,3,etc //loop through possible noperm/hasperm 1,2,3,etc
for (int count = 0; pconfig.getConfigurationSection("panels." + panels + ".item." + item.split("\\s")[c]).getKeys(false).size() > count; count++) { for (int count = 0; Objects.requireNonNull(pconfig.getConfigurationSection("panels." + panels + ".item." + item.split("\\s")[c])).getKeys(false).size() > count; count++) {
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + count)) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + count)) {
boolean outputValue = true; boolean outputValue = true;
//outputValue will default to true //outputValue will default to true
@ -226,7 +224,7 @@ public class commandpanels extends JavaPlugin {
//if output is true, and values match it will be this item, vice versa //if output is true, and values match it will be this item, vice versa
outputValue = pconfig.getBoolean("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + count + ".output"); outputValue = pconfig.getBoolean("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + count + ".output");
} }
if (p.hasPermission(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + count + ".perm")) == outputValue) { if (p.hasPermission(Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + count + ".perm"))) == outputValue) {
//onOpen being 3 means it is the editor panel.. noPerm and hasPerm items cannot be included to avoid item breaking //onOpen being 3 means it is the editor panel.. noPerm and hasPerm items cannot be included to avoid item breaking
section = ".hasperm" + count; section = ".hasperm" + count;
break; break;
@ -240,7 +238,7 @@ public class commandpanels extends JavaPlugin {
//if output is true, and values match it will be this item, vice versa //if output is true, and values match it will be this item, vice versa
outputValue = pconfig.getBoolean("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + ".output"); outputValue = pconfig.getBoolean("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm" + ".output");
} }
if (p.hasPermission(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm.perm")) == outputValue) { if (p.hasPermission(Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + ".hasperm.perm"))) == outputValue) {
section = ".hasperm"; section = ".hasperm";
} }
} }
@ -255,12 +253,13 @@ public class commandpanels extends JavaPlugin {
} }
} }
String material = pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".material"); String material = pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".material");
if (!pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".material").equalsIgnoreCase("AIR")) { if (!Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".material")).equalsIgnoreCase("AIR")) {
ItemStack s; ItemStack s;
String mat; String mat;
String matskull; String matskull;
String skullname; String skullname;
//this will convert the %cp-player-online-1-find% into cps= NAME //this will convert the %cp-player-online-1-find% into cps= NAME
assert material != null;
if (material.contains("%cp-player-online-")) { if (material.contains("%cp-player-online-")) {
int start = material.indexOf("%cp-player-online-"); int start = material.indexOf("%cp-player-online-");
int end = material.lastIndexOf("-find%"); int end = material.lastIndexOf("-find%");
@ -287,7 +286,7 @@ public class commandpanels extends JavaPlugin {
mat = "PLAYER_HEAD"; mat = "PLAYER_HEAD";
} }
s = new ItemStack(Material.matchMaterial(mat), 1); s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(mat)), 1);
if (!skullname.equals("no skull") && !skullname.equals("hdb") && !matskull.split("\\s")[0].equalsIgnoreCase("cpo=")) { if (!skullname.equals("no skull") && !skullname.equals("hdb") && !matskull.split("\\s")[0].equalsIgnoreCase("cpo=")) {
try { try {
@ -296,6 +295,7 @@ public class commandpanels extends JavaPlugin {
//if self/own //if self/own
meta = (SkullMeta) s.getItemMeta(); meta = (SkullMeta) s.getItemMeta();
try { try {
assert meta != null;
meta.setOwningPlayer(Bukkit.getOfflinePlayer(UUID.fromString(skullname))); meta.setOwningPlayer(Bukkit.getOfflinePlayer(UUID.fromString(skullname)));
} catch (Exception var23) { } catch (Exception var23) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + this.config.getString("config.format.error") + " material: cps= self")); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + this.config.getString("config.format.error") + " material: cps= self"));
@ -313,7 +313,8 @@ public class commandpanels extends JavaPlugin {
} }
if (!skullname.equals("no skull") && matskull.split("\\s")[0].equalsIgnoreCase("cpo=")) { if (!skullname.equals("no skull") && matskull.split("\\s")[0].equalsIgnoreCase("cpo=")) {
SkullMeta cpoMeta = (SkullMeta) s.getItemMeta(); SkullMeta cpoMeta = (SkullMeta) s.getItemMeta();
cpoMeta.setOwningPlayer(Bukkit.getOfflinePlayer(Bukkit.getPlayer(matskull.split("\\s")[1]).getUniqueId())); assert cpoMeta != null;
cpoMeta.setOwningPlayer(Bukkit.getOfflinePlayer(Objects.requireNonNull(Bukkit.getPlayer(matskull.split("\\s")[1])).getUniqueId()));
s.setItemMeta(cpoMeta); s.setItemMeta(cpoMeta);
} }
@ -336,14 +337,16 @@ public class commandpanels extends JavaPlugin {
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted")) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted")) {
try { try {
ItemMeta EnchantMeta; ItemMeta EnchantMeta;
if (pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted").trim().equalsIgnoreCase("true")) { if (Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted")).trim().equalsIgnoreCase("true")) {
EnchantMeta = s.getItemMeta(); EnchantMeta = s.getItemMeta();
assert EnchantMeta != null;
EnchantMeta.addEnchant(Enchantment.KNOCKBACK, 1, false); EnchantMeta.addEnchant(Enchantment.KNOCKBACK, 1, false);
EnchantMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); EnchantMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
s.setItemMeta(EnchantMeta); s.setItemMeta(EnchantMeta);
} else if (!pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted").trim().equalsIgnoreCase("false")) { } else if (!Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted")).trim().equalsIgnoreCase("false")) {
EnchantMeta = s.getItemMeta(); EnchantMeta = s.getItemMeta();
EnchantMeta.addEnchant(Enchantment.getByKey(NamespacedKey.minecraft(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted").split("\\s")[0].toLowerCase())), Integer.parseInt(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted").split("\\s")[1]), true); assert EnchantMeta != null;
EnchantMeta.addEnchant(Objects.requireNonNull(Enchantment.getByKey(NamespacedKey.minecraft(Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted")).split("\\s")[0].toLowerCase()))), Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".enchanted")).split("\\s")[1]), true);
s.setItemMeta(EnchantMeta); s.setItemMeta(EnchantMeta);
} }
} catch (Exception ench) { } catch (Exception ench) {
@ -353,7 +356,8 @@ public class commandpanels extends JavaPlugin {
} }
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".customdata")) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".customdata")) {
ItemMeta customMeta = s.getItemMeta(); ItemMeta customMeta = s.getItemMeta();
customMeta.setCustomModelData(Integer.parseInt(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".customdata"))); assert customMeta != null;
customMeta.setCustomModelData(Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".customdata"))));
s.setItemMeta(customMeta); s.setItemMeta(customMeta);
} }
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".leatherarmor")) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".leatherarmor")) {
@ -362,8 +366,10 @@ public class commandpanels extends JavaPlugin {
if (s.getType() == Material.LEATHER_BOOTS || s.getType() == Material.LEATHER_LEGGINGS || s.getType() == Material.LEATHER_CHESTPLATE || s.getType() == Material.LEATHER_HELMET) { if (s.getType() == Material.LEATHER_BOOTS || s.getType() == Material.LEATHER_LEGGINGS || s.getType() == Material.LEATHER_CHESTPLATE || s.getType() == Material.LEATHER_HELMET) {
LeatherArmorMeta leatherMeta = (LeatherArmorMeta) s.getItemMeta(); LeatherArmorMeta leatherMeta = (LeatherArmorMeta) s.getItemMeta();
String colourCode = pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".leatherarmor"); String colourCode = pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".leatherarmor");
assert colourCode != null;
if (!colourCode.contains(",")) { if (!colourCode.contains(",")) {
//use a color name //use a color name
assert leatherMeta != null;
leatherMeta.setColor(colourCodes.get(colourCode.toUpperCase())); leatherMeta.setColor(colourCodes.get(colourCode.toUpperCase()));
} else { } else {
//use RGB sequence //use RGB sequence
@ -373,6 +379,7 @@ public class commandpanels extends JavaPlugin {
colorRGB[count] = Integer.parseInt(colourNum); colorRGB[count] = Integer.parseInt(colourNum);
count += 1; count += 1;
} }
assert leatherMeta != null;
leatherMeta.setColor(Color.fromRGB(colorRGB[0], colorRGB[1], colorRGB[2])); leatherMeta.setColor(Color.fromRGB(colorRGB[0], colorRGB[1], colorRGB[2]));
} }
s.setItemMeta(leatherMeta); s.setItemMeta(leatherMeta);
@ -388,8 +395,10 @@ public class commandpanels extends JavaPlugin {
try { try {
PotionMeta potionMeta = (PotionMeta)s.getItemMeta(); PotionMeta potionMeta = (PotionMeta)s.getItemMeta();
String effectType = pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".potion"); String effectType = pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".potion");
assert potionMeta != null;
assert effectType != null;
potionMeta.setBasePotionData(new PotionData(PotionType.valueOf(effectType.toUpperCase()))); potionMeta.setBasePotionData(new PotionData(PotionType.valueOf(effectType.toUpperCase())));
potionMeta.addItemFlags(new ItemFlag[]{ItemFlag.HIDE_POTION_EFFECTS}); potionMeta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS);
s.setItemMeta(potionMeta); s.setItemMeta(potionMeta);
} catch (Exception er) { } catch (Exception er) {
//don't add the effect //don't add the effect
@ -399,16 +408,12 @@ public class commandpanels extends JavaPlugin {
} }
if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".stack")) { if (pconfig.contains("panels." + panels + ".item." + item.split("\\s")[c] + section + ".stack")) {
//change the stack amount //change the stack amount
s.setAmount(Integer.parseInt(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".stack"))); s.setAmount(Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".stack"))));
} }
} catch (IllegalArgumentException var33) { } catch (IllegalArgumentException | NullPointerException var33) {
debug(var33); debug(var33);
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " material: " + pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".material")))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " material: " + pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".material"))));
return null; return null;
} catch (NullPointerException var34) {
debug(var34);
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " material: " + pconfig.getString("panels." + panels + ".item." + item.split("\\s")[c] + section + ".material"))));
return null;
} }
if (onOpen != 3) { if (onOpen != 3) {
if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { if (this.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
@ -430,8 +435,8 @@ public class commandpanels extends JavaPlugin {
} }
} }
} }
if (pconfig.contains("panels." + panels + ".empty") && !pconfig.getString("panels." + panels + ".empty").equals("AIR")) { if (pconfig.contains("panels." + panels + ".empty") && !Objects.equals(pconfig.getString("panels." + panels + ".empty"), "AIR")) {
for (c = 0; Integer.parseInt(pconfig.getString("panels." + panels + ".rows")) * 9 - 1 >= c; ++c) { for (c = 0; Integer.parseInt(Objects.requireNonNull(pconfig.getString("panels." + panels + ".rows"))) * 9 - 1 >= c; ++c) {
boolean found = false; boolean found = false;
if(!item.equals("")) { if(!item.equals("")) {
for (int f = 0; item.split("\\s").length - 1 >= f; ++f) { for (int f = 0; item.split("\\s").length - 1 >= f; ++f) {
@ -439,27 +444,22 @@ public class commandpanels extends JavaPlugin {
found = true; found = true;
} }
} }
}else{
found = false;
} }
if (!found) { if (!found) {
ItemStack empty; ItemStack empty;
try { try {
empty = new ItemStack(Material.matchMaterial(pconfig.getString("panels." + panels + ".empty").toUpperCase()), 1); empty = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(pconfig.getString("panels." + panels + ".empty")).toUpperCase())), 1);
if (empty.getType() == Material.AIR) { if (empty.getType() == Material.AIR) {
continue; continue;
} }
} catch (IllegalArgumentException var26) { } catch (IllegalArgumentException | NullPointerException var26) {
debug(var26); debug(var26);
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " empty: " + pconfig.getString("panels." + panels + ".empty")))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " empty: " + pconfig.getString("panels." + panels + ".empty"))));
return null; return null;
} catch (NullPointerException var27) {
debug(var27);
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " empty: " + pconfig.getString("panels." + panels + ".empty"))));
return null;
} }
ItemMeta renamedMeta = empty.getItemMeta(); ItemMeta renamedMeta = empty.getItemMeta();
assert renamedMeta != null;
renamedMeta.setDisplayName(" "); renamedMeta.setDisplayName(" ");
empty.setItemMeta(renamedMeta); empty.setItemMeta(renamedMeta);
if (onOpen != 3) { if (onOpen != 3) {
@ -469,23 +469,23 @@ public class commandpanels extends JavaPlugin {
} }
} }
} }
if (ChatColor.translateAlternateColorCodes('&', pconfig.getString("panels." + panels + ".title")).equals("Chest")) { if (ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(pconfig.getString("panels." + panels + ".title"))).equals("Chest")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot be named Chest"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot be named Chest")));
return null; return null;
} }
if (ChatColor.translateAlternateColorCodes('&', pconfig.getString("panels." + panels + ".title")).contains("Editing Panel:")) { if (ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(pconfig.getString("panels." + panels + ".title"))).contains("Editing Panel:")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot contain Editing Panel:"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot contain Editing Panel:")));
return null; return null;
} }
if (ChatColor.translateAlternateColorCodes('&', pconfig.getString("panels." + panels + ".title")).contains("Panel Settings:")) { if (ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(pconfig.getString("panels." + panels + ".title"))).contains("Panel Settings:")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot contain Panel Settings:"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot contain Panel Settings:")));
return null; return null;
} }
if (ChatColor.translateAlternateColorCodes('&', pconfig.getString("panels." + panels + ".title")).contains("Item Settings:")) { if (ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(pconfig.getString("panels." + panels + ".title"))).contains("Item Settings:")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot contain Item Settings:"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot contain Item Settings:")));
return null; return null;
} }
if (ChatColor.translateAlternateColorCodes('&', pconfig.getString("panels." + panels + ".title")).equals("Command Panels Editor")) { if (ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(pconfig.getString("panels." + panels + ".title"))).equals("Command Panels Editor")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot be named Command Panels Editor"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + papi(p, this.config.getString("config.format.error") + " Title: Cannot be named Command Panels Editor")));
return null; return null;
} }
@ -514,7 +514,8 @@ public class commandpanels extends JavaPlugin {
customName = papi(p, setCpPlaceholders(p, customName)); customName = papi(p, setCpPlaceholders(p, customName));
} }
renamedMeta.addItemFlags(new ItemFlag[]{ItemFlag.HIDE_ATTRIBUTES}); assert renamedMeta != null;
renamedMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
if (customName != null) { if (customName != null) {
renamedMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', customName)); renamedMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', customName));
} }
@ -530,21 +531,18 @@ public class commandpanels extends JavaPlugin {
renamedMeta.setLore(clore); renamedMeta.setLore(clore);
} }
renamed.setItemMeta(renamedMeta); renamed.setItemMeta(renamedMeta);
} catch (Exception var11) { } catch (Exception ignored) {
} }
} }
private boolean setupEconomy() { private void setupEconomy() {
if (this.getServer().getPluginManager().getPlugin("Vault") == null) { if (this.getServer().getPluginManager().getPlugin("Vault") == null) {
return false;
} else { } else {
RegisteredServiceProvider<Economy> rsp = this.getServer().getServicesManager().getRegistration(Economy.class); RegisteredServiceProvider<Economy> rsp = this.getServer().getServicesManager().getRegistration(Economy.class);
if (rsp == null) { if (rsp == null) {
return false;
} else { } else {
this.econ = (Economy) rsp.getProvider(); this.econ = (Economy) rsp.getProvider();
return this.econ != null;
} }
} }
} }
@ -561,6 +559,7 @@ public class commandpanels extends JavaPlugin {
if (var0.getType().equals(Material.PLAYER_HEAD) && var0.hasItemMeta()) { if (var0.getType().equals(Material.PLAYER_HEAD) && var0.hasItemMeta()) {
try { try {
SkullMeta var1 = (SkullMeta) var0.getItemMeta(); SkullMeta var1 = (SkullMeta) var0.getItemMeta();
assert var1 != null;
if (!var1.hasOwner()) { if (!var1.hasOwner()) {
Field var2 = var1.getClass().getDeclaredField("profile"); Field var2 = var1.getClass().getDeclaredField("profile");
var2.setAccessible(true); var2.setAccessible(true);
@ -585,14 +584,13 @@ public class commandpanels extends JavaPlugin {
propertyMap.put("textures", new Property("textures", b64stringtexture)); propertyMap.put("textures", new Property("textures", b64stringtexture));
ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1); ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1);
ItemMeta headMeta = head.getItemMeta(); ItemMeta headMeta = head.getItemMeta();
assert headMeta != null;
Class headMetaClass = headMeta.getClass(); Class headMetaClass = headMeta.getClass();
try { try {
getField(headMetaClass, "profile", GameProfile.class, 0).set(headMeta, profile); getField(headMetaClass, "profile", GameProfile.class, 0).set(headMeta, profile);
} catch (IllegalArgumentException var10) { } catch (IllegalArgumentException | IllegalAccessException var10) {
var10.printStackTrace(); debug(var10);
} catch (IllegalAccessException var11) {
var11.printStackTrace();
} }
head.setItemMeta(headMeta); head.setItemMeta(headMeta);
@ -604,8 +602,7 @@ public class commandpanels extends JavaPlugin {
Field[] var4 = target.getDeclaredFields(); Field[] var4 = target.getDeclaredFields();
int var5 = var4.length; int var5 = var4.length;
for (int var6 = 0; var6 < var5; ++var6) { for (Field field : var4) {
Field field = var4[var6];
if ((name == null || field.getName().equals(name)) && fieldType.isAssignableFrom(field.getType()) && index-- <= 0) { if ((name == null || field.getName().equals(name)) && fieldType.isAssignableFrom(field.getType()) && index-- <= 0) {
field.setAccessible(true); field.setAccessible(true);
return field; return field;
@ -636,6 +633,7 @@ public class commandpanels extends JavaPlugin {
out.writeUTF("Connect"); out.writeUTF("Connect");
out.writeUTF(command.split("\\s")[1]); out.writeUTF(command.split("\\s")[1]);
Player player = Bukkit.getPlayerExact(p.getName()); Player player = Bukkit.getPlayerExact(p.getName());
assert player != null;
player.sendPluginMessage(this, "BungeeCord", out.toByteArray()); player.sendPluginMessage(this, "BungeeCord", out.toByteArray());
} else if (command.split("\\s")[0].equalsIgnoreCase("op=")) { } else if (command.split("\\s")[0].equalsIgnoreCase("op=")) {
//if player uses op= it will perform command as op //if player uses op= it will perform command as op
@ -670,11 +668,14 @@ public class commandpanels extends JavaPlugin {
if (econ != null) { if (econ != null) {
if (econ.getBalance(p) >= Double.parseDouble(command.split("\\s")[1])) { if (econ.getBalance(p) >= Double.parseDouble(command.split("\\s")[1])) {
econ.withdrawPlayer(p, Double.parseDouble(command.split("\\s")[1])); econ.withdrawPlayer(p, Double.parseDouble(command.split("\\s")[1]));
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.bought").replaceAll("%cp-args%", command.split("\\s")[1]))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.bought")).isEmpty()){
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.bought")).replaceAll("%cp-args%", command.split("\\s")[1])));
}
if (p.getInventory().firstEmpty() >= 0) { if (p.getInventory().firstEmpty() >= 0) {
p.getInventory().addItem(new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3]))); p.getInventory().addItem(new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])));
} else { } else {
p.getLocation().getWorld().dropItemNaturally(p.getLocation(), new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3]))); Objects.requireNonNull(p.getLocation().getWorld()).dropItemNaturally(p.getLocation(), new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])));
} }
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney")));
@ -695,14 +696,18 @@ public class commandpanels extends JavaPlugin {
try { try {
if (this.getServer().getPluginManager().isPluginEnabled("TokenManager")) { if (this.getServer().getPluginManager().isPluginEnabled("TokenManager")) {
TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager"); TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager");
assert api != null;
int balance = Integer.parseInt(Long.toString(api.getTokens(p).orElse(0))); int balance = Integer.parseInt(Long.toString(api.getTokens(p).orElse(0)));
if (balance >= Double.parseDouble(command.split("\\s")[1])) { if (balance >= Double.parseDouble(command.split("\\s")[1])) {
api.removeTokens(p, Long.parseLong(command.split("\\s")[1])); api.removeTokens(p, Long.parseLong(command.split("\\s")[1]));
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.bought").replaceAll("%cp-args%", command.split("\\s")[1]))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.bought")).isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.bought")).replaceAll("%cp-args%", command.split("\\s")[1])));
}
if (p.getInventory().firstEmpty() >= 0) { if (p.getInventory().firstEmpty() >= 0) {
p.getInventory().addItem(new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3]))); p.getInventory().addItem(new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])));
} else { } else {
p.getLocation().getWorld().dropItemNaturally(p.getLocation(), new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3]))); Objects.requireNonNull(p.getLocation().getWorld()).dropItemNaturally(p.getLocation(), new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])));
} }
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney")));
@ -757,6 +762,7 @@ public class commandpanels extends JavaPlugin {
}*/ }*/
if (!potion.equals("false")) { if (!potion.equals("false")) {
PotionMeta potionMeta = (PotionMeta) itm.getItemMeta(); PotionMeta potionMeta = (PotionMeta) itm.getItemMeta();
assert potionMeta != null;
if (!potionMeta.getBasePotionData().getType().name().equalsIgnoreCase(potion)) { if (!potionMeta.getBasePotionData().getType().name().equalsIgnoreCase(potion)) {
p.sendMessage(papi(p, tag + ChatColor.RED + "Your item has the wrong potion effect")); p.sendMessage(papi(p, tag + ChatColor.RED + "Your item has the wrong potion effect"));
return; return;
@ -766,8 +772,8 @@ public class commandpanels extends JavaPlugin {
//skip unless debug enabled //skip unless debug enabled
debug(exc); debug(exc);
} }
if (itm.getAmount() >= new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3])).getAmount()) { if (itm.getAmount() >= new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])).getAmount()) {
int amt = itm.getAmount() - new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3])).getAmount(); int amt = itm.getAmount() - new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])).getAmount();
itm.setAmount(amt); itm.setAmount(amt);
p.getInventory().setItem(f, amt > 0 ? itm : null); p.getInventory().setItem(f, amt > 0 ? itm : null);
econ.depositPlayer(p, Double.parseDouble(command.split("\\s")[1])); econ.depositPlayer(p, Double.parseDouble(command.split("\\s")[1]));
@ -777,10 +783,13 @@ public class commandpanels extends JavaPlugin {
} }
} }
} }
if (sold == false) { if (!sold) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needitems"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needitems")));
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.sold").replaceAll("%cp-args%", command.split("\\s")[1]))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.sold")).isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.sold")).replaceAll("%cp-args%", command.split("\\s")[1])));
}
} }
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + ChatColor.RED + "Selling Requires Vault and an Economy to work!")); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + ChatColor.RED + "Selling Requires Vault and an Economy to work!"));
@ -813,6 +822,7 @@ public class commandpanels extends JavaPlugin {
try { try {
if (!potion.equals("false")) { if (!potion.equals("false")) {
PotionMeta potionMeta = (PotionMeta) itm.getItemMeta(); PotionMeta potionMeta = (PotionMeta) itm.getItemMeta();
assert potionMeta != null;
if (!potionMeta.getBasePotionData().getType().name().equalsIgnoreCase(potion)) { if (!potionMeta.getBasePotionData().getType().name().equalsIgnoreCase(potion)) {
p.sendMessage(papi(p, tag + ChatColor.RED + "Your item has the wrong potion effect")); p.sendMessage(papi(p, tag + ChatColor.RED + "Your item has the wrong potion effect"));
return; return;
@ -822,11 +832,12 @@ public class commandpanels extends JavaPlugin {
//skip if it cannot do unless debug is enabled //skip if it cannot do unless debug is enabled
debug(exc); debug(exc);
} }
if (itm.getAmount() >= new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3])).getAmount()) { if (itm.getAmount() >= new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])).getAmount()) {
int amt = itm.getAmount() - new ItemStack(Material.matchMaterial(command.split("\\s")[2]), Integer.parseInt(command.split("\\s")[3])).getAmount(); int amt = itm.getAmount() - new ItemStack(Objects.requireNonNull(Material.matchMaterial(command.split("\\s")[2])), Integer.parseInt(command.split("\\s")[3])).getAmount();
itm.setAmount(amt); itm.setAmount(amt);
p.getInventory().setItem(f, amt > 0 ? itm : null); p.getInventory().setItem(f, amt > 0 ? itm : null);
econ.depositPlayer(p, Double.parseDouble(command.split("\\s")[1])); econ.depositPlayer(p, Double.parseDouble(command.split("\\s")[1]));
assert api != null;
api.addTokens(p, Long.parseLong(command.split("\\s")[1])); api.addTokens(p, Long.parseLong(command.split("\\s")[1]));
sold = true; sold = true;
p.updateInventory(); p.updateInventory();
@ -834,10 +845,13 @@ public class commandpanels extends JavaPlugin {
} }
} }
} }
if (sold == false) { if (!sold) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needitems"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needitems")));
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.sold").replaceAll("%cp-args%", command.split("\\s")[1]))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.sold")).isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.sold")).replaceAll("%cp-args%", command.split("\\s")[1])));
}
} }
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + ChatColor.RED + "Selling Requires TokenManager to work!")); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + ChatColor.RED + "Selling Requires TokenManager to work!"));
@ -870,6 +884,7 @@ public class commandpanels extends JavaPlugin {
try { try {
if (this.getServer().getPluginManager().isPluginEnabled("TokenManager")) { if (this.getServer().getPluginManager().isPluginEnabled("TokenManager")) {
TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager"); TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager");
assert api != null;
int balance = Integer.parseInt(Long.toString(api.getTokens(p).orElse(0))); int balance = Integer.parseInt(Long.toString(api.getTokens(p).orElse(0)));
if (balance >= Double.parseDouble(command.split("\\s")[1])) { if (balance >= Double.parseDouble(command.split("\\s")[1])) {
api.removeTokens(p, Long.parseLong(command.split("\\s")[1])); api.removeTokens(p, Long.parseLong(command.split("\\s")[1]));
@ -879,7 +894,10 @@ public class commandpanels extends JavaPlugin {
String price = commandp.split(" ", 2)[0]; String price = commandp.split(" ", 2)[0];
commandp = commandp.split(" ", 2)[1]; commandp = commandp.split(" ", 2)[1];
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', papi(p, commandp))); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', papi(p, commandp)));
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.bought").replaceAll("%cp-args%", price))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.bought")).isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.bought")).replaceAll("%cp-args%", price)));
}
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney")));
} }
@ -906,7 +924,10 @@ public class commandpanels extends JavaPlugin {
String price = commandp.split(" ", 2)[0]; String price = commandp.split(" ", 2)[0];
commandp = commandp.split(" ", 2)[1]; commandp = commandp.split(" ", 2)[1];
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', papi(p, commandp))); Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', papi(p, commandp)));
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.bought").replaceAll("%cp-args%", price))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.bought")).isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.bought")).replaceAll("%cp-args%", price)));
}
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney")));
} }
@ -944,6 +965,7 @@ public class commandpanels extends JavaPlugin {
x = Float.parseFloat(papi(p, command.split("\\s")[1])); x = Float.parseFloat(papi(p, command.split("\\s")[1]));
y = Float.parseFloat(papi(p, command.split("\\s")[2])); y = Float.parseFloat(papi(p, command.split("\\s")[2]));
z = Float.parseFloat(papi(p, command.split("\\s")[3])); z = Float.parseFloat(papi(p, command.split("\\s")[3]));
assert otherplayer != null;
otherplayer.teleport(new Location(otherplayer.getWorld(), x, y, z)); otherplayer.teleport(new Location(otherplayer.getWorld(), x, y, z));
} catch (Exception tpe) { } catch (Exception tpe) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.notitem"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.notitem")));
@ -981,7 +1003,7 @@ public class commandpanels extends JavaPlugin {
String playerLocation = str.substring(start, end).replace("%cp-player-online-", ""); String playerLocation = str.substring(start, end).replace("%cp-player-online-", "");
Player[] playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().size()]); Player[] playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().size()]);
if (Integer.parseInt(playerLocation) > playerFind.length) { if (Integer.parseInt(playerLocation) > playerFind.length) {
str = str.replace(str.substring(start, end) + "-find%", papi(p, ChatColor.translateAlternateColorCodes('&', config.getString("config.format.offline")))); str = str.replace(str.substring(start, end) + "-find%", papi(p, ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(config.getString("config.format.offline")))));
} else { } else {
str = str.replace(str.substring(start, end) + "-find%", playerFind[Integer.parseInt(playerLocation) - 1].getName()); str = str.replace(str.substring(start, end) + "-find%", playerFind[Integer.parseInt(playerLocation) - 1].getName());
} }
@ -995,6 +1017,7 @@ public class commandpanels extends JavaPlugin {
} }
if (this.getServer().getPluginManager().isPluginEnabled("TokenManager")) { if (this.getServer().getPluginManager().isPluginEnabled("TokenManager")) {
TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager"); TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager");
assert api != null;
str = str.replaceAll("%cp-tokenmanager-balance%", Long.toString(api.getTokens(p).orElse(0))); str = str.replaceAll("%cp-tokenmanager-balance%", Long.toString(api.getTokens(p).orElse(0)));
} }
if (this.getServer().getPluginManager().isPluginEnabled("VotingPlugin")) { if (this.getServer().getPluginManager().isPluginEnabled("VotingPlugin")) {
@ -1010,7 +1033,7 @@ public class commandpanels extends JavaPlugin {
userInputStrings.add(new String[]{p.getName(), str}); userInputStrings.add(new String[]{p.getName(), str});
List<String> inputMessages = new ArrayList<String>(config.getStringList("config.input-message")); List<String> inputMessages = new ArrayList<String>(config.getStringList("config.input-message"));
for (String temp : inputMessages) { for (String temp : inputMessages) {
temp = temp.replaceAll("%cp-args%", config.getString("config.input-cancel")); temp = temp.replaceAll("%cp-args%", Objects.requireNonNull(config.getString("config.input-cancel")));
temp = temp.replaceAll("%cp-tag%", tag); temp = temp.replaceAll("%cp-tag%", tag);
p.sendMessage(ChatColor.translateAlternateColorCodes('&', papi(p, temp))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', papi(p, temp)));
} }
@ -1028,7 +1051,10 @@ public class commandpanels extends JavaPlugin {
if (econ != null) { if (econ != null) {
if (econ.getBalance(p) >= Double.parseDouble(command.split("\\s")[1])) { if (econ.getBalance(p) >= Double.parseDouble(command.split("\\s")[1])) {
econ.withdrawPlayer(p, Double.parseDouble(command.split("\\s")[1])); econ.withdrawPlayer(p, Double.parseDouble(command.split("\\s")[1]));
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.bought").replaceAll("%cp-args%", command.split("\\s")[1]))); //if the message is empty don't send
if(!config.getString("config.format.bought").isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.bought")).replaceAll("%cp-args%", command.split("\\s")[1])));
}
return 1; return 1;
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney")));
@ -1048,10 +1074,14 @@ public class commandpanels extends JavaPlugin {
try { try {
if (getServer().getPluginManager().isPluginEnabled("TokenManager")) { if (getServer().getPluginManager().isPluginEnabled("TokenManager")) {
TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager"); TokenManager api = (TokenManager) Bukkit.getServer().getPluginManager().getPlugin("TokenManager");
assert api != null;
int balance = Integer.parseInt(Long.toString(api.getTokens(p).orElse(0))); int balance = Integer.parseInt(Long.toString(api.getTokens(p).orElse(0)));
if (balance >= Double.parseDouble(command.split("\\s")[1])) { if (balance >= Double.parseDouble(command.split("\\s")[1])) {
api.removeTokens(p, Long.parseLong(command.split("\\s")[1])); api.removeTokens(p, Long.parseLong(command.split("\\s")[1]));
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.bought").replaceAll("%cp-args%", command.split("\\s")[1]))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.bought")).isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.bought")).replaceAll("%cp-args%", command.split("\\s")[1])));
}
return 1; return 1;
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney")));
@ -1072,7 +1102,10 @@ public class commandpanels extends JavaPlugin {
int balance = p.getLevel(); int balance = p.getLevel();
if (balance >= Integer.parseInt(command.split("\\s")[1])) { if (balance >= Integer.parseInt(command.split("\\s")[1])) {
p.setLevel(p.getLevel() - Integer.parseInt(command.split("\\s")[1])); p.setLevel(p.getLevel() - Integer.parseInt(command.split("\\s")[1]));
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.bought").replaceAll("%cp-args%", command.split("\\s")[1]))); //if the message is empty don't send
if(!Objects.requireNonNull(config.getString("config.format.bought")).isEmpty()) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + Objects.requireNonNull(config.getString("config.format.bought")).replaceAll("%cp-args%", command.split("\\s")[1])));
}
return 1; return 1;
} else { } else {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + config.getString("config.format.needmoney")));
@ -1093,9 +1126,9 @@ public class commandpanels extends JavaPlugin {
panelFiles.clear(); panelFiles.clear();
panelNames.clear(); panelNames.clear();
int count = 0; int count = 0;
for (String fileName : Arrays.asList(panelsf.list())) { for (String fileName : Objects.requireNonNull(panelsf.list())) {
panelFiles.add(YamlConfiguration.loadConfiguration(new File(panelsf + File.separator + fileName))); panelFiles.add(YamlConfiguration.loadConfiguration(new File(panelsf + File.separator + fileName)));
for (String tempName : panelFiles.get(count).getConfigurationSection("panels").getKeys(false)) { for (String tempName : Objects.requireNonNull(panelFiles.get(count).getConfigurationSection("panels")).getKeys(false)) {
panelNames.add(new String[]{tempName, Integer.toString(count)}); panelNames.add(new String[]{tempName, Integer.toString(count)});
} }
count += 1; count += 1;
@ -1168,12 +1201,12 @@ public class commandpanels extends JavaPlugin {
if (!checkPanels(temp)) { if (!checkPanels(temp)) {
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext(); ) { for (String s : Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false)) {
key = (String) var10.next(); key = s;
panelNames.add(ChatColor.translateAlternateColorCodes('&', key)); panelNames.add(ChatColor.translateAlternateColorCodes('&', key));
panelTitles.add(ChatColor.translateAlternateColorCodes('&', temp.getString("panels." + key + ".title"))); panelTitles.add(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(temp.getString("panels." + key + ".title"))));
if (temp.contains("panels." + key + ".open-with-item.material")) { if (temp.contains("panels." + key + ".open-with-item.material")) {
panelItems.add(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material"))); panelItems.add(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material"))));
} else { } else {
panelItems.add(Material.FILLED_MAP); panelItems.add(Material.FILLED_MAP);
} }
@ -1187,7 +1220,7 @@ public class commandpanels extends JavaPlugin {
int pageNumber = 1; int pageNumber = 1;
if (p.getOpenInventory().getTitle().equals("Command Panels Editor")) { if (p.getOpenInventory().getTitle().equals("Command Panels Editor")) {
pageNumber = Integer.parseInt(ChatColor.stripColor(p.getOpenInventory().getItem(49).getItemMeta().getDisplayName()).replace("Page ", "")); pageNumber = Integer.parseInt(ChatColor.stripColor(Objects.requireNonNull(Objects.requireNonNull(p.getOpenInventory().getItem(49)).getItemMeta()).getDisplayName()).replace("Page ", ""));
} }
//will add the difference //will add the difference
pageNumber = pageNumber + pageChange; pageNumber = pageNumber + pageChange;
@ -1254,7 +1287,6 @@ public class commandpanels extends JavaPlugin {
} }
//make all the items //make all the items
temp = new ItemStack(Material.WRITABLE_BOOK, 1); temp = new ItemStack(Material.WRITABLE_BOOK, 1);
lore.clear();
lore.add(ChatColor.GRAY + "Permission required to open panel"); lore.add(ChatColor.GRAY + "Permission required to open panel");
lore.add(ChatColor.GRAY + "commandpanel.panel.[insert]"); lore.add(ChatColor.GRAY + "commandpanel.panel.[insert]");
if (cf.contains("panels." + panelName + ".perm")) { if (cf.contains("panels." + panelName + ".perm")) {
@ -1279,7 +1311,7 @@ public class commandpanels extends JavaPlugin {
lore.add(ChatColor.GRAY + "Sound when opening panel"); lore.add(ChatColor.GRAY + "Sound when opening panel");
if (cf.contains("panels." + panelName + ".sound-on-open")) { if (cf.contains("panels." + panelName + ".sound-on-open")) {
lore.add(ChatColor.WHITE + "------------------------"); lore.add(ChatColor.WHITE + "------------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".sound-on-open").toUpperCase()); lore.add(ChatColor.WHITE + Objects.requireNonNull(cf.getString("panels." + panelName + ".sound-on-open")).toUpperCase());
} }
setName(temp, ChatColor.WHITE + "Panel Sound", lore, p,true); setName(temp, ChatColor.WHITE + "Panel Sound", lore, p,true);
i.setItem(5, temp); i.setItem(5, temp);
@ -1312,7 +1344,7 @@ public class commandpanels extends JavaPlugin {
lore.add(ChatColor.GRAY + "Fill empty slots with an item"); lore.add(ChatColor.GRAY + "Fill empty slots with an item");
if (cf.contains("panels." + panelName + ".empty")) { if (cf.contains("panels." + panelName + ".empty")) {
lore.add(ChatColor.WHITE + "-----------------------"); lore.add(ChatColor.WHITE + "-----------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".empty").toUpperCase()); lore.add(ChatColor.WHITE + Objects.requireNonNull(cf.getString("panels." + panelName + ".empty")).toUpperCase());
} }
setName(temp, ChatColor.WHITE + "Panel Empty Item", lore, p,true); setName(temp, ChatColor.WHITE + "Panel Empty Item", lore, p,true);
i.setItem(13, temp); i.setItem(13, temp);
@ -1363,10 +1395,9 @@ public class commandpanels extends JavaPlugin {
} }
//make all the items //make all the items
temp = new ItemStack(Material.NAME_TAG, 1); temp = new ItemStack(Material.NAME_TAG, 1);
lore.clear();
lore.add(ChatColor.GRAY + "Display name of the item in the Panel"); lore.add(ChatColor.GRAY + "Display name of the item in the Panel");
if (cf.contains("panels." + panelName + ".item." + itemNumber + ".name")) { if (cf.contains("panels." + panelName + ".item." + itemNumber + ".name")) {
if (!cf.getString("panels." + panelName + ".item." + itemNumber + ".name").equals("")) { if (!Objects.equals(cf.getString("panels." + panelName + ".item." + itemNumber + ".name"), "")) {
lore.add(ChatColor.WHITE + "--------------------------------"); lore.add(ChatColor.WHITE + "--------------------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".name")); lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".name"));
} }
@ -1394,7 +1425,7 @@ public class commandpanels extends JavaPlugin {
lore.clear(); lore.clear();
lore.add(ChatColor.GRAY + "Display enchantment of the item in the Panel"); lore.add(ChatColor.GRAY + "Display enchantment of the item in the Panel");
if (cf.contains("panels." + panelName + ".item." + itemNumber + ".enchanted")) { if (cf.contains("panels." + panelName + ".item." + itemNumber + ".enchanted")) {
if (!cf.getString("panels." + panelName + ".item." + itemNumber + ".name").equals("")) { if (!Objects.equals(cf.getString("panels." + panelName + ".item." + itemNumber + ".name"), "")) {
lore.add(ChatColor.WHITE + "--------------------------------"); lore.add(ChatColor.WHITE + "--------------------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".enchanted")); lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".enchanted"));
} }
@ -1409,7 +1440,7 @@ public class commandpanels extends JavaPlugin {
lore.clear(); lore.clear();
lore.add(ChatColor.GRAY + "Display potion effect of the item in the Panel"); lore.add(ChatColor.GRAY + "Display potion effect of the item in the Panel");
if (cf.contains("panels." + panelName + ".item." + itemNumber + ".potion")) { if (cf.contains("panels." + panelName + ".item." + itemNumber + ".potion")) {
if (!cf.getString("panels." + panelName + ".item." + itemNumber + ".potion").equals("")) { if (!Objects.equals(cf.getString("panels." + panelName + ".item." + itemNumber + ".potion"), "")) {
lore.add(ChatColor.WHITE + "--------------------------------"); lore.add(ChatColor.WHITE + "--------------------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".potion")); lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".potion"));
} }
@ -1437,10 +1468,10 @@ public class commandpanels extends JavaPlugin {
lore.clear(); lore.clear();
lore.add(ChatColor.GRAY + "How many of the item will be stacked"); lore.add(ChatColor.GRAY + "How many of the item will be stacked");
if (cf.contains("panels." + panelName + ".item." + itemNumber + ".stack")) { if (cf.contains("panels." + panelName + ".item." + itemNumber + ".stack")) {
if (!cf.getString("panels." + panelName + ".item." + itemNumber + ".stack").equals("")) { if (!Objects.equals(cf.getString("panels." + panelName + ".item." + itemNumber + ".stack"), "")) {
try { try {
temp.setAmount(Integer.parseInt(cf.getString("panels." + panelName + ".item." + itemNumber + ".stack"))); temp.setAmount(Integer.parseInt(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".stack"))));
} catch (Exception ex) { } catch (Exception ignored) {
} }
lore.add(ChatColor.WHITE + "--------------------------------"); lore.add(ChatColor.WHITE + "--------------------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".stack")); lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".stack"));
@ -1453,7 +1484,7 @@ public class commandpanels extends JavaPlugin {
lore.clear(); lore.clear();
lore.add(ChatColor.GRAY + "Add Custom Model Data here"); lore.add(ChatColor.GRAY + "Add Custom Model Data here");
if (cf.contains("panels." + panelName + ".item." + itemNumber + ".customdata")) { if (cf.contains("panels." + panelName + ".item." + itemNumber + ".customdata")) {
if (!cf.getString("panels." + panelName + ".item." + itemNumber + ".customdata").equals("")) { if (!Objects.equals(cf.getString("panels." + panelName + ".item." + itemNumber + ".customdata"), "")) {
lore.add(ChatColor.WHITE + "--------------------------------"); lore.add(ChatColor.WHITE + "--------------------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".customdata")); lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".customdata"));
} }
@ -1466,7 +1497,7 @@ public class commandpanels extends JavaPlugin {
lore.add(ChatColor.GRAY + "Choose a colour for the armor"); lore.add(ChatColor.GRAY + "Choose a colour for the armor");
lore.add(ChatColor.GRAY + "use r,g,b or a spigot API color"); lore.add(ChatColor.GRAY + "use r,g,b or a spigot API color");
if (cf.contains("panels." + panelName + ".item." + itemNumber + ".leatherarmor")) { if (cf.contains("panels." + panelName + ".item." + itemNumber + ".leatherarmor")) {
if (!cf.getString("panels." + panelName + ".item." + itemNumber + ".leatherarmor").equals("")) { if (!Objects.equals(cf.getString("panels." + panelName + ".item." + itemNumber + ".leatherarmor"), "")) {
lore.add(ChatColor.WHITE + "--------------------------------"); lore.add(ChatColor.WHITE + "--------------------------------");
lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".leatherarmor")); lore.add(ChatColor.WHITE + cf.getString("panels." + panelName + ".item." + itemNumber + ".leatherarmor"));
} }
@ -1478,12 +1509,13 @@ public class commandpanels extends JavaPlugin {
setName(temp, ChatColor.RED + "Back", null, p, true); setName(temp, ChatColor.RED + "Back", null, p, true);
i.setItem(27, temp); i.setItem(27, temp);
if(cf.getString("panels." + panelName + ".item." + itemNumber + ".material").startsWith("cps=")){ if(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")).startsWith("cps=")){
temp = new ItemStack(Material.PLAYER_HEAD, 1); temp = new ItemStack(Material.PLAYER_HEAD, 1);
if(cf.getString("panels." + panelName + ".item." + itemNumber + ".material").equalsIgnoreCase("cps= self")){ if(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")).equalsIgnoreCase("cps= self")){
//if self //if self
SkullMeta meta = (SkullMeta) temp.getItemMeta(); SkullMeta meta = (SkullMeta) temp.getItemMeta();
try { try {
assert meta != null;
meta.setOwningPlayer(Bukkit.getOfflinePlayer(p.getUniqueId())); meta.setOwningPlayer(Bukkit.getOfflinePlayer(p.getUniqueId()));
} catch (Exception var23) { } catch (Exception var23) {
debug(var23); debug(var23);
@ -1491,35 +1523,36 @@ public class commandpanels extends JavaPlugin {
temp.setItemMeta(meta); temp.setItemMeta(meta);
}else{ }else{
//custom head //custom head
temp = this.getItem(cf.getString("panels." + panelName + ".item." + itemNumber + ".material").replace("cps=", "").trim()); temp = this.getItem(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")).replace("cps=", "").trim());
} }
}else if (cf.getString("panels." + panelName + ".item." + itemNumber + ".material").startsWith("%cp-player-online-")){ }else if (Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")).startsWith("%cp-player-online-")){
//leave default for the find material tag //leave default for the find material tag
temp = new ItemStack(Material.PLAYER_HEAD, 1); temp = new ItemStack(Material.PLAYER_HEAD, 1);
}else if (cf.getString("panels." + panelName + ".item." + itemNumber + ".material").startsWith("hdb=")){ }else if (Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")).startsWith("hdb=")){
//head database head //head database head
temp = new ItemStack(Material.PLAYER_HEAD, 1); temp = new ItemStack(Material.PLAYER_HEAD, 1);
if (this.getServer().getPluginManager().isPluginEnabled("HeadDatabase")) { if (this.getServer().getPluginManager().isPluginEnabled("HeadDatabase")) {
HeadDatabaseAPI api; HeadDatabaseAPI api;
api = new HeadDatabaseAPI(); api = new HeadDatabaseAPI();
try { try {
temp = api.getItemHead(cf.getString("panels." + panelName + ".item." + itemNumber + ".material").replace("hdb=", "").trim()); temp = api.getItemHead(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")).replace("hdb=", "").trim());
} catch (Exception var22) { } catch (Exception var22) {
debug(var22); debug(var22);
} }
} }
}else{ }else{
temp = new ItemStack(Material.matchMaterial(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")), 1); temp = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".material")))), 1);
} }
try { try {
temp.setAmount(Integer.parseInt(cf.getString("panels." + panelName + ".item." + itemNumber + ".stack"))); temp.setAmount(Integer.parseInt(Objects.requireNonNull(cf.getString("panels." + panelName + ".item." + itemNumber + ".stack"))));
} catch (Exception ex) { } catch (Exception ex) {
//skip //skip
} }
if (cf.contains("panels." + panelName + ".item." + itemNumber + ".enchanted")) { if (cf.contains("panels." + panelName + ".item." + itemNumber + ".enchanted")) {
if (!cf.getString("panels." + panelName + ".item." + itemNumber + ".enchanted").equals("false")) { if (!Objects.equals(cf.getString("panels." + panelName + ".item." + itemNumber + ".enchanted"), "false")) {
ItemMeta EnchantMeta; ItemMeta EnchantMeta;
EnchantMeta = temp.getItemMeta(); EnchantMeta = temp.getItemMeta();
assert EnchantMeta != null;
EnchantMeta.addEnchant(Enchantment.KNOCKBACK, 1, true); EnchantMeta.addEnchant(Enchantment.KNOCKBACK, 1, true);
EnchantMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); EnchantMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
temp.setItemMeta(EnchantMeta); temp.setItemMeta(EnchantMeta);
@ -1537,8 +1570,7 @@ public class commandpanels extends JavaPlugin {
public Reader getReaderFromStream(InputStream initialStream) throws IOException { public Reader getReaderFromStream(InputStream initialStream) throws IOException {
//this reads the encrypted resource files in the jar file //this reads the encrypted resource files in the jar file
byte[] buffer = IOUtils.toByteArray(initialStream); byte[] buffer = IOUtils.toByteArray(initialStream);
Reader targetReader = new CharSequenceReader(new String(buffer)); return new CharSequenceReader(new String(buffer));
return targetReader;
} }
public void githubNewUpdate(){ public void githubNewUpdate(){

156
src/me/rockyhawk/commandPanels/utils.java
View File

@ -1,7 +1,6 @@
package me.rockyhawk.commandPanels; package me.rockyhawk.commandPanels;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import org.apache.commons.lang.ObjectUtils;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.*; import org.bukkit.block.*;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
@ -36,13 +35,14 @@ public class utils implements Listener {
for(String[] panelName : plugin.panelNames){ for(String[] panelName : plugin.panelNames){
YamlConfiguration tempFile = plugin.panelFiles.get(Integer.parseInt(panelName[1])); YamlConfiguration tempFile = plugin.panelFiles.get(Integer.parseInt(panelName[1]));
String tempName = panelName[0]; String tempName = panelName[0];
if(tempFile.contains("panels." + tempName + ".open-with-item") && e.getClickedInventory().getType() == InventoryType.PLAYER) { if(tempFile.contains("panels." + tempName + ".open-with-item") && Objects.requireNonNull(e.getClickedInventory()).getType() == InventoryType.PLAYER) {
try{ try{
if (clicked.getType() == new ItemStack(Material.matchMaterial(tempFile.getString("panels." + tempName + ".open-with-item.material")), 1).getType()) { assert clicked != null;
if ((ChatColor.translateAlternateColorCodes('&', clicked.getItemMeta().getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', tempFile.getString("panels." + tempName + ".open-with-item.name"))))) { if (clicked.getType() == new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(tempFile.getString("panels." + tempName + ".open-with-item.material")))), 1).getType()) {
if ((ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(clicked.getItemMeta()).getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(tempFile.getString("panels." + tempName + ".open-with-item.name")))))) {
//cancel the click item event //cancel the click item event
if (tempFile.contains("panels." + tempName + ".open-with-item.stationary")) { if (tempFile.contains("panels." + tempName + ".open-with-item.stationary")) {
if (e.getSlot() == Integer.parseInt(tempFile.getString("panels." + tempName + ".open-with-item.stationary"))) { if (e.getSlot() == Integer.parseInt(Objects.requireNonNull(tempFile.getString("panels." + tempName + ".open-with-item.stationary")))) {
e.setCancelled(true); e.setCancelled(true);
p.updateInventory(); p.updateInventory();
Bukkit.dispatchCommand(p, "commandpanels:commandpanel " + tempName); Bukkit.dispatchCommand(p, "commandpanels:commandpanel " + tempName);
@ -73,35 +73,35 @@ public class utils implements Listener {
//if the inventory is just a chest that has no panel //if the inventory is just a chest that has no panel
return; return;
} }
if (plugin.panelsf.list() == null || plugin.panelsf.list().length == 0) { if (plugin.panelsf.list() == null || Objects.requireNonNull(plugin.panelsf.list()).length == 0) {
//if no panels are present //if no panels are present
return; return;
} }
}catch(Exception b){ }catch(Exception b){
return; return;
} }
ArrayList<String> filenames = new ArrayList<String>(Arrays.asList(plugin.panelsf.list())); ArrayList<String> filenames = new ArrayList<String>(Arrays.asList(Objects.requireNonNull(plugin.panelsf.list())));
YamlConfiguration cf = null; //this is the file to use for any panel.* requests YamlConfiguration cf = null; //this is the file to use for any panel.* requests
String panel = null; String panel = null;
boolean foundPanel = false; boolean foundPanel = false;
for (int f = 0; filenames.size() > f; f++) { //will loop through all the files in folder for (String filename : filenames) { //will loop through all the files in folder
String key; String key;
YamlConfiguration temp; YamlConfiguration temp;
temp = YamlConfiguration.loadConfiguration(new File(plugin.panelsf + File.separator + filenames.get(f))); temp = YamlConfiguration.loadConfiguration(new File(plugin.panelsf + File.separator + filename));
if(!plugin.checkPanels(temp)){ if (!plugin.checkPanels(temp)) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + ": Syntax error Found or Missing certain element!"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&', tag + plugin.papi(p, plugin.config.getString("config.format.error") + ": Syntax error Found or Missing certain element!")));
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext();) { for (String s : Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false)) {
key = (String) var10.next(); key = s;
if(ChatColor.translateAlternateColorCodes('&',temp.getString("panels." + key + ".title")).equals(e.getView().getTitle())){ if (ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(temp.getString("panels." + key + ".title"))).equals(e.getView().getTitle())) {
panel = key; panel = key;
cf = YamlConfiguration.loadConfiguration(new File(plugin.panelsf + File.separator + filenames.get(f))); cf = YamlConfiguration.loadConfiguration(new File(plugin.panelsf + File.separator + filename));
foundPanel= true; foundPanel = true;
break; break;
} }
} }
if(foundPanel){ if (foundPanel) {
//this is to avoid the plugin to continue looking when it was already found //this is to avoid the plugin to continue looking when it was already found
break; break;
} }
@ -109,16 +109,16 @@ public class utils implements Listener {
if(panel == null){ if(panel == null){
return; return;
} }
if(ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&',cf.getString("panels." + panel + ".title"))).equals("Command Panels Editor")){ if(ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(cf.getString("panels." + panel + ".title")))).equals("Command Panels Editor")){
//cancel if it is the editor (this should never happen unless the user made a panel called Command Panels Editor for some reason) //cancel if it is the editor (this should never happen unless the user made a panel called Command Panels Editor for some reason)
return; return;
} }
if(e.getSlotType().equals(InventoryType.SlotType.CONTAINER) && e.getRawSlot() <= Integer.parseInt(cf.getString("panels." + panel + ".rows"))*9-1){ if(e.getSlotType().equals(InventoryType.SlotType.CONTAINER) && e.getRawSlot() <= Integer.parseInt(Objects.requireNonNull(cf.getString("panels." + panel + ".rows")))*9-1){
e.setCancelled(true); e.setCancelled(true);
p.updateInventory(); p.updateInventory();
//this loops through all the items in the panel //this loops through all the items in the panel
boolean foundSlot = false; boolean foundSlot = false;
for(String slot : cf.getConfigurationSection("panels."+panel+".item").getKeys(false)){ for(String slot : Objects.requireNonNull(cf.getConfigurationSection("panels." + panel + ".item")).getKeys(false)){
if(slot.equals(Integer.toString(e.getSlot()))){ if(slot.equals(Integer.toString(e.getSlot()))){
foundSlot = true; foundSlot = true;
} }
@ -131,7 +131,7 @@ public class utils implements Listener {
//loop through possible noperm/hasperm 1,2,3,etc //loop through possible noperm/hasperm 1,2,3,etc
if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasvalue")) { if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasvalue")) {
//loop through possible hasvalue 1,2,3,etc //loop through possible hasvalue 1,2,3,etc
for (int count = 0; cf.getConfigurationSection("panels." + panel + ".item." + e.getSlot()).getKeys(false).size() > count; count++) { for (int count = 0; Objects.requireNonNull(cf.getConfigurationSection("panels." + panel + ".item." + e.getSlot())).getKeys(false).size() > count; count++) {
if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasvalue" + count)) { if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasvalue" + count)) {
boolean outputValue = true; boolean outputValue = true;
//outputValue will default to true //outputValue will default to true
@ -163,7 +163,7 @@ public class utils implements Listener {
} }
} }
if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm") && cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm.perm")) { if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm") && cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm.perm")) {
for(int count = 0; cf.getConfigurationSection("panels." + panel + ".item." + e.getSlot()).getKeys(false).size() > count; count++){ for(int count = 0; Objects.requireNonNull(cf.getConfigurationSection("panels." + panel + ".item." + e.getSlot())).getKeys(false).size() > count; count++){
if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count) && cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".perm")) { if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count) && cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".perm")) {
boolean outputValue = true; boolean outputValue = true;
//outputValue will default to true //outputValue will default to true
@ -171,7 +171,7 @@ public class utils implements Listener {
//if output is true, and values match it will be this item, vice versa //if output is true, and values match it will be this item, vice versa
outputValue = cf.getBoolean("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".output"); outputValue = cf.getBoolean("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".output");
} }
if (p.hasPermission(cf.getString("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".perm")) == outputValue) { if (p.hasPermission(Objects.requireNonNull(cf.getString("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".perm"))) == outputValue) {
if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".commands") && !(clicked == null)) { if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm" + count + ".commands") && !(clicked == null)) {
section = ".hasperm" + count; section = ".hasperm" + count;
break; break;
@ -188,7 +188,7 @@ public class utils implements Listener {
//if output is true, and values match it will be this item, vice versa //if output is true, and values match it will be this item, vice versa
outputValue = cf.getBoolean("panels." + panel + ".item." + e.getSlot() + ".hasperm" + ".output"); outputValue = cf.getBoolean("panels." + panel + ".item." + e.getSlot() + ".hasperm" + ".output");
} }
if (p.hasPermission(cf.getString("panels." + panel + ".item." + e.getSlot() + ".hasperm.perm")) == outputValue) { if (p.hasPermission(Objects.requireNonNull(cf.getString("panels." + panel + ".item." + e.getSlot() + ".hasperm.perm"))) == outputValue) {
if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm.commands") && !(clicked == null)) { if (cf.contains("panels." + panel + ".item." + e.getSlot() + ".hasperm.commands") && !(clicked == null)) {
section = ".hasperm"; section = ".hasperm";
} else if (clicked != null) { } else if (clicked != null) {
@ -205,6 +205,7 @@ public class utils implements Listener {
} }
if(cf.contains("panels." + panel + ".item." + e.getSlot() + section + ".commands")) { if(cf.contains("panels." + panel + ".item." + e.getSlot() + section + ".commands")) {
List<String> commands = (List<String>) cf.getList("panels." + panel + ".item." + e.getSlot() + section + ".commands"); List<String> commands = (List<String>) cf.getList("panels." + panel + ".item." + e.getSlot() + section + ".commands");
assert commands != null;
if (commands.size() != 0) { if (commands.size() != 0) {
//this will replace a sequence tag command with the commands from the sequence //this will replace a sequence tag command with the commands from the sequence
List<String> commandsAfterSequence = commands; List<String> commandsAfterSequence = commands;
@ -213,11 +214,11 @@ public class utils implements Listener {
String locationOfSequence = commands.get(i).split("\\s")[1]; String locationOfSequence = commands.get(i).split("\\s")[1];
List<String> commandsSequence = (List<String>) cf.getList(locationOfSequence); List<String> commandsSequence = (List<String>) cf.getList(locationOfSequence);
commandsAfterSequence.remove(i); commandsAfterSequence.remove(i);
assert commandsSequence != null;
commandsAfterSequence.addAll(i,commandsSequence); commandsAfterSequence.addAll(i,commandsSequence);
} }
} }
commands = commandsAfterSequence; commands = commandsAfterSequence;
for (int i = 0; commands.size() - 1 >= i; i++) { for (int i = 0; commands.size() - 1 >= i; i++) {
try { try {
if (commands.get(i).split("\\s")[0].equalsIgnoreCase("right=")) { if (commands.get(i).split("\\s")[0].equalsIgnoreCase("right=")) {
@ -260,6 +261,7 @@ public class utils implements Listener {
//skip if you can't do this //skip if you can't do this
} }
try { try {
assert clicked != null;
commands.set(i, commands.get(i).replaceAll("%cp-clicked%", clicked.getType().toString())); commands.set(i, commands.get(i).replaceAll("%cp-clicked%", clicked.getType().toString()));
} catch (Exception mate) { } catch (Exception mate) {
commands.set(i, commands.get(i).replaceAll("%cp-clicked%", "Air")); commands.set(i, commands.get(i).replaceAll("%cp-clicked%", "Air"));
@ -283,10 +285,10 @@ public class utils implements Listener {
public void onPlayerUse(PlayerInteractEvent e){ public void onPlayerUse(PlayerInteractEvent e){
//item right or left clicked //item right or left clicked
try { try {
if(e.getAction() != Action.RIGHT_CLICK_AIR && e.getAction() != Action.RIGHT_CLICK_BLOCK && 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; return;
} }
if (plugin.panelsf.list() == null || plugin.panelsf.list().length == 0) { if (plugin.panelsf.list() == null || Objects.requireNonNull(plugin.panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -299,11 +301,12 @@ public class utils implements Listener {
String tempName = panelName[0]; String tempName = panelName[0];
if(tempFile.contains("panels." + tempName + ".open-with-item")) { if(tempFile.contains("panels." + tempName + ".open-with-item")) {
try{ try{
if (clicked.getType() == new ItemStack(Material.matchMaterial(tempFile.getString("panels." + tempName + ".open-with-item.material")), 1).getType()) { assert clicked != null;
if ((ChatColor.translateAlternateColorCodes('&', clicked.getItemMeta().getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', tempFile.getString("panels." + tempName + ".open-with-item.name"))))) { if (clicked.getType() == new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(tempFile.getString("panels." + tempName + ".open-with-item.material")))), 1).getType()) {
if ((ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(clicked.getItemMeta()).getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(tempFile.getString("panels." + tempName + ".open-with-item.name")))))) {
//cancel the click item event //cancel the click item event
if (tempFile.contains("panels." + tempName + ".open-with-item.stationary")) { if (tempFile.contains("panels." + tempName + ".open-with-item.stationary")) {
if (p.getInventory().getHeldItemSlot() != Integer.parseInt(tempFile.getString("panels." + tempName + ".open-with-item.stationary"))) { if (p.getInventory().getHeldItemSlot() != Integer.parseInt(Objects.requireNonNull(tempFile.getString("panels." + tempName + ".open-with-item.stationary")))) {
return; return;
} }
} }
@ -333,7 +336,7 @@ public class utils implements Listener {
*/ */
Player p = e.getPlayer(); Player p = e.getPlayer();
try { try {
if (plugin.panelsf.list() == null || plugin.panelsf.list().length == 0) { if (plugin.panelsf.list() == null || Objects.requireNonNull(plugin.panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -347,10 +350,11 @@ public class utils implements Listener {
if(!plugin.checkPanels(temp)){ if(!plugin.checkPanels(temp)){
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") { for (Iterator var10 = Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") {
key = (String) var10.next(); key = (String) var10.next();
if(temp.contains("panels." + key + ".disabled-worlds")){ if(temp.contains("panels." + key + ".disabled-worlds")){
List<String> disabledWorlds = (List<String>) temp.getList("panels." + key + ".disabled-worlds"); List<String> disabledWorlds = (List<String>) temp.getList("panels." + key + ".disabled-worlds");
assert disabledWorlds != null;
if(disabledWorlds.contains(p.getWorld().getName())){ if(disabledWorlds.contains(p.getWorld().getName())){
continue; continue;
} }
@ -358,14 +362,14 @@ public class utils implements Listener {
if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) { if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) {
ItemStack s; ItemStack s;
try { try {
s = new ItemStack(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material")), 1); s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material")))), 1);
}catch(Exception n){ }catch(Exception n){
return; return;
} }
plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true); plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true);
if(temp.contains("panels." + key + ".open-with-item.stationary")) { if(temp.contains("panels." + key + ".open-with-item.stationary")) {
if (0 <= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")) && 8 >= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))) { if (0 <= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))) && 8 >= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary")))) {
p.getInventory().setItem(Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")), s); p.getInventory().setItem(Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))), s);
} }
} }
} }
@ -376,7 +380,7 @@ public class utils implements Listener {
public void onPlayerRespawn(PlayerRespawnEvent e){ public void onPlayerRespawn(PlayerRespawnEvent e){
Player p = e.getPlayer(); Player p = e.getPlayer();
try { try {
if (plugin.panelsf.list() == null || plugin.panelsf.list().length == 0) { if (plugin.panelsf.list() == null || Objects.requireNonNull(plugin.panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -394,6 +398,7 @@ public class utils implements Listener {
key = (String) var10.next(); key = (String) var10.next();
if(temp.contains("panels." + key + ".disabled-worlds")){ if(temp.contains("panels." + key + ".disabled-worlds")){
List<String> disabledWorlds = (List<String>) temp.getList("panels." + key + ".disabled-worlds"); List<String> disabledWorlds = (List<String>) temp.getList("panels." + key + ".disabled-worlds");
assert disabledWorlds != null;
if(disabledWorlds.contains(p.getWorld().getName())){ if(disabledWorlds.contains(p.getWorld().getName())){
continue; continue;
} }
@ -401,13 +406,13 @@ public class utils implements Listener {
if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) { if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) {
ItemStack s; ItemStack s;
try { try {
s = new ItemStack(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material")), 1); s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material")))), 1);
}catch(Exception n){ }catch(Exception n){
return; return;
} }
plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true); plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true);
if(temp.contains("panels." + key + ".open-with-item.stationary") && 0 <= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")) && 8 >= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))){ if(temp.contains("panels." + key + ".open-with-item.stationary") && 0 <= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))) && 8 >= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary")))){
p.getInventory().setItem(Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")), s); p.getInventory().setItem(Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))), s);
} }
} }
} }
@ -418,7 +423,7 @@ public class utils implements Listener {
Player p = (Player)e.getEntity(); Player p = (Player)e.getEntity();
File panelsf = new File(plugin.getDataFolder() + File.separator + "panels"); File panelsf = new File(plugin.getDataFolder() + File.separator + "panels");
try { try {
if (panelsf.list() == null || panelsf.list().length == 0) { if (panelsf.list() == null || Objects.requireNonNull(panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -432,13 +437,13 @@ public class utils implements Listener {
if(!plugin.checkPanels(temp)){ if(!plugin.checkPanels(temp)){
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") { for (Iterator var10 = Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") {
key = (String) var10.next(); key = (String) var10.next();
if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) { if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) {
if(temp.contains("panels." + key + ".open-with-item.stationary")){ if(temp.contains("panels." + key + ".open-with-item.stationary")){
ItemStack s; ItemStack s;
try { try {
s = new ItemStack(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material")), 1); s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material")))), 1);
}catch(Exception n){ }catch(Exception n){
return; return;
} }
@ -461,7 +466,7 @@ public class utils implements Listener {
} }
} }
try { try {
if (panelsf.list() == null || panelsf.list().length == 0) { if (panelsf.list() == null || Objects.requireNonNull(panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -475,38 +480,39 @@ public class utils implements Listener {
p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + ": Missing required component in panel!"))); p.sendMessage(ChatColor.translateAlternateColorCodes('&',tag + plugin.papi(p, plugin.config.getString("config.format.error") + ": Missing required component in panel!")));
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") { for (Iterator var10 = Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") {
key = (String) var10.next(); key = (String) var10.next();
if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) { if (p.hasPermission("commandpanel.panel." + temp.getString("panels." + key + ".perm")) && temp.contains("panels." + key + ".open-with-item")) {
if(temp.contains("panels." + key + ".disabled-worlds")){ if(temp.contains("panels." + key + ".disabled-worlds")){
List<String> disabledWorlds = (List<String>) temp.getList("panels." + key + ".disabled-worlds"); List<String> disabledWorlds = (List<String>) temp.getList("panels." + key + ".disabled-worlds");
assert disabledWorlds != null;
if(disabledWorlds.contains(p.getWorld().getName())){ if(disabledWorlds.contains(p.getWorld().getName())){
continue; continue;
} }
} }
ItemStack s; ItemStack s;
try { try {
s = new ItemStack(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material")), 1); s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material")))), 1);
}catch(Exception n){ }catch(Exception n){
continue; continue;
} }
plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true); plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true);
if(temp.contains("panels." + key + ".open-with-item.stationary") && 0 <= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")) && 8 >= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))){ if(temp.contains("panels." + key + ".open-with-item.stationary") && 0 <= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))) && 8 >= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary")))){
p.getInventory().setItem(Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")), s); p.getInventory().setItem(Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))), s);
} }
}else{ }else{
//if the player has an item that they have no permission for, remove it //if the player has an item that they have no permission for, remove it
ItemStack s; ItemStack s;
try { try {
s = new ItemStack(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material")), 1); s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material")))), 1);
}catch(Exception n){ }catch(Exception n){
continue; continue;
} }
plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true); plugin.setName(s, temp.getString("panels." + key + ".open-with-item.name"), temp.getList("panels." + key + ".open-with-item.lore"),p,true);
if(temp.contains("panels." + key + ".open-with-item.stationary") && 0 <= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")) && 8 >= Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))){ if(temp.contains("panels." + key + ".open-with-item.stationary") && 0 <= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))) && 8 >= Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary")))){
try { try {
if (p.getInventory().getItem(Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))).isSimilar(s)) { if (Objects.requireNonNull(p.getInventory().getItem(Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))))).isSimilar(s)) {
p.getInventory().setItem(Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary")), null); p.getInventory().setItem(Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary"))), null);
} }
}catch(NullPointerException nex){ }catch(NullPointerException nex){
//skip as player has no item in slot //skip as player has no item in slot
@ -522,7 +528,7 @@ public class utils implements Listener {
Player p = e.getPlayer(); Player p = e.getPlayer();
File panelsf = new File(plugin.getDataFolder() + File.separator + "panels"); File panelsf = new File(plugin.getDataFolder() + File.separator + "panels");
try { try {
if (panelsf.list() == null || panelsf.list().length == 0) { if (panelsf.list() == null || Objects.requireNonNull(panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -537,19 +543,19 @@ public class utils implements Listener {
if(!plugin.checkPanels(temp)){ if(!plugin.checkPanels(temp)){
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") { for (Iterator var10 = Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") {
key = (String) var10.next(); key = (String) var10.next();
for(String ekey : temp.getConfigurationSection("panels").getKeys(false)){ for(String ekey : Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false)){
if(temp.contains("panels." + key + ".open-with-item")){ if(temp.contains("panels." + key + ".open-with-item")){
if(clicked.getType() != Material.AIR) { if(clicked.getType() != Material.AIR) {
//if loop has material first to stop 1.12.2 from spitting errors //if loop has material first to stop 1.12.2 from spitting errors
//try and catch loop to stop errors with the same material type but different name //try and catch loop to stop errors with the same material type but different name
try { try {
if (clicked.getType() == new ItemStack(Material.matchMaterial(temp.getString("panels." + ekey + ".open-with-item.material")), 1).getType()) { if (clicked.getType() == new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + ekey + ".open-with-item.material")))), 1).getType()) {
if ((ChatColor.translateAlternateColorCodes('&',clicked.getItemMeta().getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&',temp.getString("panels." + ekey + ".open-with-item.name"))))) { if ((ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(clicked.getItemMeta()).getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(temp.getString("panels." + ekey + ".open-with-item.name")))))) {
//cancel the click item event //cancel the click item event
if(temp.contains("panels." + key + ".open-with-item.stationary")){ if(temp.contains("panels." + key + ".open-with-item.stationary")){
if(p.getInventory().getHeldItemSlot() == Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))){ if(p.getInventory().getHeldItemSlot() == Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary")))){
e.setCancelled(true); e.setCancelled(true);
return; return;
} }
@ -570,7 +576,7 @@ public class utils implements Listener {
Player p = e.getPlayer(); Player p = e.getPlayer();
File panelsf = new File(plugin.getDataFolder() + File.separator + "panels"); File panelsf = new File(plugin.getDataFolder() + File.separator + "panels");
try { try {
if (panelsf.list() == null || panelsf.list().length == 0) { if (panelsf.list() == null || Objects.requireNonNull(panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -585,29 +591,27 @@ public class utils implements Listener {
if(!plugin.checkPanels(temp)){ if(!plugin.checkPanels(temp)){
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") { for (Iterator var10 = Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") {
key = (String) var10.next(); key = (String) var10.next();
if(temp.contains("panels." + key + ".open-with-item")){ if(temp.contains("panels." + key + ".open-with-item")){
assert clicked != null;
if(clicked.getType() != Material.AIR) { if(clicked.getType() != Material.AIR) {
ItemStack s = clicked;
//if loop has material first to stop 1.12.2 from spitting errors //if loop has material first to stop 1.12.2 from spitting errors
//try and catch loop to stop errors with the same material type but different name //try and catch loop to stop errors with the same material type but different name
try { try {
if (s.getType() == new ItemStack(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material")), 1).getType()) { if (clicked.getType() == new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material")))), 1).getType()) {
if ((ChatColor.translateAlternateColorCodes('&',s.getItemMeta().getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&',temp.getString("panels." + key + ".open-with-item.name"))))) { if ((ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(clicked.getItemMeta()).getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.name")))))) {
//cancel the click item event //cancel the click item event
if(temp.contains("panels." + key + ".open-with-item.stationary")){ if(temp.contains("panels." + key + ".open-with-item.stationary")){
if(p.getInventory().getHeldItemSlot() == Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))){ if(p.getInventory().getHeldItemSlot() == Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary")))){
e.setCancelled(true); e.setCancelled(true);
} }
} }
return; return;
} }
} }
}catch(NullPointerException n){ }catch(NullPointerException | IllegalArgumentException n){
//do nothing plugin.debug(n);
}catch(IllegalArgumentException i){
//do nothing
} }
} }
} }
@ -620,6 +624,7 @@ public class utils implements Listener {
if(e.getAction() == Action.RIGHT_CLICK_BLOCK) { if(e.getAction() == Action.RIGHT_CLICK_BLOCK) {
Block block = e.getClickedBlock(); Block block = e.getClickedBlock();
Player p = e.getPlayer(); Player p = e.getPlayer();
assert block != null;
if (block.getType().toString().contains("SIGN")) { if (block.getType().toString().contains("SIGN")) {
Sign sign = (Sign) block.getState(); Sign sign = (Sign) block.getState();
if (ChatColor.stripColor(sign.getLine(0).trim()).equalsIgnoreCase(ChatColor.stripColor(plugin.config.getString("config.format.signtag")))) { if (ChatColor.stripColor(sign.getLine(0).trim()).equalsIgnoreCase(ChatColor.stripColor(plugin.config.getString("config.format.signtag")))) {
@ -642,7 +647,7 @@ public class utils implements Listener {
Player p = (Player)e.getPlayer(); Player p = (Player)e.getPlayer();
File panelsf = new File(plugin.getDataFolder() + File.separator + "panels"); File panelsf = new File(plugin.getDataFolder() + File.separator + "panels");
try { try {
if (panelsf.list() == null || panelsf.list().length == 0) { if (panelsf.list() == null || Objects.requireNonNull(panelsf.list()).length == 0) {
return; return;
} }
}catch(Exception b){ }catch(Exception b){
@ -657,29 +662,26 @@ public class utils implements Listener {
if(!plugin.checkPanels(temp)){ if(!plugin.checkPanels(temp)){
return; return;
} }
for (Iterator var10 = temp.getConfigurationSection("panels").getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") { for (Iterator var10 = Objects.requireNonNull(temp.getConfigurationSection("panels")).getKeys(false).iterator(); var10.hasNext(); tpanels = tpanels + key + " ") {
key = (String) var10.next(); key = (String) var10.next();
if (temp.contains("panels." + key + ".open-with-item")) { if (temp.contains("panels." + key + ".open-with-item")) {
if (clicked.getType() != Material.AIR) { if (clicked.getType() != Material.AIR) {
ItemStack s = clicked;
//if loop has material first to stop 1.12.2 from spitting errors //if loop has material first to stop 1.12.2 from spitting errors
//try and catch loop to stop errors with the same material type but different name //try and catch loop to stop errors with the same material type but different name
try { try {
if (s.getType() == new ItemStack(Material.matchMaterial(temp.getString("panels." + key + ".open-with-item.material")), 1).getType()) { if (clicked.getType() == new ItemStack(Objects.requireNonNull(Material.matchMaterial(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.material")))), 1).getType()) {
if ((ChatColor.translateAlternateColorCodes('&', s.getItemMeta().getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', temp.getString("panels." + key + ".open-with-item.name"))))) { if ((ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(clicked.getItemMeta()).getDisplayName()).equals(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.name")))))) {
//cancel the click item event //cancel the click item event
if (temp.contains("panels." + key + ".open-with-item.stationary")) { if (temp.contains("panels." + key + ".open-with-item.stationary")) {
if (p.getInventory().getHeldItemSlot() == Integer.parseInt(temp.getString("panels." + key + ".open-with-item.stationary"))) { if (p.getInventory().getHeldItemSlot() == Integer.parseInt(Objects.requireNonNull(temp.getString("panels." + key + ".open-with-item.stationary")))) {
e.setCancelled(true); e.setCancelled(true);
} }
} }
return; return;
} }
} }
} catch (NullPointerException n) { } catch (NullPointerException | IllegalArgumentException n) {
//do nothing plugin.debug(n);
} catch (IllegalArgumentException i) {
//do nothing
} }
} }
} }