Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
<id>minecraft-repo</id>
<url>https://libraries.minecraft.net/</url>
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.io/repository/maven-public/</url>
<layout>default</layout>
</repository>
</repositories>

<dependencies>
Expand All @@ -43,7 +48,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.1</version>
<version>2.11.6</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -64,23 +69,29 @@
<version>4.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>de.tr7zw</groupId>
<artifactId>item-nbt-api-plugin</artifactId>
<version>2.15.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>8</release>
<source>21</source>
<target>21</target>
<release>21</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.6.0</version>
<configuration>
</configuration>
<executions>
Expand Down
26 changes: 23 additions & 3 deletions src/main/java/pk/ajneb97/managers/KitItemManager.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pk.ajneb97.managers;

import org.bukkit.Bukkit;
import de.tr7zw.nbtapi.NBT;
import org.bukkit.Color;
import org.bukkit.NamespacedKey;
import org.bukkit.configuration.file.FileConfiguration;
Expand Down Expand Up @@ -346,8 +346,28 @@ public ItemStack createItemFromKitItem(KitItem kitItem, Player player, Kit kit){
}
item.setItemMeta(meta);

if(!serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){
List<String> nbtList = kitItem.getNbt();

List<String> nbtList = kitItem.getNbt();
if (nbtList == null) return item;
if (nbtList.isEmpty()) return item;

if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){
NBT.modify(item, nbt -> {
for (String nbtStr : nbtList) {
String[] nbtSplit = nbtStr.split("\\|");
if (nbtSplit.length == 3) {
String type = nbtSplit[2];
if (type.equalsIgnoreCase("double")) {
nbt.setDouble(nbtSplit[0], Double.parseDouble(nbtSplit[1]));
} else if (type.equalsIgnoreCase("int")) {
nbt.setInteger(nbtSplit[0], Integer.parseInt(nbtSplit[1]));
}
} else {
nbt.setString(nbtSplit[0], nbtSplit[1]);
}
}
});
} else {
item = ItemUtils.setNBT(plugin,item, nbtList);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ main: pk.ajneb97.PlayerKits2
version: 1.17.5
name: PlayerKits2
api-version: 1.13
softdepend: [Vault,PlaceholderAPI]
softdepend: [NBTAPI, Vault, PlaceholderAPI]
author: Ajneb97

commands:
Expand Down