From 4b90ef76cd1f3fc42d62e6048ddfd8aa63d82d8a Mon Sep 17 00:00:00 2001 From: Ajneb97 Date: Tue, 21 Jan 2025 15:03:43 -0300 Subject: [PATCH] 1.15.2 --- .../pk/ajneb97/managers/KitItemManager.java | 39 +++++++++++++++++++ .../java/pk/ajneb97/managers/KitsManager.java | 2 +- .../java/pk/ajneb97/model/item/KitItem.java | 22 ++++++++++- src/main/resources/plugin.yml | 2 +- 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/main/java/pk/ajneb97/managers/KitItemManager.java b/src/main/java/pk/ajneb97/managers/KitItemManager.java index c548fca..47b3cba 100644 --- a/src/main/java/pk/ajneb97/managers/KitItemManager.java +++ b/src/main/java/pk/ajneb97/managers/KitItemManager.java @@ -113,6 +113,19 @@ public class KitItemManager { } } + if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){ + if(meta.isHideTooltip()){ + kitItem.setHideTooltip(true); + } + } + + if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R2)){ + if(meta.hasTooltipStyle()){ + NamespacedKey key = meta.getTooltipStyle(); + kitItem.setTooltipStyle(key.getNamespace()+":"+key.getKey()); + } + } + if(meta instanceof LeatherArmorMeta) { LeatherArmorMeta meta2 = (LeatherArmorMeta) meta; kitItem.setColor(meta2.getColor().asRGB()); @@ -242,6 +255,20 @@ public class KitItemManager { } } + if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){ + if(kitItem.isHideTooltip()){ + meta.setHideTooltip(true); + } + } + + if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R2)){ + String tooltipStyle = kitItem.getTooltipStyle(); + if(tooltipStyle != null){ + String[] sep = tooltipStyle.split(":"); + meta.setTooltipStyle(new NamespacedKey(sep[0],sep[1])); + } + } + item.setItemMeta(meta); //OTHER META @@ -341,6 +368,13 @@ public class KitItemManager { if(!customModelComponentData.getStrings().isEmpty()) config.set(path+".custom_model_component_data.strings",customModelComponentData.getStrings()); } + if(item.isHideTooltip()){ + config.set(path+".hide_tooltip", true); + } + if(item.getTooltipStyle() != null){ + config.set(path+".tooltip_style",item.getTooltipStyle()); + } + if(item.getColor() != 0) { config.set(path+".color", item.getColor()); } @@ -467,6 +501,9 @@ public class KitItemManager { customModelComponentData = new KitItemCustomModelComponentData(cFlags,cColors,cFloats,cStrings); } + boolean hideTooltip = config.getBoolean(path+".hide_tooltip"); + String tooltipStyle = config.contains(path+".tooltip_style") ? config.getString(path+".tooltip_style") : null; + KitItemSkullData skullData = null; if(config.contains(path+".skull_data")) { String skullTexture = null; @@ -584,6 +621,8 @@ public class KitItemManager { kitItem.setBookData(bookData); kitItem.setTrimData(trimData); kitItem.setCustomModelComponentData(customModelComponentData); + kitItem.setHideTooltip(hideTooltip); + kitItem.setTooltipStyle(tooltipStyle); } kitItem.setOffhand(offhand); diff --git a/src/main/java/pk/ajneb97/managers/KitsManager.java b/src/main/java/pk/ajneb97/managers/KitsManager.java index aff3604..eb76a4c 100644 --- a/src/main/java/pk/ajneb97/managers/KitsManager.java +++ b/src/main/java/pk/ajneb97/managers/KitsManager.java @@ -49,7 +49,7 @@ public class KitsManager { public Kit getKitByName(String name){ for(Kit kit : kits){ - if(kit.getName().equalsIgnoreCase(name)){ + if(kit.getName().equals(name)){ return kit; } } diff --git a/src/main/java/pk/ajneb97/model/item/KitItem.java b/src/main/java/pk/ajneb97/model/item/KitItem.java index 281e863..fece333 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItem.java +++ b/src/main/java/pk/ajneb97/model/item/KitItem.java @@ -35,7 +35,10 @@ public class KitItem{ private KitItemBannerData bannerData; private KitItemBookData bookData; private KitItemTrimData trimData; - private KitItemCustomModelComponentData customModelComponentData; + private KitItemCustomModelComponentData customModelComponentData; // 1.21.4+ + + private boolean hideTooltip; // 1.20.6+ + private String tooltipStyle; // 1.21.2+ private boolean offhand; private int previewSlot; @@ -231,7 +234,21 @@ public class KitItem{ public void setCustomModelComponentData(KitItemCustomModelComponentData customModelComponentData) { this.customModelComponentData = customModelComponentData; } + public boolean isHideTooltip() { + return hideTooltip; + } + public void setHideTooltip(boolean hideTooltip) { + this.hideTooltip = hideTooltip; + } + + public String getTooltipStyle() { + return tooltipStyle; + } + + public void setTooltipStyle(String tooltipStyle) { + this.tooltipStyle = tooltipStyle; + } public boolean isOffhand() { return offhand; } @@ -296,6 +313,9 @@ public class KitItem{ kitItem.setTrimData(trimData != null ? trimData.clone() : null); kitItem.setCustomModelComponentData(customModelComponentData != null ? customModelComponentData.clone() : null); + kitItem.setHideTooltip(hideTooltip); + kitItem.setTooltipStyle(tooltipStyle); + kitItem.setPreviewSlot(previewSlot); kitItem.setOffhand(offhand); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d502ae8..6b9c812 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ main: pk.ajneb97.PlayerKits2 -version: 1.15.1 +version: 1.15.2 name: PlayerKits2 api-version: 1.13 softdepend: [Vault,PlaceholderAPI]