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

3.16.0.1

Browse Source
This commit is contained in:
rockyhawk64 2021-07-08 19:03:29 +10:00
parent 7cd8d6b49c
commit c26f8b2037
5 changed files with 21 additions and 24 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.16.0.0
version: 3.16.0.1
main: me.rockyhawk.commandpanels.CommandPanels
name: CommandPanels
author: RockyHawk

19
src/me/rockyhawk/commandpanels/CommandPanels.java
View File

@ -256,7 +256,7 @@ public class CommandPanels extends JavaPlugin{
return new CommandPanelsAPI(JavaPlugin.getPlugin(CommandPanels.class));
}
public void setName(Panel panel, ItemStack renamed, String customName, List<String> lore, Player p, Boolean usePlaceholders, Boolean useColours, Boolean hideAttributes) {
public ItemStack setName(Panel panel, ItemStack renamed, String customName, List<String> lore, Player p, Boolean usePlaceholders, Boolean useColours, Boolean hideAttributes) {
try {
ItemMeta renamedMeta = renamed.getItemMeta();
//set cp placeholders
@ -276,23 +276,22 @@ public class CommandPanels extends JavaPlugin{
renamedMeta.setDisplayName(customName);
}
List<String> clore;
List<String> re_lore;
if (lore != null) {
if(usePlaceholders && useColours){
clore = tex.placeholdersList(panel, p, lore, true);
re_lore = tex.placeholdersList(panel, p, lore, true);
}else if(usePlaceholders){
clore = tex.placeholdersNoColour(panel,p, lore);
re_lore = tex.placeholdersNoColour(panel,p, lore);
}else if(useColours){
clore = tex.placeholdersList(panel, p, lore, false);
re_lore = tex.placeholdersList(panel, p, lore, false);
}else{
clore = lore;
re_lore = lore;
}
renamedMeta.setLore(splitListWithEscape(clore));
renamedMeta.setLore(splitListWithEscape(re_lore));
}
renamed.setItemMeta(renamedMeta);
} catch (Exception ignored) {
}
} catch (Exception ignored) {}
return renamed;
}
private void setupEconomy() {

8
src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java
View File

@ -61,17 +61,13 @@ public class CreateText {
tempInt += 1;
}
}
}catch(Exception ignore){
//this will be ignored as it is probably a null
return null;
}
}catch(Exception ignore){}
int tempInt = 0;
//change colour
for(String temp : setpapi){
try {
setpapi.set(tempInt, plugin.hex.translateHexColorCodes(ChatColor.translateAlternateColorCodes('&', temp)));
}catch(NullPointerException ignore){
}
}catch(NullPointerException ignore){}
tempInt += 1;
}
return setpapi;

14
src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java
View File

@ -50,12 +50,14 @@ public class Placeholders {
List<String[]> values = new ArrayList<>();
values.add(new String[]{plugin.config.getString("placeholders.primary.start"),plugin.config.getString("placeholders.primary.end")});
values.add(new String[]{plugin.config.getString("placeholders.secondary.start"),plugin.config.getString("placeholders.secondary.end")});
if(panel.getConfig().isSet("placeholders")){
if(panel.getConfig().isSet("placeholders.primary")){
values.set(0,new String[]{panel.getConfig().getString("placeholders.primary.start"),panel.getConfig().getString("placeholders.primary.end")});
}
if(panel.getConfig().isSet("placeholders.secondary")){
values.set(1,new String[]{panel.getConfig().getString("placeholders.secondary.start"),panel.getConfig().getString("placeholders.secondary.end")});
if(panel != null) {
if (panel.getConfig().isSet("placeholders")) {
if (panel.getConfig().isSet("placeholders.primary")) {
values.set(0, new String[]{panel.getConfig().getString("placeholders.primary.start"), panel.getConfig().getString("placeholders.primary.end")});
}
if (panel.getConfig().isSet("placeholders.secondary")) {
values.set(1, new String[]{panel.getConfig().getString("placeholders.secondary.start"), panel.getConfig().getString("placeholders.secondary.end")});
}
}
}
if(primary){

2
src/me/rockyhawk/commandpanels/openwithitem/UtilsChestSortEvent.java
View File

@ -1,6 +1,6 @@
package me.rockyhawk.commandpanels.openwithitem;
import de.jeff_media.chestsort.ChestSortEvent;
import de.jeff_media.chestsort.api.ChestSortEvent;
import me.rockyhawk.commandpanels.CommandPanels;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;