Add support for slotted attributes (#1447)

Signed-off-by: Pablo Herrera <[email protected]>
PGMDev · Nov 30, 2024 · d950e43 · d950e43
1 parent 4afe76d
commit d950e43
Show file tree

Hide file tree

Showing 21 changed files with 797 additions and 562 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/flag/state/Carried.java b/core/src/main/java/tc/oc/pgm/flag/state/Carried.java
@@ -43,13 +43,13 @@
 import tc.oc.pgm.flag.event.FlagCaptureEvent;
 import tc.oc.pgm.flag.event.FlagStateChangeEvent;
 import tc.oc.pgm.goals.events.GoalEvent;
-import tc.oc.pgm.kits.ArmorType;
 import tc.oc.pgm.kits.Kit;
 import tc.oc.pgm.score.ScoreMatchModule;
 import tc.oc.pgm.scoreboard.SidebarMatchModule;
 import tc.oc.pgm.spawns.events.ParticipantDespawnEvent;
 import tc.oc.pgm.teams.TeamFactory;
 import tc.oc.pgm.teams.TeamMatchModule;
+import tc.oc.pgm.util.inventory.ArmorType;
 import tc.oc.pgm.util.named.NameStyle;
 
 /** State of a flag when a player has picked it up and is wearing the banner on their head. */

diff --git a/core/src/main/java/tc/oc/pgm/itemmeta/ItemRule.java b/core/src/main/java/tc/oc/pgm/itemmeta/ItemRule.java
@@ -1,5 +1,6 @@
 package tc.oc.pgm.itemmeta;
 
+import static tc.oc.pgm.util.attribute.AttributeUtils.ATTRIBUTE_UTILS;
 import static tc.oc.pgm.util.inventory.InventoryUtils.INVENTORY_UTILS;
 
 import java.util.EnumSet;
@@ -43,14 +44,12 @@ public void apply(ItemStack stack) {
 
       InventoryUtils.addEnchantments(meta, this.meta.getEnchants());
 
-      INVENTORY_UTILS.copyAttributeModifiers(meta, this.meta);
+      ATTRIBUTE_UTILS.copyAttributeModifiers(meta, this.meta);
 
-      Set<Material> canDestroy =
-          unionMaterials(
-              INVENTORY_UTILS.getCanDestroy(meta), INVENTORY_UTILS.getCanDestroy(this.meta));
-      Set<Material> canPlaceOn =
-          unionMaterials(
-              INVENTORY_UTILS.getCanPlaceOn(meta), INVENTORY_UTILS.getCanPlaceOn(this.meta));
+      Set<Material> canDestroy = unionMaterials(
+          INVENTORY_UTILS.getCanDestroy(meta), INVENTORY_UTILS.getCanDestroy(this.meta));
+      Set<Material> canPlaceOn = unionMaterials(
+          INVENTORY_UTILS.getCanPlaceOn(meta), INVENTORY_UTILS.getCanPlaceOn(this.meta));
 
       if (!canDestroy.isEmpty()) INVENTORY_UTILS.setCanDestroy(meta, canDestroy);
       if (!canPlaceOn.isEmpty()) INVENTORY_UTILS.setCanPlaceOn(meta, canPlaceOn);

diff --git a/core/src/main/java/tc/oc/pgm/kits/ApplyItemKitEvent.java b/core/src/main/java/tc/oc/pgm/kits/ApplyItemKitEvent.java
@@ -4,6 +4,7 @@
 import java.util.*;
 import org.bukkit.inventory.ItemStack;
 import tc.oc.pgm.api.player.MatchPlayer;
+import tc.oc.pgm.util.inventory.Slot;
 
 /**
  * Fired when an {@link ItemKit} is applied to a player. The kit can be modified through the

diff --git a/core/src/main/java/tc/oc/pgm/kits/ArmorKit.java b/core/src/main/java/tc/oc/pgm/kits/ArmorKit.java
@@ -6,6 +6,7 @@
 import org.bukkit.inventory.ItemStack;
 import tc.oc.pgm.api.player.MatchPlayer;
 import tc.oc.pgm.kits.tag.ItemModifier;
+import tc.oc.pgm.util.inventory.ArmorType;
 
 public class ArmorKit extends AbstractKit {
   public static class ArmorItem {

diff --git a/core/src/main/java/tc/oc/pgm/kits/ItemKit.java b/core/src/main/java/tc/oc/pgm/kits/ItemKit.java
@@ -12,6 +12,7 @@
 import tc.oc.pgm.api.player.MatchPlayer;
 import tc.oc.pgm.kits.tag.ItemModifier;
 import tc.oc.pgm.util.inventory.InventoryUtils;
+import tc.oc.pgm.util.inventory.Slot;
 
 public class ItemKit implements KitDefinition {
   public static final int INFINITE_STACK_SIZE = 99;

diff --git a/core/src/main/java/tc/oc/pgm/kits/KitMatchModule.java b/core/src/main/java/tc/oc/pgm/kits/KitMatchModule.java
@@ -29,6 +29,7 @@
 import tc.oc.pgm.kits.tag.Grenade;
 import tc.oc.pgm.kits.tag.ItemTags;
 import tc.oc.pgm.util.event.ItemTransferEvent;
+import tc.oc.pgm.util.inventory.Slot;
 
 @ListenerScope(MatchScope.RUNNING)
 public class KitMatchModule implements MatchModule, Listener {

diff --git a/core/src/main/java/tc/oc/pgm/kits/KitParser.java b/core/src/main/java/tc/oc/pgm/kits/KitParser.java
@@ -1,5 +1,6 @@
 package tc.oc.pgm.kits;
 
+import static tc.oc.pgm.util.attribute.AttributeUtils.ATTRIBUTE_UTILS;
 import static tc.oc.pgm.util.inventory.InventoryUtils.INVENTORY_UTILS;
 import static tc.oc.pgm.util.nms.NMSHacks.NMS_HACKS;
 
@@ -59,8 +60,10 @@
 import tc.oc.pgm.teams.TeamFactory;
 import tc.oc.pgm.teams.Teams;
 import tc.oc.pgm.util.bukkit.BukkitUtils;
+import tc.oc.pgm.util.inventory.ArmorType;
 import tc.oc.pgm.util.inventory.InventoryUtils;
 import tc.oc.pgm.util.inventory.ItemMatcher;
+import tc.oc.pgm.util.inventory.Slot;
 import tc.oc.pgm.util.material.ItemMaterialData;
 import tc.oc.pgm.util.material.MaterialData;
 import tc.oc.pgm.util.material.Materials;
@@ -344,7 +347,7 @@ public SetMultimap<Attribute, AttributeModifier> parseAttributeModifiers(Element
     if (attr != null) {
       for (String modifierText : Splitter.on(";").split(attr.getValue())) {
         var mod = XMLUtils.parseCompactAttributeModifier(attr, modifierText);
-        modifiers.put(mod.getKey(), mod.getValue());
+        modifiers.put(mod.getLeft(), mod.getRight());
       }
     }
 
@@ -536,7 +539,7 @@ public void parseItemMeta(Element el, ItemMeta meta) throws InvalidXMLException
       }
     }
 
-    INVENTORY_UTILS.applyAttributeModifiers(parseAttributeModifiers(el), meta);
+    ATTRIBUTE_UTILS.applyAttributeModifiers(parseAttributeModifiers(el), meta);
 
     String customName = el.getAttributeValue("name");
     if (customName != null) {

diff --git a/core/src/main/java/tc/oc/pgm/kits/Slot.java b/core/src/main/java/tc/oc/pgm/kits/Slot.java