Skip to content

Add EquipedSlot and isSwappableEquipement #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Maxlego08 merged 1 commit into from
Aug 12, 2025
Merged

Add EquipedSlot and isSwappableEquipement #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 23 additions & 0 deletions API/src/main/java/fr/maxlego08/items/api/configurations/ItemConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Axolotl;
import org.bukkit.entity.Player;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.EquipmentSlotGroup;
import org.bukkit.inventory.ItemRarity;
import org.bukkit.inventory.meta.ArmorMeta;
Expand Down Expand Up @@ -107,6 +108,8 @@ public class ItemConfiguration {
private final YamlConfiguration configuration;
private final boolean repairDisabled;
private String equippedModel= null;
private EquipmentSlot equippedSlot = null;
private boolean swappableEquipment = false;
private AxolotlBucketConfiguration axolotlBucketConfiguration;
private BannerMetaConfiguration bannerMetaConfiguration;
private PotionMetaConfiguration potionMetaConfiguration;
Expand Down Expand Up @@ -246,6 +249,18 @@ public ItemConfiguration(ItemPlugin plugin, YamlConfiguration configuration, Str
if (equippedModel != null && !equippedModel.isEmpty()) {
this.equippedModel = equippedModel;
}
String equippedSlotString = configuration.getString(path + "equipped-slot");
if (equippedSlotString != null && !equippedSlotString.isEmpty()) {
try {
this.equippedSlot = EquipmentSlot.valueOf(equippedSlotString.toUpperCase());
} catch (IllegalArgumentException e) {
plugin.getLogger().severe("Equipped slot " + equippedSlotString + " is not valid for item " + fileName);
}
}
boolean swappableEquipment = configuration.getBoolean(path + "swappable-equipment", false);
if (swappableEquipment && this.equippedModel != null && this.equippedSlot != null) {
this.swappableEquipment = true;
}

this.loadAxolotl(plugin, configuration, fileName, path);
this.loadBanner(plugin, configuration, fileName, path);
Expand Down Expand Up @@ -613,6 +628,14 @@ public String getEquippedModel() {
return equippedModel;
}

public EquipmentSlot getEquippedSlot() {
return equippedSlot;
}

public boolean isSwappableEquipment() {
return swappableEquipment;
}

public CommandsConfiguration getCommandsConfiguration() {
return commandsConfiguration;
}
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/fr/maxlego08/items/ZItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.bukkit.NamespacedKey;
import org.bukkit.attribute.AttributeModifier;
import org.bukkit.entity.Player;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ArmorMeta;
Expand Down Expand Up @@ -132,10 +133,18 @@ public ItemStack build(Player player, int amount) {
persistentDataContainer.set(this.plugin.getRuneManager().getRuneRepresentKey(), this.plugin.getRuneManager().getDataType(), this.configuration.getItemRuneConfiguration().rune());
}

if (this.configuration.getEquippedModel() != null){
String[] split = this.configuration.getEquippedModel().split(":",2);
if (this.configuration.getEquippedModel() != null || this.configuration.getEquippedSlot() != null) {
EquippableComponent equippableComponent = itemMeta.getEquippable();
equippableComponent.setModel(new NamespacedKey(split[0], split[1]));
if (this.configuration.getEquippedModel() != null) {
String[] split = this.configuration.getEquippedModel().split(":",2);
equippableComponent.setModel(new NamespacedKey(split[0], split[1]));
}
if (this.configuration.getEquippedSlot() != null) {
equippableComponent.setSlot(this.configuration.getEquippedSlot());
}
if (this.configuration.isSwappableEquipment()){
equippableComponent.setSwappable(this.configuration.isSwappableEquipment());
}
itemMeta.setEquippable(equippableComponent);
}

Expand Down