diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/ItemTags.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/ItemTags.java index 5d81626e..e26c28cb 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/ItemTags.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/ItemTags.java @@ -7,8 +7,8 @@ public class ItemTags { public static final String TAG_ITEM_LEVEL = "ITEM_LEVEL"; public static final String TAG_ITEM_SOCKET_RATE = "ITEM_SOCKET_RATE"; public static final String TAG_ITEM_SOCKET = "ITEM_SOCKET_"; - public static final String TAG_ITEM_AMMO = "ITEM_AMMO"; - public static final String TAG_ITEM_HAND = "ITEM_HAND"; + public static final String TAG_ITEM_AMMO = "ITEM_AMMO_"; + public static final String TAG_ITEM_HAND = "ITEM_HAND_"; public static final String TAG_ITEM_CHARGES = "ITEM_CHARGES"; public static final String TAG_ITEM_STAT = "ITEM_STAT_"; public static final String TAG_ITEM_DAMAGE = "ITEM_DAMAGE_"; @@ -19,7 +19,7 @@ public class ItemTags { public static final String TAG_REQ_USER_LEVEL = "ITEM_USER_LEVEL"; public static final String TAG_REQ_USER_CLASS = "ITEM_USER_CLASS"; public static final String TAG_REQ_USER_BANNED_CLASS = "ITEM_USER_BANNED_CLASS"; - public static final String TAG_REQ_USER_OWNER = "ITEM_USER_UUID"; + public static final String TAG_REQ_USER_OWNER = "ITEM_USER_UUID_"; public static final String TAG_REQ_ITEM_TYPE = "REQ_ITEM_TYPE"; diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/api/ItemLoreStat.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/api/ItemLoreStat.java index 6293ec82..8d405173 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/api/ItemLoreStat.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/api/ItemLoreStat.java @@ -26,7 +26,6 @@ public abstract class ItemLoreStat { protected final String placeholder; protected final List keys; protected PersistentDataType dataType; - private final String uniqueMetaTag; protected final String metaId; public ItemLoreStat( @@ -40,18 +39,11 @@ public ItemLoreStat( this.name = StringUT.color(name); this.format = StringUT.color(format.replace("%name%", this.getName())); this.placeholder = placeholder.toUpperCase(); - this.uniqueMetaTag = uniqueTag.toLowerCase(); this.keys = new ArrayList<>(); - if (this.uniqueMetaTag.endsWith(this.id)) { - this.metaId = this.uniqueMetaTag; - keys.add(new NamespacedKey(QuantumRPG.getInstance(), this.uniqueMetaTag)); - keys.add(new NamespacedKey(QuantumRPG.getInstance(), this.uniqueMetaTag+this.id)); - } else { - this.metaId = this.uniqueMetaTag + this.id; - keys.add(new NamespacedKey(QuantumRPG.getInstance(), this.metaId)); - } - keys.add(NamespacedKey.fromString("quantumrpg:" + this.getMetaTag() + this.getId())); + uniqueTag = uniqueTag.toLowerCase(); + this.metaId = uniqueTag.endsWith(this.id) ? uniqueTag : uniqueTag + this.id; + keys.add(new NamespacedKey(QuantumRPG.getInstance(), this.metaId)); this.dataType = dataType; } @@ -107,11 +99,6 @@ public final NamespacedKey getKey() { return this.keys.get(0); } - @NotNull - protected final String getMetaTag() { - return this.uniqueMetaTag; - } - @NotNull public final String getPlaceholder() { return this.placeholder; diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/AmmoAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/AmmoAttribute.java index a0ec4ac2..36cbe455 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/AmmoAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/AmmoAttribute.java @@ -1,6 +1,7 @@ package su.nightexpress.quantumrpg.stats.items.attributes; import org.bukkit.Location; +import org.bukkit.NamespacedKey; import org.bukkit.entity.*; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; @@ -20,6 +21,11 @@ public AmmoAttribute( ) { super(type.name(), name, format, ItemTags.PLACEHOLDER_ITEM_AMMO, ItemTags.TAG_ITEM_AMMO, PersistentDataType.STRING); this.type = type; + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:item_ammo" + this.getId())); + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_ammo" + this.getId())); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_ammo" + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/ChargesAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/ChargesAttribute.java index 75b9e36e..1734ca15 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/ChargesAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/ChargesAttribute.java @@ -1,5 +1,6 @@ package su.nightexpress.quantumrpg.stats.items.attributes; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; @@ -14,6 +15,10 @@ public ChargesAttribute( @NotNull String format ) { super("ITEM_CHARGES", name, format, ItemTags.PLACEHOLDER_ITEM_CHARGES, ItemTags.TAG_ITEM_CHARGES, PersistentDataType.INTEGER_ARRAY); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_chargesitem_charges")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_chargesitem_charges")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java index 15d97977..9faa7862 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DamageAttribute.java @@ -68,6 +68,10 @@ public DamageAttribute( this.defenseAttached = null; ItemStats.registerDynamicStat(this); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_damage_" + this.getId())); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_damage_" + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java index c18f8f44..876ceb4c 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/DefenseAttribute.java @@ -51,6 +51,10 @@ public DefenseAttribute( this.protectionFactor = protectionFactor; ItemStats.registerDynamicStat(this); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_defense_" + this.getId())); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_defense_" + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/HandAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/HandAttribute.java index 73b689eb..db65228d 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/HandAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/HandAttribute.java @@ -1,5 +1,6 @@ package su.nightexpress.quantumrpg.stats.items.attributes; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; @@ -17,6 +18,11 @@ public HandAttribute( ) { super(type.name(), name, format, ItemTags.PLACEHOLDER_ITEM_HAND, ItemTags.TAG_ITEM_HAND, PersistentDataType.STRING); this.type = type; + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:item_hand" + this.getId())); + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_hand" + this.getId())); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_hand" + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SkillAPIAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SkillAPIAttribute.java index 092eadb0..052d6574 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SkillAPIAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SkillAPIAttribute.java @@ -1,6 +1,7 @@ package su.nightexpress.quantumrpg.stats.items.attributes; import mc.promcteam.engine.utils.NumberUT; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; @@ -15,6 +16,9 @@ public SkillAPIAttribute( @NotNull String name, @NotNull String format) { super(id, name, format.replace("%name%", name), "%SKILLAPI_ATTRIBUTE_"+id+"%", ItemTags.TAG_ITEM_SKILLAPI_ATTR, PersistentDataType.INTEGER); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_skillapi_attr_" + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SocketAttribute.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SocketAttribute.java index 7a9919bb..9f22e541 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SocketAttribute.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/SocketAttribute.java @@ -2,6 +2,7 @@ import mc.promcteam.engine.utils.DataUT; import mc.promcteam.engine.utils.StringUT; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -38,13 +39,18 @@ public SocketAttribute( @NotNull String formatValueEmpty, @NotNull String formatValueFilled ) { - super(id, name, format, "%SOCKET_" + type.name() + "_" + id + "%", ItemTags.TAG_ITEM_SOCKET + type.name(), DataUT.STRING_ARRAY); + super(id, name, format, "%SOCKET_" + type.name() + "_" + id + "%", ItemTags.TAG_ITEM_SOCKET + type.name() + '_', DataUT.STRING_ARRAY); this.type = type; this.tier = tier; this.name = this.getTier().format(this.name); this.formatValueEmpty = this.getTier().format(StringUT.color(formatValueEmpty).replace("%name%", this.getName())); this.formatValueFilled = this.getTier().format(StringUT.color(formatValueFilled).replace("%name%", this.getName())); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:item_socket_" + type.name().toLowerCase() + this.getId())); + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_socket_" + type.name().toLowerCase() + this.getId())); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_socket_" + type.name().toLowerCase() + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java index 23d0e1ab..a5ed8ea6 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/api/SimpleStat.java @@ -52,6 +52,10 @@ public SimpleStat( this.cap = cap; ItemStats.registerDynamicStat(this); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_stat_" + this.getId())); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_stat_" + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/stats/DurabilityStat.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/stats/DurabilityStat.java index b6949306..5b4330a5 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/stats/DurabilityStat.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/attributes/stats/DurabilityStat.java @@ -2,6 +2,7 @@ import mc.promcteam.engine.utils.DataUT; import mc.promcteam.engine.utils.random.Rnd; +import org.bukkit.NamespacedKey; import org.bukkit.Sound; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.LivingEntity; @@ -33,6 +34,10 @@ public DurabilityStat( ItemTags.TAG_ITEM_STAT, DataUT.DOUBLE_ARRAY); this.cap = cap; + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_stat_durability")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_stat_durability")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemLevelRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemLevelRequirement.java index a26f82c8..c6aea6ac 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemLevelRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemLevelRequirement.java @@ -1,6 +1,7 @@ package su.nightexpress.quantumrpg.stats.items.requirements.item; import mc.promcteam.engine.config.api.ILangMsg; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; @@ -23,6 +24,10 @@ public ItemLevelRequirement( ItemTags.PLACEHOLDER_REQ_ITEM_LEVEL, ItemTags.TAG_REQ_ITEM_LEVEL, PersistentDataType.INTEGER_ARRAY); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_req_item_levellevel")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_req_item_levellevel")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemModuleRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemModuleRequirement.java index 4790e67d..89200d38 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemModuleRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemModuleRequirement.java @@ -4,6 +4,7 @@ import mc.promcteam.engine.modules.IModule; import mc.promcteam.engine.utils.DataUT; import org.apache.commons.lang.ArrayUtils; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import su.nightexpress.quantumrpg.QuantumRPG; @@ -31,6 +32,10 @@ public ItemModuleRequirement( ItemTags.PLACEHOLDER_REQ_ITEM_MODULE, ItemTags.TAG_REQ_ITEM_LEVEL, DataUT.STRING_ARRAY); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_req_item_levelmodule")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_req_item_levelmodule")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemSocketRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemSocketRequirement.java index 5e748eff..68f2d9c2 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemSocketRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemSocketRequirement.java @@ -3,6 +3,7 @@ import mc.promcteam.engine.config.api.ILangMsg; import mc.promcteam.engine.utils.DataUT; import org.apache.commons.lang.ArrayUtils; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import su.nightexpress.quantumrpg.QuantumRPG; @@ -24,6 +25,10 @@ public ItemSocketRequirement( ItemTags.PLACEHOLDER_REQ_ITEM_SOCKET, ItemTags.TAG_REQ_ITEM_SOCKET, DataUT.STRING_ARRAY); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_req_item_socketsocket")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_req_item_socketsocket")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTierRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTierRequirement.java index 662e1342..2a5d1483 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTierRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTierRequirement.java @@ -1,6 +1,7 @@ package su.nightexpress.quantumrpg.stats.items.requirements.item; import mc.promcteam.engine.config.api.ILangMsg; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; @@ -22,6 +23,10 @@ public ItemTierRequirement(@NotNull String name, @NotNull String format) { ItemTags.PLACEHOLDER_REQ_ITEM_TIER, ItemTags.TAG_REQ_ITEM_TIER, PersistentDataType.STRING); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_req_item_tiertier")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_req_item_tiertier")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTypeRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTypeRequirement.java index c205c00f..bdcc97d6 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTypeRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/item/ItemTypeRequirement.java @@ -3,6 +3,7 @@ import mc.promcteam.engine.config.api.ILangMsg; import mc.promcteam.engine.utils.DataUT; import org.apache.commons.lang.ArrayUtils; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import su.nightexpress.quantumrpg.QuantumRPG; @@ -25,6 +26,10 @@ public ItemTypeRequirement( ItemTags.PLACEHOLDER_REQ_ITEM_TYPE, ItemTags.TAG_REQ_ITEM_TYPE, DataUT.STRING_ARRAY); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_req_item_typetype")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_req_item_typetype")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/AbstractOwnerRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/AbstractOwnerRequirement.java index f19a7df1..1cff351e 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/AbstractOwnerRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/AbstractOwnerRequirement.java @@ -1,6 +1,7 @@ package su.nightexpress.quantumrpg.stats.items.requirements.user; import mc.promcteam.engine.utils.DataUT; +import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import su.nightexpress.quantumrpg.stats.items.ItemTags; @@ -26,6 +27,11 @@ public AbstractOwnerRequirement( ItemTags.TAG_REQ_USER_OWNER, DataUT.UUID ); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:item_user_uuid" + this.getId())); + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_user_uuid" + this.getId())); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_user_uuid" + this.getId())); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/BannedClassRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/BannedClassRequirement.java index 9436742c..ad5dbd66 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/BannedClassRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/BannedClassRequirement.java @@ -25,7 +25,10 @@ public BannedClassRequirement(@NotNull String name, @NotNull String format) { ItemTags.PLACEHOLDER_REQ_USER_BANNED_CLASS, ItemTags.TAG_REQ_USER_BANNED_CLASS, DataUT.STRING_ARRAY); - this.keys.add(NamespacedKey.fromString("prorpgitems:item_user_banned_classbanned-class")); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_user_banned_classbanned-class")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_user_banned_classbanned-class")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/ClassRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/ClassRequirement.java index 1686fdbf..6fc5e4b0 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/ClassRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/ClassRequirement.java @@ -2,6 +2,7 @@ import mc.promcteam.engine.config.api.ILangMsg; import mc.promcteam.engine.utils.DataUT; +import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -27,6 +28,10 @@ public ClassRequirement( ItemTags.PLACEHOLDER_REQ_USER_CLASS, ItemTags.TAG_REQ_USER_CLASS, DataUT.STRING_ARRAY); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_user_classclass")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_user_classclass")); } @Override diff --git a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/LevelRequirement.java b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/LevelRequirement.java index c55b1e27..9838e681 100644 --- a/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/LevelRequirement.java +++ b/src/main/java/su/nightexpress/quantumrpg/stats/items/requirements/user/LevelRequirement.java @@ -1,6 +1,7 @@ package su.nightexpress.quantumrpg.stats.items.requirements.user; import mc.promcteam.engine.config.api.ILangMsg; +import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; @@ -24,6 +25,10 @@ public LevelRequirement( ItemTags.PLACEHOLDER_REQ_USER_LEVEL, ItemTags.TAG_REQ_USER_LEVEL, PersistentDataType.INTEGER_ARRAY); + + // Legacy keys + this.keys.add(NamespacedKey.fromString("prorpgitems:qrpg_item_user_levellevel")); + this.keys.add(NamespacedKey.fromString("quantumrpg:qrpg_item_user_levellevel")); } @Override