Changed dual ability names

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);

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

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

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

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;
     }

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;
     }

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;
     }