diff --git a/pom.xml b/pom.xml
index 49b4615..77cd1b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,23 +31,13 @@
minecraft-repo
https://libraries.minecraft.net/
-
- papermc
- https://repo.papermc.io/repository/maven-public/
-
-
- io.papermc.paper
- paper-api
- 1.20.4-R0.1-SNAPSHOT
- provided
-
org.spigotmc
spigot-api
- 1.20.5-R0.1-SNAPSHOT
+ 1.20.6-R0.1-SNAPSHOT
provided
diff --git a/src/main/java/pk/ajneb97/PlayerKits2.java b/src/main/java/pk/ajneb97/PlayerKits2.java
index dda92e5..ffc38a5 100644
--- a/src/main/java/pk/ajneb97/PlayerKits2.java
+++ b/src/main/java/pk/ajneb97/PlayerKits2.java
@@ -118,7 +118,12 @@ public class PlayerKits2 extends JavaPlugin {
public void setVersion(){
String packageName = Bukkit.getServer().getClass().getPackage().getName();
- serverVersion = ServerVersion.valueOf(packageName.replace("org.bukkit.craftbukkit.", ""));
+ String bukkitVersion = Bukkit.getServer().getBukkitVersion();
+ if(bukkitVersion.contains("1.20.5") || bukkitVersion.contains("1.20.6")){
+ serverVersion = ServerVersion.v1_20_R4;
+ }else{
+ serverVersion = ServerVersion.valueOf(packageName.replace("org.bukkit.craftbukkit.", ""));
+ }
}
public KitItemManager getKitItemManager() {
diff --git a/src/main/java/pk/ajneb97/listeners/OtherListener.java b/src/main/java/pk/ajneb97/listeners/OtherListener.java
index 4c503ad..20eb2eb 100644
--- a/src/main/java/pk/ajneb97/listeners/OtherListener.java
+++ b/src/main/java/pk/ajneb97/listeners/OtherListener.java
@@ -12,7 +12,7 @@ public class OtherListener implements Listener {
@EventHandler
public void fireworkDamage(EntityDamageByEntityEvent event) {
Entity damager = event.getDamager();
- if(event.getEntity() instanceof Player && damager.getType().equals(EntityType.FIREWORK)) {
+ if(event.getEntity() instanceof Player && damager.getType().name().contains("FIREWORK")) {
if(damager.hasMetadata("playerkits")) {
event.setCancelled(true);
}
diff --git a/src/main/java/pk/ajneb97/managers/KitItemManager.java b/src/main/java/pk/ajneb97/managers/KitItemManager.java
index 99c7c2d..baaf705 100644
--- a/src/main/java/pk/ajneb97/managers/KitItemManager.java
+++ b/src/main/java/pk/ajneb97/managers/KitItemManager.java
@@ -1,8 +1,6 @@
package pk.ajneb97.managers;
-import com.destroystokyo.paper.Namespaced;
import org.bukkit.Color;
-import org.bukkit.NamespacedKey;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
@@ -89,23 +87,6 @@ public class KitItemManager {
kitItem.setBookEnchants(enchantsList);
}
}
-
- if(plugin.getDependencyManager().isPaper()){
- List canDestroy = new ArrayList<>();
- for(Namespaced n : meta.getDestroyableKeys()){
- canDestroy.add(n.getNamespace()+":"+n.getKey());
- }
- if(!canDestroy.isEmpty()){
- kitItem.setCanDestroy(canDestroy);
- }
- List canPlace = new ArrayList<>();
- for(Namespaced n : meta.getPlaceableKeys()){
- canPlace.add(n.getNamespace()+":"+n.getKey());
- }
- if(!canPlace.isEmpty()){
- kitItem.setCanPlace(canPlace);
- }
- }
}
ServerVersion serverVersion = PlayerKits2.serverVersion;
@@ -181,27 +162,6 @@ public class KitItemManager {
}
}
- if(plugin.getDependencyManager().isPaper()){
- List canDestroy = kitItem.getCanDestroy();
- if(canDestroy != null && !canDestroy.isEmpty()){
- Collection destroyableKeys = new ArrayList<>();
- for(String line : canDestroy){
- String[] sep = line.split(":");
- destroyableKeys.add(new NamespacedKey(sep[0],sep[1]));
- }
- meta.setDestroyableKeys(destroyableKeys);
- }
- List canPlace = kitItem.getCanPlace();
- if(canPlace != null && !canPlace.isEmpty()){
- Collection placeableKeys = new ArrayList<>();
- for(String line : canPlace){
- String[] sep = line.split(":");
- placeableKeys.add(new NamespacedKey(sep[0],sep[1]));
- }
- meta.setPlaceableKeys(placeableKeys);
- }
- }
-
item.setItemMeta(meta);
//OTHER META
diff --git a/src/main/java/pk/ajneb97/utils/ActionUtils.java b/src/main/java/pk/ajneb97/utils/ActionUtils.java
index d0845df..62abf80 100644
--- a/src/main/java/pk/ajneb97/utils/ActionUtils.java
+++ b/src/main/java/pk/ajneb97/utils/ActionUtils.java
@@ -97,7 +97,15 @@ public class ActionUtils {
}
Location location = player.getLocation();
- Firework firework = (Firework) location.getWorld().spawnEntity(location, EntityType.FIREWORK);
+
+ ServerVersion serverVersion = PlayerKits2.serverVersion;
+ EntityType entityType = null;
+ if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){
+ entityType = EntityType.FIREWORK_ROCKET;
+ }else{
+ entityType = EntityType.valueOf("FIREWORK");
+ }
+ Firework firework = (Firework) location.getWorld().spawnEntity(location, entityType);
FireworkMeta fireworkMeta = firework.getFireworkMeta();
FireworkEffect effect = FireworkEffect.builder().flicker(false)
.withColor(colors)
diff --git a/src/main/java/pk/ajneb97/utils/InventoryItem.java b/src/main/java/pk/ajneb97/utils/InventoryItem.java
index a03fa69..6e65701 100644
--- a/src/main/java/pk/ajneb97/utils/InventoryItem.java
+++ b/src/main/java/pk/ajneb97/utils/InventoryItem.java
@@ -52,7 +52,7 @@ public class InventoryItem {
public InventoryItem enchanted(boolean enchanted) {
if(enchanted) {
- meta.addEnchant(Enchantment.ARROW_DAMAGE, 1, true);
+ meta.addEnchant(Enchantment.FIRE_ASPECT, 1, true);
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
}
return this;
diff --git a/src/main/java/pk/ajneb97/utils/ItemUtils.java b/src/main/java/pk/ajneb97/utils/ItemUtils.java
index c1379bb..2f9da60 100644
--- a/src/main/java/pk/ajneb97/utils/ItemUtils.java
+++ b/src/main/java/pk/ajneb97/utils/ItemUtils.java
@@ -2,7 +2,7 @@ package pk.ajneb97.utils;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
+
import java.net.URL;
import java.util.*;
@@ -224,14 +224,22 @@ public class ItemUtils {
potionEffectsList.add(type+";"+amplifier+";"+duration);
}
}
- if(!Bukkit.getVersion().contains("1.8")) {
+ ServerVersion serverVersion = PlayerKits2.serverVersion;
+ if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_9_R1)) {
if(meta.hasColor()) {
potionColor = meta.getColor().asRGB();
}
- PotionData basePotionData = meta.getBasePotionData();
- extended = basePotionData.isExtended();
- upgraded = basePotionData.isUpgraded();
- potionType = basePotionData.getType().name();
+
+ if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R2)) {
+ if(meta.getBasePotionType() != null){
+ potionType = meta.getBasePotionType().name();
+ }
+ }else{
+ PotionData basePotionData = meta.getBasePotionData();
+ extended = basePotionData.isExtended();
+ upgraded = basePotionData.isUpgraded();
+ potionType = basePotionData.getType().name();
+ }
}
potionData = new KitItemPotionData(upgraded,extended,potionType,potionColor,potionEffectsList);
@@ -265,18 +273,25 @@ public class ItemUtils {
meta.addCustomEffect(new PotionEffect(PotionEffectType.getByName(type),duration,amplifier), false);
}
}
-
- if(!Bukkit.getVersion().contains("1.8")) {
- PotionData basePotionData = new PotionData(
- PotionType.valueOf(potionData.getPotionType()),
- potionData.isExtended(),
- potionData.isUpgraded());
- meta.setBasePotionData(basePotionData);
-
+
+ ServerVersion serverVersion = PlayerKits2.serverVersion;
+ if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_9_R1)) {
int color = potionData.getPotionColor();
if(color != 0) {
meta.setColor(Color.fromRGB(color));
}
+ if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R2)) {
+ if(potionData.getPotionType() != null && !potionData.getPotionType().isEmpty()){
+ meta.setBasePotionType(PotionType.valueOf(potionData.getPotionType()));
+ }
+ }else{
+ PotionData basePotionData = new PotionData(
+ PotionType.valueOf(potionData.getPotionType()),
+ potionData.isExtended(),
+ potionData.isUpgraded());
+
+ meta.setBasePotionData(basePotionData);
+ }
}
item.setItemMeta(meta);
diff --git a/src/main/resources/kits/diamond.yml b/src/main/resources/kits/diamond.yml
index 1b9a35b..f805276 100644
--- a/src/main/resources/kits/diamond.yml
+++ b/src/main/resources/kits/diamond.yml
@@ -16,7 +16,7 @@ items:
- ""
- "&7Owner: &6%player_name%"
enchants:
- - "DAMAGE_ALL;5"
+ - "FIRE_ASPECT;5"
actions:
claim:
1:
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 28de669..9b036c8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
main: pk.ajneb97.PlayerKits2
-version: 1.11.1
+version: 1.11.2
name: PlayerKits2
api-version: 1.13
softdepend: [Vault,PlaceholderAPI]