From f4db57875a129b758041c1509e805dc6ba2b6256 Mon Sep 17 00:00:00 2001 From: Vidal Date: Sun, 1 Feb 2026 06:45:29 -0300 Subject: [PATCH] Changed dual ability names --- .../data/ability/AbilityController.java | 6 +++--- ...AbilityDualBeam.java => AbilityBeamDual.java} | 16 ++++++++-------- ...AbilityDualDisc.java => AbilityDiscDual.java} | 16 ++++++++-------- .../{AbilityDualOrb.java => AbilityOrbDual.java} | 16 ++++++++-------- ...yDualBeam.java => SubGuiAbilityBeamDual.java} | 8 ++++---- ...yDualDisc.java => SubGuiAbilityDiscDual.java} | 9 ++++----- ...ityDualOrb.java => SubGuiAbilityOrbDual.java} | 8 ++++---- ..._Active.json => Ability_BeamDual_Active.json} | 2 +- ..._Windup.json => Ability_BeamDual_Windup.json} | 2 +- 9 files changed, 41 insertions(+), 42 deletions(-) rename src/main/java/kamkeel/npcs/controllers/data/ability/type/{AbilityDualBeam.java => AbilityBeamDual.java} (97%) rename src/main/java/kamkeel/npcs/controllers/data/ability/type/{AbilityDualDisc.java => AbilityDiscDual.java} (97%) rename src/main/java/kamkeel/npcs/controllers/data/ability/type/{AbilityDualOrb.java => AbilityOrbDual.java} (97%) rename src/main/java/noppes/npcs/client/gui/advanced/ability/{SubGuiAbilityDualBeam.java => SubGuiAbilityBeamDual.java} (98%) rename src/main/java/noppes/npcs/client/gui/advanced/ability/{SubGuiAbilityDualDisc.java => SubGuiAbilityDiscDual.java} (97%) rename src/main/java/noppes/npcs/client/gui/advanced/ability/{SubGuiAbilityDualOrb.java => SubGuiAbilityOrbDual.java} (98%) rename src/main/resources/assets/customnpcs/animations/{Ability_DualBeam_Active.json => Ability_BeamDual_Active.json} (99%) rename src/main/resources/assets/customnpcs/animations/{Ability_DualBeam_Windup.json => Ability_BeamDual_Windup.json} (99%) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java index 43d7bd8bb..eba8795f7 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityController.java @@ -363,12 +363,12 @@ public class AbilityController implements IAbilityHandler { registerType("cnpc:sweeper", AbilitySweeper::new); registerType("cnpc:projectile", AbilityProjectile::new); registerType("cnpc:orb", AbilityOrb::new); - registerType("cnpc:dual_orb", AbilityDualOrb::new); + registerType("cnpc:dual_orb", AbilityOrbDual::new); registerType("cnpc:dual_disc", AbilityDisc::new); - registerType("cnpc:dual_disc", AbilityDualDisc::new); + registerType("cnpc:dual_disc", AbilityDiscDual::new); registerType("cnpc:laser_shot", AbilityLaserShot::new); registerType("cnpc:beam", AbilityEnergyBeam::new); - registerType("cnpc:dual_beam", AbilityDualBeam::new); + registerType("cnpc:dual_beam", AbilityBeamDual::new); // Movement abilities registerType("cnpc:charge", AbilityCharge::new); diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualBeam.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeamDual.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualBeam.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeamDual.java index 6704b0e33..54c806604 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualBeam.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeamDual.java @@ -18,12 +18,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; -import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityDualBeam; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityBeamDual; import noppes.npcs.client.gui.util.IAbilityConfigCallback; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.util.ValueUtil; -public class AbilityDualBeam extends Ability { +public class AbilityBeamDual extends Ability { private float beamWidth = 0.4f; private float headSize = 0.6f; private boolean dualFire= true; @@ -48,9 +48,9 @@ public class AbilityDualBeam extends Ability { private transient EntityAbilityBeam beamEntity = null; private transient EntityAbilityBeam beamEntity2 = null; - public AbilityDualBeam() { - this.typeId = "ability.cnpc.dual_beam"; - this.name = "Dual Beam"; + public AbilityBeamDual() { + this.typeId = "ability.cnpc.beam_dual"; + this.name = "Beam Dual"; this.targetingMode = TargetingMode.AGGRO_TARGET; this.maxRange = 20.0f; this.minRange = 5.0f; @@ -60,8 +60,8 @@ public class AbilityDualBeam extends Ability { this.telegraphType = TelegraphType.CIRCLE; this.showTelegraph = true; // Default built-in animations - this.windUpAnimationName = "Ability_DualBeam_Windup"; - this.activeAnimationName = "Ability_DualBeam_Active"; + this.windUpAnimationName = "Ability_BeamDual_Windup"; + this.activeAnimationName = "Ability_BeamDual_Active"; } @Override @@ -72,7 +72,7 @@ public class AbilityDualBeam extends Ability { @Override @SideOnly(Side.CLIENT) public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { - return new SubGuiAbilityDualBeam(this, callback); + return new SubGuiAbilityBeamDual(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualDisc.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDiscDual.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualDisc.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDiscDual.java index 873530119..0fc3ab061 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualDisc.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDiscDual.java @@ -18,12 +18,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; -import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityDualDisc; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityDiscDual; import noppes.npcs.client.gui.util.IAbilityConfigCallback; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.util.ValueUtil; -public class AbilityDualDisc extends Ability { +public class AbilityDiscDual extends Ability { // Disc geometry private float discRadius = 1.0f; @@ -56,9 +56,9 @@ public class AbilityDualDisc extends Ability { private transient EntityAbilityDisc discEntity = null; private transient EntityAbilityDisc discEntity2 = null; - public AbilityDualDisc() { - this.typeId = "ability.cnpc.dual_disc"; - this.name = "Dual Disc"; + public AbilityDiscDual() { + this.typeId = "ability.cnpc.disc_dual"; + this.name = "Disc Dual"; this.targetingMode = TargetingMode.AGGRO_TARGET; this.maxRange = 30.0f; this.minRange = 5.0f; @@ -68,8 +68,8 @@ public class AbilityDualDisc extends Ability { this.telegraphType = TelegraphType.CIRCLE; this.showTelegraph = true; // Default built-in animations - this.windUpAnimationName = "Ability_DualBeam_Windup"; - this.activeAnimationName = "Ability_DualBeam_Active"; + this.windUpAnimationName = "Ability_BeamDual_Windup"; + this.activeAnimationName = "Ability_BeamDual_Active"; } @Override @@ -80,7 +80,7 @@ public class AbilityDualDisc extends Ability { @Override @SideOnly(Side.CLIENT) public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { - return new SubGuiAbilityDualDisc(this, callback); + return new SubGuiAbilityDiscDual(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualOrb.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrbDual.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualOrb.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrbDual.java index baddfb910..1e28d5820 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDualOrb.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrbDual.java @@ -18,12 +18,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraft.world.World; import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; -import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityDualOrb; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityOrbDual; import noppes.npcs.client.gui.util.IAbilityConfigCallback; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.util.ValueUtil; -public class AbilityDualOrb extends Ability { +public class AbilityOrbDual extends Ability { // Ability-specific properties private float orbSize = 1.0f; private boolean dualFire= true; @@ -47,9 +47,9 @@ public class AbilityDualOrb extends Ability { private transient EntityAbilityOrb orbEntity = null; private transient EntityAbilityOrb orbEntity2 = null; - public AbilityDualOrb() { - this.typeId = "ability.cnpc.dual_orb"; - this.name = "Dual Orb"; + public AbilityOrbDual() { + this.typeId = "ability.cnpc.orb_dual"; + this.name = "Orb Dual"; this.targetingMode = TargetingMode.AGGRO_TARGET; this.maxRange = 25.0f; this.minRange = 5.0f; @@ -59,8 +59,8 @@ public class AbilityDualOrb extends Ability { this.telegraphType = TelegraphType.CIRCLE; this.showTelegraph = true; // Default built-in animation - this.windUpAnimationName = "Ability_DualBeam_Windup"; - this.activeAnimationName = "Ability_DualBeam_Active"; + this.windUpAnimationName = "Ability_BeamDual_Windup"; + this.activeAnimationName = "Ability_BeamDual_Active"; } @Override @@ -71,7 +71,7 @@ public class AbilityDualOrb extends Ability { @Override @SideOnly(Side.CLIENT) public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { - return new SubGuiAbilityDualOrb(this, callback); + return new SubGuiAbilityOrbDual(this, callback); } @Override diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualBeam.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityBeamDual.java similarity index 98% rename from src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualBeam.java rename to src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityBeamDual.java index 87144adfc..3e1886c53 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualBeam.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityBeamDual.java @@ -2,19 +2,19 @@ package noppes.npcs.client.gui.advanced.ability; import kamkeel.npcs.controllers.data.ability.AbilityEffect; import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.type.AbilityDualBeam; +import kamkeel.npcs.controllers.data.ability.type.AbilityBeamDual; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; import noppes.npcs.client.gui.util.*; import java.util.List; -public class SubGuiAbilityDualBeam extends SubGuiAbilityConfig { - private final AbilityDualBeam beam; +public class SubGuiAbilityBeamDual extends SubGuiAbilityConfig { + private final AbilityBeamDual beam; private int editingVisualColorId = 0; private int editingBeam = 0; - public SubGuiAbilityDualBeam(AbilityDualBeam ability, IAbilityConfigCallback callback) { + public SubGuiAbilityBeamDual(AbilityBeamDual ability, IAbilityConfigCallback callback) { super(ability, callback); this.beam = ability; } diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualDisc.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDiscDual.java similarity index 97% rename from src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualDisc.java rename to src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDiscDual.java index f8bdbf9f2..c8ab5a352 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualDisc.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDiscDual.java @@ -2,20 +2,19 @@ package noppes.npcs.client.gui.advanced.ability; import kamkeel.npcs.controllers.data.ability.AbilityEffect; import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.type.AbilityDisc; -import kamkeel.npcs.controllers.data.ability.type.AbilityDualDisc; +import kamkeel.npcs.controllers.data.ability.type.AbilityDiscDual; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; import noppes.npcs.client.gui.util.*; import java.util.List; -public class SubGuiAbilityDualDisc extends SubGuiAbilityConfig { - private final AbilityDualDisc disc; +public class SubGuiAbilityDiscDual extends SubGuiAbilityConfig { + private final AbilityDiscDual disc; private int editingVisualColorId = 0; private int editingDisc = 0; - public SubGuiAbilityDualDisc(AbilityDualDisc ability, IAbilityConfigCallback callback) { + public SubGuiAbilityDiscDual(AbilityDiscDual ability, IAbilityConfigCallback callback) { super(ability, callback); this.disc = ability; } diff --git a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualOrb.java b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityOrbDual.java similarity index 98% rename from src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualOrb.java rename to src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityOrbDual.java index a8b9caadf..cdf805f53 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityDualOrb.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/ability/SubGuiAbilityOrbDual.java @@ -2,19 +2,19 @@ package noppes.npcs.client.gui.advanced.ability; import kamkeel.npcs.controllers.data.ability.AbilityEffect; import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.type.AbilityDualOrb; +import kamkeel.npcs.controllers.data.ability.type.AbilityOrbDual; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; import noppes.npcs.client.gui.util.*; import java.util.List; -public class SubGuiAbilityDualOrb extends SubGuiAbilityConfig { - private final AbilityDualOrb orb; +public class SubGuiAbilityOrbDual extends SubGuiAbilityConfig { + private final AbilityOrbDual orb; private int editingVisualColorId = 0; private int editingOrb = 0; - public SubGuiAbilityDualOrb(AbilityDualOrb ability, IAbilityConfigCallback callback) { + public SubGuiAbilityOrbDual(AbilityOrbDual ability, IAbilityConfigCallback callback) { super(ability, callback); this.orb = ability; } diff --git a/src/main/resources/assets/customnpcs/animations/Ability_DualBeam_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Active.json similarity index 99% rename from src/main/resources/assets/customnpcs/animations/Ability_DualBeam_Active.json rename to src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Active.json index fa47349f9..c98f89236 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_DualBeam_Active.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Active.json @@ -198,6 +198,6 @@ "ID": 12, "WhileAttacking": 1b, "WhileWalking": 1b, - "Name": "Ability_DualBeam_Active", + "Name": "Ability_BeamDual_Active", "WhileStanding": 1b } diff --git a/src/main/resources/assets/customnpcs/animations/Ability_DualBeam_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Windup.json similarity index 99% rename from src/main/resources/assets/customnpcs/animations/Ability_DualBeam_Windup.json rename to src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Windup.json index 99437fc2d..d793e3f22 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_DualBeam_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Windup.json @@ -196,6 +196,6 @@ "ID": 11, "WhileAttacking": 1b, "WhileWalking": 1b, - "Name": "Ability_DualBeam_Windup", + "Name": "Ability_BeamDual_Windup", "WhileStanding": 1b }