This commit is contained in:
rockyhawk64 2024-11-14 17:35:38 +11:00
parent aced7b6243
commit 5473206adf
4 changed files with 14 additions and 8 deletions

View File

@ -86,6 +86,11 @@
<option name="name" value="spigot-repo" /> <option name="name" value="spigot-repo" />
<option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" /> <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="jeff-media-public" />
<option name="name" value="jeff-media-public" />
<option name="url" value="https://repo.jeff-media.com/public/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="jboss.community" /> <option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" /> <option name="name" value="JBoss Community repository" />

View File

@ -122,7 +122,7 @@
<dependency> <dependency>
<groupId>de.tr7zw</groupId> <groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api</artifactId> <artifactId>item-nbt-api</artifactId>
<version>2.13.2</version> <version>2.14.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -158,7 +158,7 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.13.0</version> <version>2.14.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.clip</groupId> <groupId>me.clip</groupId>

View File

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

View File

@ -119,19 +119,20 @@ public class OpenGUI {
} }
} catch (ArrayIndexOutOfBoundsException ignore) {} } catch (ArrayIndexOutOfBoundsException ignore) {}
} }
if (pconfig.contains("empty") && !Objects.equals(pconfig.getString("empty"), "AIR")) { if (pconfig.contains("empty") && !plugin.tex.placeholdersNoColour(panel,position,p,pconfig.getString("empty")).equals("AIR")) {
String emptyValue = plugin.tex.placeholdersNoColour(panel,position,p,pconfig.getString("empty"));
ItemStack empty; ItemStack empty;
try { try {
//emptyID for older versions of minecraft (might be deprecated later on) //emptyID for older versions of minecraft (might be deprecated later on)
short id = 0; short id = 0;
if(pconfig.contains("emptyID")){ if(pconfig.contains("emptyID")){
id = Short.parseShort(pconfig.getString("emptyID")); id = Short.parseShort(plugin.tex.placeholdersNoColour(panel,position,p,pconfig.getString("emptyID")));
} }
//either use custom item or just material type //either use custom item or just material type
if(pconfig.contains("custom-item." + pconfig.getString("empty"))){ if(pconfig.contains("custom-item." + emptyValue)){
empty = plugin.itemCreate.makeItemFromConfig(panel,position,pconfig.getConfigurationSection("custom-item." + pconfig.getString("empty")),p,true,true,true); empty = plugin.itemCreate.makeItemFromConfig(panel,position,pconfig.getConfigurationSection("custom-item." + emptyValue),p,true,true,true);
}else{ }else{
empty = new ItemStack(Objects.requireNonNull(Material.matchMaterial(pconfig.getString("empty").toUpperCase())), 1,id); empty = new ItemStack(Objects.requireNonNull(Material.matchMaterial(emptyValue.toUpperCase())), 1,id);
ItemMeta renamedMeta = empty.getItemMeta(); ItemMeta renamedMeta = empty.getItemMeta();
assert renamedMeta != null; assert renamedMeta != null;
renamedMeta.setDisplayName(" "); renamedMeta.setDisplayName(" ");