Update Attribute Component

API/src/main/java/fr/maxlego08/menu/api/itemstack/components/AttributeModifiersComponent.java

@@ -1,39 +1,40 @@
 package fr.maxlego08.menu.api.itemstack.components;
 
+import fr.maxlego08.menu.api.MenuPlugin;
+import fr.maxlego08.menu.api.attribute.AttributApplier;
+import fr.maxlego08.menu.api.attribute.AttributeMergeStrategy;
+import fr.maxlego08.menu.api.attribute.AttributeWrapper;
 import fr.maxlego08.menu.api.context.BuildContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
-import fr.maxlego08.menu.api.utils.Tuples;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 @SuppressWarnings("unused")
 public class AttributeModifiersComponent extends ItemComponent {
-
-    private final List<Tuples<@NotNull Attribute,@NotNull AttributeModifier>> modifiers;
-
-    public AttributeModifiersComponent(List<Tuples<@NotNull Attribute,@NotNull AttributeModifier>> modifiers) {
-        this.modifiers = modifiers;
+    private final MenuPlugin plugin;
+    private final AttributApplier attributApplier;
+    private final List<AttributeWrapper> attributes;
+    private final AttributeMergeStrategy mergeStrategy;
+
+    public AttributeModifiersComponent(MenuPlugin plugin, @NotNull List<AttributeWrapper> attributes, @Nullable AttributeMergeStrategy mergeStrategy) {
+        this.plugin = plugin;
+        this.attributApplier = plugin.getAttributApplier();
+        this.attributes = attributes;
+        this.mergeStrategy = mergeStrategy;
     }
 
-    public List<Tuples<@NotNull Attribute,@NotNull AttributeModifier>> getModifiers() {
-        return this.modifiers;
+    @NotNull
+    public List<AttributeWrapper> getAttributes() {
+        return attributes;
     }
 
     @Override
     public void apply(@NotNull BuildContext context, @NotNull ItemStack itemStack, @Nullable Player player) {
-        ItemMeta itemMeta = itemStack.getItemMeta();
-        if (itemMeta == null) return;
-        for (Tuples<Attribute, AttributeModifier> tuple : this.modifiers) {
-            itemMeta.addAttributeModifier(tuple.getFirst(), tuple.getSecond());
-        }
-        itemStack.setItemMeta(itemMeta);
+        attributApplier.applyAttributesModern(itemStack, this.attributes, this.plugin, this.mergeStrategy);
     }
 
 }

Hooks/PacketEvents/src/main/java/fr/maxlego08/menu/hooks/packetevents/listener/PacketAnimationListener.java

@@ -90,7 +90,7 @@ public void onPacketSend(PacketSendEvent event) {
                 }
             };
 
-            if (Bukkit.isPrimaryThread()) {
+            if (Bukkit.isPrimaryThread() || this.plugin.isEnabled()) {
                 task.run();
             } else {
                 this.plugin.getScheduler().runNextTick(w -> task.run());
@@ -110,7 +110,7 @@ public void onPacketSend(PacketSendEvent event) {
                 }
             };
 
-            if (Bukkit.isPrimaryThread()) {
+            if (Bukkit.isPrimaryThread() || this.plugin.isEnabled()) {
                 task.run();
             } else {
                 this.plugin.getScheduler().runNextTick(w -> task.run());
@@ -148,7 +148,7 @@ public void onPacketSend(PacketSendEvent event) {
                 }
             };
 
-            if (Bukkit.isPrimaryThread()) {
+            if (Bukkit.isPrimaryThread() || !this.plugin.isEnabled()) {
                 task.run();
             } else {
                 this.plugin.getScheduler().runNextTick(w -> task.run());

src/main/java/fr/maxlego08/menu/ZComponentsManager.java

@@ -8,7 +8,6 @@
 import fr.maxlego08.menu.common.utils.nms.NmsVersion;
 import fr.maxlego08.menu.itemstack.components.paper.PaperVariantComponent;
 import fr.maxlego08.menu.itemstack.components.spigot.SpigotVariantComponent;
-import fr.maxlego08.menu.loader.components.spigot.SpigotPotionDurationScaleItemComponentLoader;
 import fr.maxlego08.menu.loader.components.paper.*;
 import fr.maxlego08.menu.loader.components.spigot.*;
 import org.jetbrains.annotations.NotNull;
@@ -32,7 +31,7 @@ public void initializeDefaultComponents(MenuPlugin plugin) {
             this.initializeVariantComponents(plugin);
 
             this.registerComponent(new SpigotBlockStateItemComponentLoader());
-            this.registerComponent(new SpigotAttributeModifiersItemComponentLoader());
+            this.registerComponent(new SpigotAttributeModifiersItemComponentLoader(plugin));
             this.registerComponent(new SpigotBannerPatternsItemComponentLoader());
             this.registerComponent(new SpigotBaseColorItemComponentLoader());
             this.registerComponent(new SpigotBundleContentsItemComponentLoader(plugin));

src/main/java/fr/maxlego08/menu/loader/components/spigot/SpigotAttributeModifiersItemComponentLoader.java

@@ -1,11 +1,13 @@
 package fr.maxlego08.menu.loader.components.spigot;
 
+import fr.maxlego08.menu.api.MenuPlugin;
+import fr.maxlego08.menu.api.attribute.AttributeMergeStrategy;
+import fr.maxlego08.menu.api.attribute.AttributeWrapper;
 import fr.maxlego08.menu.api.configuration.Configuration;
 import fr.maxlego08.menu.api.context.MenuItemStackContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
 import fr.maxlego08.menu.api.itemstack.components.AttributeModifiersComponent;
 import fr.maxlego08.menu.api.loader.ItemComponentLoader;
-import fr.maxlego08.menu.api.utils.Tuples;
 import fr.maxlego08.menu.zcore.logger.Logger;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
@@ -22,16 +24,25 @@
 import java.util.Map;
 
 public class SpigotAttributeModifiersItemComponentLoader extends ItemComponentLoader {
+    private final MenuPlugin plugin;
 
-    public SpigotAttributeModifiersItemComponentLoader(){
+    public SpigotAttributeModifiersItemComponentLoader(MenuPlugin plugin){
         super("attribute-modifiers");
+        this.plugin = plugin;
     }
 
     @Override
     public @Nullable ItemComponent load(@NotNull MenuItemStackContext context, @NotNull File file, @NotNull YamlConfiguration configuration, @NotNull String path, @Nullable ConfigurationSection componentSection) {
-        path = normalizePath(path);
-        List<Map<?, ?>> mapList = configuration.getMapList(path);
-        List<Tuples<Attribute, AttributeModifier>> modifiers = new ArrayList<>();
+        if (componentSection == null) return null;
+        String mergeStrategyStr = componentSection.getString("attribute-merge-strategy", "");
+        AttributeMergeStrategy mergeStrategy;
+        try {
+            mergeStrategy = AttributeMergeStrategy.valueOf(mergeStrategyStr.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            mergeStrategy = AttributeMergeStrategy.ADD;
+        }
+        List<Map<?, ?>> mapList = componentSection.getMapList("modifiers");
+        List<AttributeWrapper> modifiersWrapper = new ArrayList<>();
         for (Map<?, ?> rawMap : mapList) {
             @SuppressWarnings("unchecked")
             Map<String, Object> map = (Map<String, Object>) rawMap;
@@ -48,7 +59,7 @@ public SpigotAttributeModifiersItemComponentLoader(){
             if (attribute == null) continue;
             try {
                 AttributeModifier deserialize = AttributeModifier.deserialize(map);
-                modifiers.add(new Tuples<>(attribute, deserialize));
+                modifiersWrapper.add(new AttributeWrapper(attribute, deserialize.getOperation(), deserialize.getAmount(), deserialize.getSlotGroup()));
             } catch (IllegalArgumentException e) {
                 if (Configuration.enableDebug){
                     Logger.info("Error deserializing attribute modifier for attribute " + attribute.name() + ": " + e.getMessage());
@@ -57,6 +68,6 @@ public SpigotAttributeModifiersItemComponentLoader(){
 
             }
         }
-        return modifiers.isEmpty() ? null : new AttributeModifiersComponent(modifiers);
+        return modifiersWrapper.isEmpty() ? null : new AttributeModifiersComponent(this.plugin,modifiersWrapper, mergeStrategy);
     }
 }