From 5a28956c8ffa835c95a63bb41c176ddadd6d6db2 Mon Sep 17 00:00:00 2001 From: rockyhawk64 Date: Wed, 14 Jul 2021 21:51:20 +1000 Subject: [PATCH] 3.16.2.1 --- resource/example_bottom.yml | 12 ++++++++-- resource/plugin.yml | 2 +- .../placeholders/Placeholders.java | 24 +++++++++---------- .../commands/CommandPanelImport.java | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/resource/example_bottom.yml b/resource/example_bottom.yml index d131027..fe762ea 100644 --- a/resource/example_bottom.yml +++ b/resource/example_bottom.yml @@ -27,8 +27,16 @@ panels: '8': material: ENDER_PEARL name: '&bOpen Player Browser' - commands: - - open= example_middle_two {Middle} + lore: + - '&7The Player Browser requires' + - '&7PlaceholderAPI with the Math extension' + hasvalue0: + compare: '%math_0:_1+1%' + value: '2' + material: ENDER_PEARL + name: '&bOpen Player Browser' + commands: + - open= example_middle_two {Middle} hasvalue: compare: '%cp-data-example_item%' value: true diff --git a/resource/plugin.yml b/resource/plugin.yml index a71fe53..26c72d8 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.16.2.0 +version: 3.16.2.1 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java b/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java index 169dd45..4ed3f1f 100644 --- a/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java +++ b/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java @@ -121,7 +121,7 @@ public class Placeholders { String ip_port = identifier.replace("server-", ""); Socket s = new Socket(); try { - s.connect(new InetSocketAddress(ip_port.split(":")[0], Integer.parseInt(ip_port.split(":")[1])), plugin.config.getInt("config.server-ping-timeout")); + s.connect(new InetSocketAddress(ip_port.split(":")[0], (int)Double.parseDouble(ip_port.split(":")[1])), plugin.config.getInt("config.server-ping-timeout")); s.close(); return "true"; }catch (IOException ex){ @@ -134,7 +134,7 @@ public class Placeholders { try { String slot_key = identifier.replace("nbt-", ""); String value; - value = plugin.nbt.getNBT(p.getOpenInventory().getTopInventory().getItem(Integer.parseInt(slot_key.split(":")[0])),slot_key.split(":")[1]); + value = plugin.nbt.getNBT(p.getOpenInventory().getTopInventory().getItem((int)Double.parseDouble(slot_key.split(":")[0])),slot_key.split(":")[1]); if(value == null){ value = "empty"; } @@ -152,10 +152,10 @@ public class Placeholders { String matNumber = identifier.replace("material-", ""); String material; try { - material = p.getOpenInventory().getTopInventory().getItem(Integer.parseInt(matNumber)).getType().toString(); + material = p.getOpenInventory().getTopInventory().getItem((int)Double.parseDouble(matNumber)).getType().toString(); if (plugin.legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_12)) { //add the ID to the end if it is legacy (eg, material:id) - material = material + ":" + p.getOpenInventory().getTopInventory().getItem(Integer.parseInt(matNumber)).getType().getId(); + material = material + ":" + p.getOpenInventory().getTopInventory().getItem((int)Double.parseDouble(matNumber)).getType().getId(); } } catch (NullPointerException er) { material = "AIR"; @@ -172,7 +172,7 @@ public class Placeholders { String matNumber = identifier.replace("stack-", ""); int amount; try { - amount = p.getOpenInventory().getTopInventory().getItem(Integer.parseInt(matNumber)).getAmount(); + amount = p.getOpenInventory().getTopInventory().getItem((int)Double.parseDouble(matNumber)).getAmount(); } catch (NullPointerException er) { amount = 0; } @@ -188,7 +188,7 @@ public class Placeholders { String matNumber = identifier.replace("modeldata-", ""); int modelData; try { - modelData = p.getOpenInventory().getTopInventory().getItem(Integer.parseInt(matNumber)).getItemMeta().getCustomModelData(); + modelData = p.getOpenInventory().getTopInventory().getItem((int)Double.parseDouble(matNumber)).getItemMeta().getCustomModelData(); } catch (NullPointerException er) { modelData = 0; } @@ -203,7 +203,7 @@ public class Placeholders { try { String matNumber = identifier.replace("damaged-", ""); boolean damaged = false; - ItemStack itm = p.getOpenInventory().getTopInventory().getItem(Integer.parseInt(matNumber)); + ItemStack itm = p.getOpenInventory().getTopInventory().getItem((int)Double.parseDouble(matNumber)); try { if(plugin.legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_15)){ if(itm.getType().getMaxDurability() != 0) { @@ -227,7 +227,7 @@ public class Placeholders { try { String matLocSlot = identifier.replace("identical-", ""); String matLoc = matLocSlot.split(",")[0]; - int matSlot = Integer.parseInt(matLocSlot.split(",")[1]); + int matSlot = (int)Double.parseDouble(matLocSlot.split(",")[1]); boolean isIdentical = false; ItemStack itm = p.getOpenInventory().getTopInventory().getItem(matSlot); @@ -268,8 +268,8 @@ public class Placeholders { if(identifier.startsWith("random-")) { try { String min_max = identifier.replace("random-", ""); - int min = Integer.parseInt(min_max.split(",")[0]); - int max = Integer.parseInt(min_max.split(",")[1]); + int min = (int)Double.parseDouble(min_max.split(",")[0]); + int max = (int)Double.parseDouble(min_max.split(",")[1]); return String.valueOf(plugin.getRandomNumberInRange(min, max)); }catch (Exception ex){ plugin.debug(ex,p); @@ -323,10 +323,10 @@ public class Placeholders { try { String playerLocation = identifier.replace("player-online-", ""); Player[] playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().size()]); - if (Integer.parseInt(playerLocation) > playerFind.length) { + if (Double.parseDouble(playerLocation) > playerFind.length) { return plugin.tex.colour(Objects.requireNonNull(plugin.config.getString("config.format.offline"))); } else { - return playerFind[Integer.parseInt(playerLocation) - 1].getName(); + return playerFind[(int)(Double.parseDouble(playerLocation) - 1)].getName(); } }catch (Exception ex){ plugin.debug(ex,p); diff --git a/src/me/rockyhawk/commandpanels/commands/CommandPanelImport.java b/src/me/rockyhawk/commandpanels/commands/CommandPanelImport.java index c5f6559..6ac3f47 100644 --- a/src/me/rockyhawk/commandpanels/commands/CommandPanelImport.java +++ b/src/me/rockyhawk/commandpanels/commands/CommandPanelImport.java @@ -56,7 +56,7 @@ public class CommandPanelImport implements CommandExecutor { } sender.sendMessage(plugin.tag + ChatColor.GREEN + "Finished downloading."); } catch (Exception var22) { - sender.sendMessage(ChatColor.RED + "Could not download panel."); + sender.sendMessage(plugin.tag + ChatColor.RED + "Could not download panel."); } finally { try { if (in != null) {