Add missing copper variant for eartharmor and change gracefuldescent to be affected by heavy armor

PrimordialMoros · PrimordialMoros · commit 59639d7d5384 · 2025-12-16T18:51:22.000+02:00
diff --git a/api/src/main/java/me/moros/bending/api/platform/entity/AttributeProperties.java b/api/src/main/java/me/moros/bending/api/platform/entity/AttributeProperties.java
@@ -31,5 +31,7 @@ public interface AttributeProperties {
 
   boolean baseValue(AttributeType type, double baseValue);
 
-  boolean modify(AttributeType type, Key key, ModifierOperation operation, double value);
+  boolean addModifier(AttributeType type, Key key, ModifierOperation operation, double value);
+
+  boolean removeModifier(AttributeType type, Key key);
 }
diff --git a/api/src/main/java/me/moros/bending/api/temporal/TempArmor.java b/api/src/main/java/me/moros/bending/api/temporal/TempArmor.java
@@ -70,26 +70,26 @@ public static Builder builder() {
 
   public static Builder leather() {
     return builder()
-      .head(Item.LEATHER_HELMET)
-      .chest(Item.LEATHER_CHESTPLATE)
-      .legs(Item.LEATHER_LEGGINGS)
-      .feet(Item.LEATHER_BOOTS);
+      .head(Item.LEATHER_HELMET).chest(Item.LEATHER_CHESTPLATE)
+      .legs(Item.LEATHER_LEGGINGS).feet(Item.LEATHER_BOOTS);
   }
 
   public static Builder iron() {
     return builder()
-      .head(Item.IRON_HELMET)
-      .chest(Item.IRON_CHESTPLATE)
-      .legs(Item.IRON_LEGGINGS)
-      .feet(Item.IRON_BOOTS);
+      .head(Item.IRON_HELMET).chest(Item.IRON_CHESTPLATE)
+      .legs(Item.IRON_LEGGINGS).feet(Item.IRON_BOOTS);
   }
 
   public static Builder gold() {
     return builder()
-      .head(Item.GOLDEN_HELMET)
-      .chest(Item.GOLDEN_CHESTPLATE)
-      .legs(Item.GOLDEN_LEGGINGS)
-      .feet(Item.GOLDEN_BOOTS);
+      .head(Item.GOLDEN_HELMET).chest(Item.GOLDEN_CHESTPLATE)
+      .legs(Item.GOLDEN_LEGGINGS).feet(Item.GOLDEN_BOOTS);
+  }
+
+  public static Builder copper() {
+    return builder()
+      .head(Item.COPPER_HELMET).chest(Item.COPPER_CHESTPLATE)
+      .legs(Item.COPPER_LEGGINGS).feet(Item.COPPER_BOOTS);
   }
 
   public static final class Builder {
diff --git a/api/src/main/java/me/moros/bending/api/util/material/MaterialUtil.java b/api/src/main/java/me/moros/bending/api/util/material/MaterialUtil.java
@@ -97,6 +97,7 @@ public static void init() {
       .buildAndRegister();
     BlockTag.builder(LOCKABLE_CONTAINERS.key())
       .add(BlockTag.reference(KeyUtil.simple("extra_lockable_containers")))
+      .add(BlockTag.COPPER_CHESTS)
       .add(BlockType.CHEST, BlockType.TRAPPED_CHEST, BlockType.BARREL, BlockType.SHULKER_BOX,
         BlockType.FURNACE, BlockType.BLAST_FURNACE, BlockType.SMOKER, BlockType.BEACON,
         BlockType.DISPENSER, BlockType.DROPPER, BlockType.HOPPER, BlockType.BREWING_STAND)
@@ -117,6 +118,7 @@ public static void init() {
       .add(ItemTag.reference(KeyUtil.simple("extra_metal_armor")))
       .add(Item.IRON_HELMET, Item.IRON_CHESTPLATE, Item.IRON_LEGGINGS, Item.IRON_BOOTS,
         Item.GOLDEN_HELMET, Item.GOLDEN_CHESTPLATE, Item.GOLDEN_LEGGINGS, Item.GOLDEN_BOOTS,
+        Item.COPPER_HELMET, Item.COPPER_CHESTPLATE, Item.COPPER_LEGGINGS, Item.COPPER_BOOTS,
         Item.CHAINMAIL_HELMET, Item.CHAINMAIL_CHESTPLATE, Item.CHAINMAIL_LEGGINGS, Item.CHAINMAIL_BOOTS,
         Item.NETHERITE_HELMET, Item.NETHERITE_CHESTPLATE, Item.NETHERITE_LEGGINGS, Item.NETHERITE_BOOTS)
       .buildAndRegister();
diff --git a/common/src/main/java/me/moros/bending/common/ability/air/passive/GracefulDescent.java b/common/src/main/java/me/moros/bending/common/ability/air/passive/GracefulDescent.java
@@ -19,12 +19,25 @@
 
 package me.moros.bending.common.ability.air.passive;
 
+import java.util.List;
+
 import me.moros.bending.api.ability.AbilityDescription;
 import me.moros.bending.api.ability.AbilityInstance;
 import me.moros.bending.api.ability.Activation;
+import me.moros.bending.api.config.Configurable;
+import me.moros.bending.api.config.attribute.Attribute;
+import me.moros.bending.api.config.attribute.Modifiable;
+import me.moros.bending.api.config.attribute.ModifierOperation;
+import me.moros.bending.api.platform.entity.AttributeType;
+import me.moros.bending.api.platform.entity.EntityProperties;
 import me.moros.bending.api.user.User;
+import org.spongepowered.configurate.objectmapping.meta.Comment;
 
 public class GracefulDescent extends AbilityInstance {
+  private Config userConfig;
+
+  private boolean modifiedFall = false;
+
   public GracefulDescent(AbilityDescription desc) {
     super(desc);
   }
@@ -38,15 +51,53 @@ public boolean activate(User user, Activation method) {
 
   @Override
   public void loadConfig() {
+    userConfig = user.game().configProcessor().calculate(this, Config.class);
   }
 
   @Override
   public UpdateResult update() {
+    if (!modifiedFall) {
+      user.propertyValue(EntityProperties.ATTRIBUTES)
+        .addModifier(
+          AttributeType.SAFE_FALL_DISTANCE, description().key(),
+          ModifierOperation.ADDITIVE, userConfig.safeFallDistanceBonus
+        );
+      modifiedFall = true;
+    }
     return UpdateResult.CONTINUE;
   }
 
+  @Override
+  public void onDestroy() {
+    user.propertyValue(EntityProperties.ATTRIBUTES)
+      .removeModifier(AttributeType.SAFE_FALL_DISTANCE, description().key());
+    modifiedFall = false;
+  }
+
+  private boolean isGraceful() {
+    if (!user.canBend(description())) {
+      return false;
+    }
+    return user.propertyValue(EntityProperties.ATTRIBUTES)
+      .value(AttributeType.ARMOR).orElse(0) < userConfig.heavyArmorThreshold;
+  }
+
   public static boolean isGraceful(User user) {
     return user.game().abilityManager(user.worldKey()).firstInstance(user, GracefulDescent.class)
-      .map(a -> user.canBend(a.description())).orElse(false);
+      .map(GracefulDescent::isGraceful).orElse(false);
+  }
+
+  private static final class Config implements Configurable {
+    @Modifiable(Attribute.HEIGHT)
+    private double safeFallDistanceBonus = 8;
+
+    @Comment("Armor points greater than or equal to this value are considered heavy and the passive will no longer function.")
+    @Modifiable(Attribute.STRENGTH)
+    private int heavyArmorThreshold = 8; // full leather armor provides 7 armor
+
+    @Override
+    public List<String> path() {
+      return List.of("abilities", "air", "passives", "gracefuldescent");
+    }
   }
 }
diff --git a/common/src/main/java/me/moros/bending/common/ability/earth/EarthArmor.java b/common/src/main/java/me/moros/bending/common/ability/earth/EarthArmor.java
@@ -30,6 +30,7 @@
 import me.moros.bending.api.config.attribute.Modifiable;
 import me.moros.bending.api.platform.block.Block;
 import me.moros.bending.api.platform.block.BlockState;
+import me.moros.bending.api.platform.block.BlockTag;
 import me.moros.bending.api.platform.block.BlockType;
 import me.moros.bending.api.platform.entity.EntityUtil;
 import me.moros.bending.api.platform.potion.PotionEffect;
@@ -49,7 +50,7 @@
 import me.moros.math.Vector3d;
 
 public class EarthArmor extends AbilityInstance {
-  private enum Mode {ROCK, IRON, GOLD}
+  private enum Mode {ROCK, IRON, GOLD, COPPER}
 
   private Config userConfig;
   private RemovalPolicy removalPolicy;
@@ -80,7 +81,13 @@ public boolean activate(User user, Activation method) {
     }
 
     if (EarthMaterials.isMetalBendable(source)) {
-      mode = source.type() == BlockType.GOLD_BLOCK ? Mode.GOLD : Mode.IRON;
+      if (BlockTag.COPPER.isTagged(source) || source.type() == BlockType.RAW_COPPER_BLOCK) {
+        mode = Mode.COPPER;
+      } else if (source.type() == BlockType.GOLD_BLOCK || source.type() == BlockType.RAW_GOLD_BLOCK) {
+        mode = Mode.GOLD;
+      } else {
+        mode = Mode.IRON;
+      }
       resistance = userConfig.metalPower;
       SoundEffect.METAL.play(source);
     } else {
@@ -120,6 +127,7 @@ private void formArmor() {
       case ROCK -> TempArmor.leather();
       case IRON -> TempArmor.iron();
       case GOLD -> TempArmor.gold();
+      case COPPER -> TempArmor.copper();
     };
     if (armorBuilder.duration(userConfig.duration).build(user).isEmpty()) {
       removalPolicy = (u, d) -> true;
diff --git a/fabric/src/main/java/me/moros/bending/fabric/platform/entity/FabricAttributes.java b/fabric/src/main/java/me/moros/bending/fabric/platform/entity/FabricAttributes.java
@@ -53,7 +53,7 @@ public boolean baseValue(AttributeType type, double baseValue) {
   }
 
   @Override
-  public boolean modify(AttributeType type, Key key, ModifierOperation operation, double value) {
+  public boolean addModifier(AttributeType type, Key key, ModifierOperation operation, double value) {
     var instance = handle().getInstance(PlatformAdapter.toFabricAttribute(type));
     if (instance == null) {
       return false;
@@ -63,4 +63,10 @@ public boolean modify(AttributeType type, Key key, ModifierOperation operation,
     instance.addTransientModifier(new AttributeModifier(id, value, op));
     return true;
   }
+
+  @Override
+  public boolean removeModifier(AttributeType type, Key key) {
+    var instance = handle().getInstance(PlatformAdapter.toFabricAttribute(type));
+    return instance != null && instance.removeModifier(PlatformAdapter.identifier(key));
+  }
 }
diff --git a/paper/src/main/java/me/moros/bending/paper/platform/entity/BukkitAttributes.java b/paper/src/main/java/me/moros/bending/paper/platform/entity/BukkitAttributes.java
@@ -54,7 +54,7 @@ public boolean baseValue(AttributeType type, double baseValue) {
   }
 
   @Override
-  public boolean modify(AttributeType type, Key key, ModifierOperation operation, double value) {
+  public boolean addModifier(AttributeType type, Key key, ModifierOperation operation, double value) {
     var instance = attributeInstance(type);
     if (instance == null) {
       return false;
@@ -65,6 +65,16 @@ public boolean modify(AttributeType type, Key key, ModifierOperation operation,
     return true;
   }
 
+  @Override
+  public boolean removeModifier(AttributeType type, Key key) {
+    var instance = attributeInstance(type);
+    if (instance == null) {
+      return false;
+    }
+    instance.removeModifier(key);
+    return instance.getModifier(key) == null;
+  }
+
   private AttributeInstance attributeInstance(AttributeType type) {
     return handle().getAttribute(PlatformAdapter.toBukkitAttribute(type));
   }

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,7 @@ public interface AttributeProperties {`
`31`	`31`
`32`	`32`	`boolean baseValue(AttributeType type, double baseValue);`
`33`	`33`
`34`		`- boolean modify(AttributeType type, Key key, ModifierOperation operation, double value);`
	`34`	`+ boolean addModifier(AttributeType type, Key key, ModifierOperation operation, double value);`
	`35`	`+`
	`36`	`+ boolean removeModifier(AttributeType type, Key key);`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public boolean baseValue(AttributeType type, double baseValue) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public boolean modify(AttributeType type, Key key, ModifierOperation operation, double value) {`
	`56`	`+ public boolean addModifier(AttributeType type, Key key, ModifierOperation operation, double value) {`
`57`	`57`	`var instance = handle().getInstance(PlatformAdapter.toFabricAttribute(type));`
`58`	`58`	`if (instance == null) {`
`59`	`59`	`return false;`
`@@ -63,4 +63,10 @@ public boolean modify(AttributeType type, Key key, ModifierOperation operation,`
`63`	`63`	`instance.addTransientModifier(new AttributeModifier(id, value, op));`
`64`	`64`	`return true;`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ @Override`
	`68`	`+ public boolean removeModifier(AttributeType type, Key key) {`
	`69`	`+ var instance = handle().getInstance(PlatformAdapter.toFabricAttribute(type));`
	`70`	`+ return instance != null && instance.removeModifier(PlatformAdapter.identifier(key));`
	`71`	`+ }`
`66`	`72`	`}`