This commit is contained in:
rockyhawk64 2024-02-04 15:59:19 +11:00
parent 614a9c77d5
commit 1cf7d0a4e0
9 changed files with 26 additions and 1523 deletions

View File

@ -26,6 +26,11 @@
<option name="name" value="sonatype" />
<option name="url" value="https://oss.sonatype.org/content/groups/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="codemc-repo" />
<option name="name" value="codemc-repo" />
<option name="url" value="https://repo.codemc.io/repository/maven-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="placeholderapi" />
<option name="name" value="placeholderapi" />

View File

@ -6,5 +6,6 @@
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
<option name="workspaceImportForciblyTurnedOn" value="true" />
</component>
</project>

15
pom.xml
View File

@ -47,6 +47,10 @@
<pattern>org.bstats</pattern>
<shadedPattern>me.rockyhawk.commandpanels</shadedPattern>
</relocation>
<relocation>
<pattern>de.tr7zw.changeme.nbtapi</pattern>
<shadedPattern>me.rockyhawk.commandpanels</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@ -107,9 +111,20 @@
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.io/repository/maven-public/</url>
<layout>default</layout>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api</artifactId>
<version>2.12.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>

View File

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

View File

@ -451,6 +451,9 @@ public class CommandPanels extends JavaPlugin{
if (p.hasPermission("commandpanel.version")) {
p.sendMessage(ChatColor.GOLD + "/cpv " + ChatColor.WHITE + "Display the current version.");
}
if (p.hasPermission("commandpanel.refresh")) {
p.sendMessage(ChatColor.GOLD + "/cpu [player] [position:all] " + ChatColor.WHITE + "Update a panel for a player while it is still open.");
}
if (p.hasPermission("commandpanel.update")) {
p.sendMessage(ChatColor.GOLD + "/cpv latest " + ChatColor.WHITE + "Download the latest update upon server reload/restart.");
p.sendMessage(ChatColor.GOLD + "/cpv [version:cancel] " + ChatColor.WHITE + "Download an update upon server reload/restart.");

View File

@ -20,7 +20,7 @@ public class Commandpanelsupdate implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (label.equalsIgnoreCase("cpu") || label.equalsIgnoreCase("commandpanelupdate") || label.equalsIgnoreCase("cpanelu")) {
if (sender.hasPermission("commandpanel.refresh")) {
//command /cpu
//command /cpu (uses .refresh permission node)
// /cpu <Playername> <Position/ALL>
String name;

View File

@ -3,7 +3,6 @@ package me.rockyhawk.commandpanels.ioclasses.nbt;
import de.tr7zw.changeme.nbtapi.NBT;
import de.tr7zw.changeme.nbtapi.NBTItem;
import me.rockyhawk.commandpanels.CommandPanels;
import me.rockyhawk.commandpanels.ioclasses.legacy.MinecraftVersions;
import org.bukkit.inventory.ItemStack;
public class NBTManager {
@ -16,26 +15,13 @@ public class NBTManager {
public boolean hasNBT(ItemStack item){
NBTItem nbti = new NBTItem(item);
return nbti.hasTag("CommandPanelsItem");
// if(plugin.legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_13)){
// return new NBT_1_13().contains(item, "CommandPanelsItem");
// }else{
// return new NBT_1_14(plugin).hasNBT(item,"CommandPanelsItem");
// }
}
public ItemStack setNBT(ItemStack item){
NBT.modify(item, nbt -> {
nbt.setString("CommandPanelsItem", "1");
});
return item;
// if(plugin.legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_13)){
// return new NBT_1_13().set(item,1,"CommandPanelsItem");
// }else{
// return new NBT_1_14(plugin).addNBT(item,"CommandPanelsItem","1");
// }
}
//custom key NBT
@ -43,28 +29,12 @@ public class NBTManager {
NBTItem nbti = new NBTItem(item);
if(!nbti.hasNBTData()) return "";
return nbti.getString(key);
// String output = "";
// if(plugin.legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_13)){
// try{
// output = new NBT_1_13().getString(item, key);
// }catch(NullPointerException ignore){}
// }else{
// output = new NBT_1_14(plugin).getNBT(item, key);
// }
// return output;
}
public ItemStack setNBT(ItemStack item, String key, String value){
NBT.modify(item, nbt -> {
nbt.setString(key, value);
});
return item;
//if(plugin.legacy.LOCAL_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_13)){
// return new NBT_1_13().set(item,value,key);
//}else{
// return new NBT_1_14(plugin).addNBT(item,key,value);
//}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,43 +0,0 @@
package me.rockyhawk.commandpanels.ioclasses.nbt;
import me.rockyhawk.commandpanels.CommandPanels;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataType;
public class NBT_1_14 {
CommandPanels plugin;
public NBT_1_14(CommandPanels pl) {
this.plugin = pl;
}
//NBT class for Minecraft versions 1.14+
public ItemStack addNBT(ItemStack item, String key, String value){
NamespacedKey ns_key = new NamespacedKey(plugin, key);
ItemMeta itemMeta = item.getItemMeta();
itemMeta.getPersistentDataContainer().set(ns_key, PersistentDataType.STRING, value);
item.setItemMeta(itemMeta);
return item;
}
public boolean hasNBT(ItemStack item, String key){
NamespacedKey ns_key = new NamespacedKey(plugin, key);
try {
ItemMeta itemMeta = item.getItemMeta();
return itemMeta.getPersistentDataContainer().has(ns_key, PersistentDataType.STRING);
}catch (Exception e){
return false;
}
}
public String getNBT(ItemStack item, String key){
NamespacedKey ns_key = new NamespacedKey(plugin, key);
try {
ItemMeta itemMeta = item.getItemMeta();
return itemMeta.getPersistentDataContainer().get(ns_key, PersistentDataType.STRING);
}catch (Exception e){
return "";
}
}
}