This commit is contained in:
Ajneb97 2025-01-21 15:03:43 -03:00
parent 21f09e8c88
commit 4b90ef76cd
4 changed files with 62 additions and 3 deletions

View file

@ -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) { if(meta instanceof LeatherArmorMeta) {
LeatherArmorMeta meta2 = (LeatherArmorMeta) meta; LeatherArmorMeta meta2 = (LeatherArmorMeta) meta;
kitItem.setColor(meta2.getColor().asRGB()); 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); item.setItemMeta(meta);
//OTHER 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(!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) { if(item.getColor() != 0) {
config.set(path+".color", item.getColor()); config.set(path+".color", item.getColor());
} }
@ -467,6 +501,9 @@ public class KitItemManager {
customModelComponentData = new KitItemCustomModelComponentData(cFlags,cColors,cFloats,cStrings); 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; KitItemSkullData skullData = null;
if(config.contains(path+".skull_data")) { if(config.contains(path+".skull_data")) {
String skullTexture = null; String skullTexture = null;
@ -584,6 +621,8 @@ public class KitItemManager {
kitItem.setBookData(bookData); kitItem.setBookData(bookData);
kitItem.setTrimData(trimData); kitItem.setTrimData(trimData);
kitItem.setCustomModelComponentData(customModelComponentData); kitItem.setCustomModelComponentData(customModelComponentData);
kitItem.setHideTooltip(hideTooltip);
kitItem.setTooltipStyle(tooltipStyle);
} }
kitItem.setOffhand(offhand); kitItem.setOffhand(offhand);

View file

@ -49,7 +49,7 @@ public class KitsManager {
public Kit getKitByName(String name){ public Kit getKitByName(String name){
for(Kit kit : kits){ for(Kit kit : kits){
if(kit.getName().equalsIgnoreCase(name)){ if(kit.getName().equals(name)){
return kit; return kit;
} }
} }

View file

@ -35,7 +35,10 @@ public class KitItem{
private KitItemBannerData bannerData; private KitItemBannerData bannerData;
private KitItemBookData bookData; private KitItemBookData bookData;
private KitItemTrimData trimData; 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 boolean offhand;
private int previewSlot; private int previewSlot;
@ -231,7 +234,21 @@ public class KitItem{
public void setCustomModelComponentData(KitItemCustomModelComponentData customModelComponentData) { public void setCustomModelComponentData(KitItemCustomModelComponentData customModelComponentData) {
this.customModelComponentData = 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() { public boolean isOffhand() {
return offhand; return offhand;
} }
@ -296,6 +313,9 @@ public class KitItem{
kitItem.setTrimData(trimData != null ? trimData.clone() : null); kitItem.setTrimData(trimData != null ? trimData.clone() : null);
kitItem.setCustomModelComponentData(customModelComponentData != null ? customModelComponentData.clone() : null); kitItem.setCustomModelComponentData(customModelComponentData != null ? customModelComponentData.clone() : null);
kitItem.setHideTooltip(hideTooltip);
kitItem.setTooltipStyle(tooltipStyle);
kitItem.setPreviewSlot(previewSlot); kitItem.setPreviewSlot(previewSlot);
kitItem.setOffhand(offhand); kitItem.setOffhand(offhand);

View file

@ -1,5 +1,5 @@
main: pk.ajneb97.PlayerKits2 main: pk.ajneb97.PlayerKits2
version: 1.15.1 version: 1.15.2
name: PlayerKits2 name: PlayerKits2
api-version: 1.13 api-version: 1.13
softdepend: [Vault,PlaceholderAPI] softdepend: [Vault,PlaceholderAPI]