From 3d90ddab46ab8231094d3fd8b571f38fd74fd1b3 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 24 Feb 2025 19:43:40 -0500 Subject: [PATCH] Renaming --- .../noppes/npcs/attribute/AttributeController.java | 2 +- .../noppes/npcs/attribute/AttributeDefinition.java | 10 +++++----- .../java/noppes/npcs/attribute/AttributeModifier.java | 10 +++++----- .../{Operation.java => AttributeValueType.java} | 2 +- src/main/java/noppes/npcs/attribute/ModAttributes.java | 10 +++++----- .../npcs/attribute/ModifiableAttributeInstance.java | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/noppes/npcs/attribute/{Operation.java => AttributeValueType.java} (79%) diff --git a/src/main/java/noppes/npcs/attribute/AttributeController.java b/src/main/java/noppes/npcs/attribute/AttributeController.java index 4e4ffbb5d..516620796 100644 --- a/src/main/java/noppes/npcs/attribute/AttributeController.java +++ b/src/main/java/noppes/npcs/attribute/AttributeController.java @@ -13,7 +13,7 @@ public class AttributeController { private static final Map definitions = new HashMap<>(); private static int nextId = 0; - public static AttributeDefinition registerAttribute(String key, String displayName, Operation op) { + public static AttributeDefinition registerAttribute(String key, String displayName, AttributeValueType op) { if (definitions.containsKey(key)) { return definitions.get(key); } diff --git a/src/main/java/noppes/npcs/attribute/AttributeDefinition.java b/src/main/java/noppes/npcs/attribute/AttributeDefinition.java index 5ba597661..9657d1572 100644 --- a/src/main/java/noppes/npcs/attribute/AttributeDefinition.java +++ b/src/main/java/noppes/npcs/attribute/AttributeDefinition.java @@ -9,13 +9,13 @@ public class AttributeDefinition { private final int id; private final String key; // e.g., "cnpc:main_attack_flat" private final String displayName; // Human‑readable name - private final Operation operation; + private final AttributeValueType attributeValueType; - public AttributeDefinition(int id, String key, String displayName, Operation operation) { + public AttributeDefinition(int id, String key, String displayName, AttributeValueType attributeValueType) { this.id = id; this.key = key; this.displayName = displayName; - this.operation = operation; + this.attributeValueType = attributeValueType; } public int getId() { @@ -30,7 +30,7 @@ public class AttributeDefinition { return displayName; } - public Operation getOperation() { - return operation; + public AttributeValueType getOperation() { + return attributeValueType; } } diff --git a/src/main/java/noppes/npcs/attribute/AttributeModifier.java b/src/main/java/noppes/npcs/attribute/AttributeModifier.java index 9f821283f..9401f93c7 100644 --- a/src/main/java/noppes/npcs/attribute/AttributeModifier.java +++ b/src/main/java/noppes/npcs/attribute/AttributeModifier.java @@ -11,13 +11,13 @@ public class AttributeModifier { private final UUID id; private final String name; private final double amount; - private final Operation operation; + private final AttributeValueType attributeValueType; - public AttributeModifier(UUID id, String name, double amount, Operation operation) { + public AttributeModifier(UUID id, String name, double amount, AttributeValueType attributeValueType) { this.id = id; this.name = name; this.amount = amount; - this.operation = operation; + this.attributeValueType = attributeValueType; } public UUID getId() { @@ -32,7 +32,7 @@ public class AttributeModifier { return amount; } - public Operation getOperation() { - return operation; + public AttributeValueType getOperation() { + return attributeValueType; } } diff --git a/src/main/java/noppes/npcs/attribute/Operation.java b/src/main/java/noppes/npcs/attribute/AttributeValueType.java similarity index 79% rename from src/main/java/noppes/npcs/attribute/Operation.java rename to src/main/java/noppes/npcs/attribute/AttributeValueType.java index 6f5d5f0b3..6fa3b7ca7 100644 --- a/src/main/java/noppes/npcs/attribute/Operation.java +++ b/src/main/java/noppes/npcs/attribute/AttributeValueType.java @@ -1,6 +1,6 @@ package noppes.npcs.attribute; -public enum Operation { +public enum AttributeValueType { FLAT, // e.g., +10 Health or +3 Damage PERCENT // e.g., +0.25 means +25% bonus } diff --git a/src/main/java/noppes/npcs/attribute/ModAttributes.java b/src/main/java/noppes/npcs/attribute/ModAttributes.java index f533d755f..4cc11339e 100644 --- a/src/main/java/noppes/npcs/attribute/ModAttributes.java +++ b/src/main/java/noppes/npcs/attribute/ModAttributes.java @@ -12,10 +12,10 @@ public class ModAttributes { public static final AttributeDefinition CRITICAL_DAMAGE_FLAT; static { - MAIN_ATTACK_FLAT = AttributeController.registerAttribute("cnpc:main_attack_flat", "Main Attack Damage (Flat)", Operation.FLAT); - MAIN_ATTACK_PERCENT = AttributeController.registerAttribute("cnpc:main_attack_percent", "Main Attack Damage (%)", Operation.PERCENT); - HEALTH = AttributeController.registerAttribute("cnpc:health", "Health", Operation.FLAT); - CRITICAL_CHANCE_PERCENT = AttributeController.registerAttribute("cnpc:critical_chance_percent", "Critical Chance (%)", Operation.PERCENT); - CRITICAL_DAMAGE_FLAT = AttributeController.registerAttribute("cnpc:critical_damage_flat", "Critical Damage Bonus (Flat)", Operation.FLAT); + MAIN_ATTACK_FLAT = AttributeController.registerAttribute("cnpc:main_attack_flat", "Main Attack Damage (Flat)", AttributeValueType.FLAT); + MAIN_ATTACK_PERCENT = AttributeController.registerAttribute("cnpc:main_attack_percent", "Main Attack Damage (%)", AttributeValueType.PERCENT); + HEALTH = AttributeController.registerAttribute("cnpc:health", "Health", AttributeValueType.FLAT); + CRITICAL_CHANCE_PERCENT = AttributeController.registerAttribute("cnpc:critical_chance_percent", "Critical Chance (%)", AttributeValueType.PERCENT); + CRITICAL_DAMAGE_FLAT = AttributeController.registerAttribute("cnpc:critical_damage_flat", "Critical Damage Bonus (Flat)", AttributeValueType.FLAT); } } diff --git a/src/main/java/noppes/npcs/attribute/ModifiableAttributeInstance.java b/src/main/java/noppes/npcs/attribute/ModifiableAttributeInstance.java index 6fa459283..2a2344236 100644 --- a/src/main/java/noppes/npcs/attribute/ModifiableAttributeInstance.java +++ b/src/main/java/noppes/npcs/attribute/ModifiableAttributeInstance.java @@ -49,14 +49,14 @@ public class ModifiableAttributeInstance implements IAttributeInstance { double finalValue = baseValue; // Apply flat modifiers first: for (AttributeModifier mod : modifiers) { - if (mod.getOperation() == Operation.FLAT) { + if (mod.getOperation() == AttributeValueType.FLAT) { finalValue += mod.getAmount(); } } // Then apply percentage modifiers additively: double percentSum = 0; for (AttributeModifier mod : modifiers) { - if (mod.getOperation() == Operation.PERCENT) { + if (mod.getOperation() == AttributeValueType.PERCENT) { percentSum += mod.getAmount(); } }