From f58a6010d90643c0e8a3a2474095ca773ab0422c Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 22 Feb 2026 03:28:56 -0500 Subject: [PATCH] Reorganize --- .../kamkeel/npcs/command/AbilityCommand.java | 4 +- .../npcs/controllers/AbilityController.java | 13 +++-- .../npcs/controllers/SyncController.java | 2 +- .../controllers/data/ability/Ability.java | 37 ++++++++++----- .../data/ability/AbilityAction.java | 2 + .../data/ability/ConcurrentSlot.java | 1 + .../controllers/data/ability/LockType.java | 47 ------------------- .../ability/conditions/AbilityCondition.java | 2 +- .../ability/{ => conditions}/Condition.java | 2 +- .../ability/conditions/ConditionFilter.java | 2 - .../conditions/ConditionHasEffect.java | 2 +- .../conditions/ConditionQuestCompleted.java | 2 +- .../ability/{ => data}/AbilityIconData.java | 3 +- .../ability/{ => data}/ChainedAbility.java | 5 +- .../ability/{ => data}/IAbilityAction.java | 5 +- .../data/ability/data/ProjectileData.java | 4 +- .../effect}/AbilityCustomEffect.java | 2 +- .../effect}/AbilityPotionEffect.java | 2 +- .../{ => data/effect}/IEffectAction.java | 2 +- .../data/{ => energy}/EnergyAnchorData.java | 4 +- .../data/{ => energy}/EnergyBarrierData.java | 2 +- .../data/{ => energy}/EnergyChargingData.java | 2 +- .../data/{ => energy}/EnergyCombatData.java | 4 +- .../data/{ => energy}/EnergyDisplayData.java | 2 +- .../data/{ => energy}/EnergyHomingData.java | 2 +- .../data/{ => energy}/EnergyLifespanData.java | 2 +- .../{ => energy}/EnergyLightningData.java | 2 +- .../data/{ => energy}/EnergyPanelData.java | 2 +- .../{ => energy}/EnergyTrajectoryData.java | 2 +- .../entry}/AbilityEffectActionEntry.java | 3 +- .../entry/AbilityToggleEntry.java} | 8 ++-- .../{ => data/entry}/ChainedAbilityEntry.java | 4 +- .../ability/{ => enums}/AbilityPhase.java | 2 +- .../data/ability/{ => enums}/AnchorPoint.java | 2 +- .../data/ability/{ => enums}/HitType.java | 2 +- .../LockMode.java} | 10 ++-- .../ability/{ => enums}/RotationMode.java | 4 +- .../ability/{ => enums}/TargetFilter.java | 2 +- .../ability/{ => enums}/TargetingMode.java | 2 +- .../data/ability/{ => enums}/UserType.java | 2 +- .../{ => extender}/IAbilityExtender.java | 4 +- .../data/ability/gui/AbilityFieldBuilder.java | 8 ++-- .../data/ability/gui/AbilityFieldDefs.java | 6 +-- .../ability/gui}/GuiAbilityInterface.java | 6 ++- .../{ => gui}/IAbilityFieldProvider.java | 3 +- .../IChainedAbilityFieldProvider.java | 3 +- .../preview}/AbilityPreviewExecutor.java | 10 ++-- .../{ => preview}/PreviewEntityHandler.java | 2 +- .../data/ability/type/AbilityCharge.java | 10 ++-- .../data/ability/type/AbilityCutter.java | 10 ++-- .../data/ability/type/AbilityDash.java | 6 +-- .../data/ability/type/AbilityEffect.java | 14 +++--- .../data/ability/type/AbilityGuard.java | 10 ++-- .../data/ability/type/AbilityHazard.java | 2 +- .../data/ability/type/AbilityHeavyHit.java | 10 ++-- .../data/ability/type/AbilityProjectile.java | 6 +-- .../data/ability/type/AbilityShockwave.java | 10 ++-- .../data/ability/type/AbilitySlam.java | 10 ++-- .../data/ability/type/AbilityTeleport.java | 8 ++-- .../data/ability/type/AbilityTrap.java | 4 +- .../data/ability/type/AbilityVortex.java | 10 ++-- .../data/ability/type/AbilityZone.java | 12 ++--- .../ability/type/energy/AbilityBarrier.java | 4 +- .../data/ability/type/energy/AbilityBeam.java | 18 +++---- .../data/ability/type/energy/AbilityDisc.java | 14 +++--- .../data/ability/type/energy/AbilityDome.java | 10 ++-- .../ability/type/energy/AbilityEnergy.java | 4 +- .../type/energy/AbilityEnergyProjectile.java | 16 +++---- .../ability/type/energy/AbilityLaserShot.java | 20 ++++---- .../data/ability/type/energy/AbilityOrb.java | 16 +++---- .../ability/type/energy/AbilityShield.java | 14 +++--- .../ability/type/energy/AbilitySlicer.java | 14 +++--- .../ability/type/energy/AbilitySweeper.java | 8 ++-- .../data/ability/type/energy/AbilityWall.java | 12 ++--- .../{ => util}/AbilityTargetHelper.java | 5 +- .../npcs/entity/EntityAbilityBarrier.java | 4 +- .../npcs/entity/EntityAbilityBeam.java | 14 +++--- .../npcs/entity/EntityAbilityDisc.java | 14 +++--- .../npcs/entity/EntityAbilityDome.java | 6 +-- .../npcs/entity/EntityAbilityLaser.java | 12 ++--- .../kamkeel/npcs/entity/EntityAbilityOrb.java | 14 +++--- .../npcs/entity/EntityAbilityPanel.java | 8 ++-- .../npcs/entity/EntityAbilitySweeper.java | 3 +- .../npcs/entity/EntityAbilityZone.java | 6 +-- .../npcs/entity/EntityEnergyAbility.java | 4 +- .../npcs/entity/EntityEnergyProjectile.java | 20 ++++---- .../npcs/entity/EntityEnergySlicer.java | 14 +++--- .../ability/AbilityHotbarSelectPacket.java | 4 -- .../ability/ChainedAbilityGetPacket.java | 2 +- .../ability/ChainedAbilitySavePacket.java | 2 +- .../kamkeel/npcs/util/AnchorPointHelper.java | 4 +- src/main/java/kamkeel/npcs/util/Register.java | 2 +- .../noppes/npcs/AbstractDataAbilities.java | 34 +++++++------- src/main/java/noppes/npcs/DataAbilities.java | 11 ++--- .../client/gui/advanced/GuiNPCAbilities.java | 4 +- .../advanced/SubGuiChainedAbilityConfig.java | 10 ++-- .../gui/global/GuiNpcManageAbilities.java | 6 +-- .../hud/ability/AbilityHotbarComponent.java | 2 +- .../ability/AbilityHotbarSlotRenderer.java | 4 +- .../client/gui/hud/ability/AbilityIcon.java | 6 +-- .../gui/player/inventory/GuiAbilities.java | 4 +- .../inventory/SubGuiSelectAbilityForSlot.java | 2 +- .../util/IChainedAbilityConfigCallback.java | 2 +- .../controllers/data/PlayerAbilityData.java | 11 ++--- .../data/PlayerAbilityHotbarData.java | 1 - .../java/noppes/npcs/items/ItemStaff.java | 16 +++---- 106 files changed, 377 insertions(+), 392 deletions(-) delete mode 100644 src/main/java/kamkeel/npcs/controllers/data/ability/LockType.java rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => conditions}/Condition.java (99%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data}/AbilityIconData.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data}/ChainedAbility.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data}/IAbilityAction.java (84%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data/effect}/AbilityCustomEffect.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data/effect}/AbilityPotionEffect.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data/effect}/IEffectAction.java (95%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyAnchorData.java (95%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyBarrierData.java (99%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyChargingData.java (97%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyCombatData.java (97%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyDisplayData.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyHomingData.java (97%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyLifespanData.java (96%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyLightningData.java (97%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyPanelData.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/data/{ => energy}/EnergyTrajectoryData.java (99%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data/entry}/AbilityEffectActionEntry.java (95%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ToggleEntry.java => data/entry/AbilityToggleEntry.java} (79%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => data/entry}/ChainedAbilityEntry.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => enums}/AbilityPhase.java (85%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => enums}/AnchorPoint.java (97%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => enums}/HitType.java (92%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{LockMovementType.java => enums/LockMode.java} (87%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => enums}/RotationMode.java (92%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => enums}/TargetFilter.java (92%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => enums}/TargetingMode.java (93%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => enums}/UserType.java (90%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => extender}/IAbilityExtender.java (96%) rename src/main/java/{noppes/npcs/client/gui/util => kamkeel/npcs/controllers/data/ability/gui}/GuiAbilityInterface.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => gui}/IAbilityFieldProvider.java (89%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => gui}/IChainedAbilityFieldProvider.java (88%) rename src/main/java/{noppes/npcs/client/gui/util => kamkeel/npcs/controllers/data/ability/preview}/AbilityPreviewExecutor.java (98%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => preview}/PreviewEntityHandler.java (86%) rename src/main/java/kamkeel/npcs/controllers/data/ability/{ => util}/AbilityTargetHelper.java (95%) diff --git a/src/main/java/kamkeel/npcs/command/AbilityCommand.java b/src/main/java/kamkeel/npcs/command/AbilityCommand.java index 9be809697..f40c266cb 100644 --- a/src/main/java/kamkeel/npcs/command/AbilityCommand.java +++ b/src/main/java/kamkeel/npcs/command/AbilityCommand.java @@ -2,8 +2,8 @@ package kamkeel.npcs.command; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.UserType; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.NoppesUtilServer; diff --git a/src/main/java/kamkeel/npcs/controllers/AbilityController.java b/src/main/java/kamkeel/npcs/controllers/AbilityController.java index 55baf60e6..9a55175df 100644 --- a/src/main/java/kamkeel/npcs/controllers/AbilityController.java +++ b/src/main/java/kamkeel/npcs/controllers/AbilityController.java @@ -1,12 +1,21 @@ package kamkeel.npcs.controllers; -import kamkeel.npcs.controllers.data.ability.*; import kamkeel.npcs.controllers.data.ability.conditions.AbilityCondition; import kamkeel.npcs.controllers.data.ability.conditions.ConditionHPThreshold; import kamkeel.npcs.controllers.data.ability.conditions.ConditionHitCount; import kamkeel.npcs.controllers.data.ability.conditions.ConditionItem; import kamkeel.npcs.controllers.data.ability.conditions.ConditionHasEffect; import kamkeel.npcs.controllers.data.ability.conditions.ConditionQuestCompleted; +import kamkeel.npcs.controllers.data.ability.Ability; +import kamkeel.npcs.controllers.data.ability.AbilityVariant; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.data.effect.IEffectAction; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.enums.UserType; +import kamkeel.npcs.controllers.data.ability.extender.IAbilityExtender; +import kamkeel.npcs.controllers.data.ability.gui.IAbilityFieldProvider; +import kamkeel.npcs.controllers.data.ability.gui.IChainedAbilityFieldProvider; import kamkeel.npcs.controllers.data.ability.type.AbilityCharge; import kamkeel.npcs.controllers.data.ability.type.AbilityCutter; import kamkeel.npcs.controllers.data.ability.type.AbilityDash; @@ -14,7 +23,6 @@ import kamkeel.npcs.controllers.data.ability.type.AbilityGuard; import kamkeel.npcs.controllers.data.ability.type.AbilityHazard; import kamkeel.npcs.controllers.data.ability.type.AbilityEffect; import kamkeel.npcs.controllers.data.ability.type.AbilityHeavyHit; -import kamkeel.npcs.controllers.data.ability.type.AbilityProjectile; import kamkeel.npcs.controllers.data.ability.type.AbilityShockwave; import kamkeel.npcs.controllers.data.ability.type.AbilitySlam; import kamkeel.npcs.controllers.data.ability.type.AbilityTeleport; @@ -26,7 +34,6 @@ import kamkeel.npcs.controllers.data.ability.type.energy.AbilityDome; import kamkeel.npcs.controllers.data.ability.type.energy.AbilityLaserShot; import kamkeel.npcs.controllers.data.ability.type.energy.AbilityOrb; import kamkeel.npcs.controllers.data.ability.type.energy.AbilityShield; -import kamkeel.npcs.controllers.data.ability.type.energy.AbilitySlicer; import kamkeel.npcs.controllers.data.ability.type.energy.AbilitySweeper; import kamkeel.npcs.controllers.data.ability.type.energy.AbilityWall; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java index af7366a3f..f27428807 100644 --- a/src/main/java/kamkeel/npcs/controllers/SyncController.java +++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java @@ -6,7 +6,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import kamkeel.npcs.addon.DBCAddon; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumSyncAction; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java index 9d61188c5..8bafe49f0 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java @@ -3,6 +3,17 @@ package kamkeel.npcs.controllers.data.ability; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; +import kamkeel.npcs.controllers.data.ability.data.AbilityIconData; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.preview.PreviewEntityHandler; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.gui.IAbilityFieldProvider; +import kamkeel.npcs.controllers.data.ability.enums.RotationMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import kamkeel.npcs.controllers.data.ability.conditions.AbilityCondition; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; @@ -76,9 +87,9 @@ public abstract class Ability implements IAbility, IAbilityAction { protected boolean interruptible = true; // Feedback - protected LockMovementType lockMovement = LockMovementType.WINDUP; + protected LockMode lockMovement = LockMode.WINDUP; protected RotationMode rotationMode = RotationMode.FREE; - protected LockMovementType rotationPhase = LockMovementType.WINDUP_AND_ACTIVE; + protected LockMode rotationPhase = LockMode.WINDUP_AND_ACTIVE; protected int windUpColor = 0x80FF4400; // Telegraph color during wind up protected int activeColor = 0xC0FF0000; // Telegraph warning/active color @@ -637,10 +648,10 @@ public abstract class Ability implements IAbility, IAbilityAction { .tab("General").hover("ability.hover.freeOnCast")); } defs.add(FieldDef.section("ability.section.movement").tab("General")); - defs.add(FieldDef.stringEnumField("ability.lockMovement", LockMovementType.getDisplayKeys(), + defs.add(FieldDef.stringEnumField("ability.lockMovement", LockMode.getDisplayKeys(), () -> this.getLockMovement().getDisplayKey(), v -> { - for (LockMovementType t : LockMovementType.values()) { + for (LockMode t : LockMode.values()) { if (t.getDisplayKey().equals(v)) { this.setLockMovement(t); break; @@ -664,7 +675,7 @@ public abstract class Ability implements IAbility, IAbilityAction { FieldDef.stringEnumField("ability.rotationPhase", getRotationPhaseKeys(), () -> this.getRotationPhase().getDisplayKey(), v -> { - for (LockMovementType t : LockMovementType.values()) { + for (LockMode t : LockMode.values()) { if (t.getDisplayKey().equals(v)) { this.setRotationPhase(t); break; @@ -1400,9 +1411,9 @@ public abstract class Ability implements IAbility, IAbilityAction { syncWindupWithAnimation = nbt.hasKey("syncWindup") ? nbt.getBoolean("syncWindup") : true; dazedTicks = nbt.hasKey("recovery") ? nbt.getInteger("recovery") : 80; interruptible = nbt.hasKey("interruptible") ? nbt.getBoolean("interruptible") : true; - lockMovement = LockMovementType.fromOrdinal(nbt.getInteger("lockMovement")); + lockMovement = LockMode.fromOrdinal(nbt.getInteger("lockMovement")); rotationMode = RotationMode.fromOrdinal(nbt.getInteger("rotationMode")); - rotationPhase = LockMovementType.fromOrdinal(nbt.getInteger("rotationPhase")); + rotationPhase = LockMode.fromOrdinal(nbt.getInteger("rotationPhase")); windUpColor = nbt.getInteger("windUpColor"); activeColor = nbt.getInteger("activeColor"); windUpSound = nbt.getString("windUpSound"); @@ -1653,11 +1664,11 @@ public abstract class Ability implements IAbility, IAbilityAction { this.interruptible = interruptible; } - public LockMovementType getLockMovement() { + public LockMode getLockMovement() { return lockMovement; } - public void setLockMovement(LockMovementType lockMovement) { + public void setLockMovement(LockMode lockMovement) { this.lockMovement = lockMovement; } @@ -1669,11 +1680,11 @@ public abstract class Ability implements IAbility, IAbilityAction { this.rotationMode = rotationMode; } - public LockMovementType getRotationPhase() { + public LockMode getRotationPhase() { return rotationPhase; } - public void setRotationPhase(LockMovementType rotationPhase) { + public void setRotationPhase(LockMode rotationPhase) { this.rotationPhase = rotationPhase; } @@ -1694,7 +1705,7 @@ public abstract class Ability implements IAbility, IAbilityAction { */ @Override public void setLockMovementType(int type) { - this.lockMovement = LockMovementType.fromOrdinal(type); + this.lockMovement = LockMode.fromOrdinal(type); } /** @@ -1734,7 +1745,7 @@ public abstract class Ability implements IAbility, IAbilityAction { */ @Override public void setRotationPhaseType(int type) { - this.rotationPhase = LockMovementType.fromOrdinal(type); + this.rotationPhase = LockMode.fromOrdinal(type); } /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java index 60a64369d..aadca44a3 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java @@ -1,6 +1,8 @@ package kamkeel.npcs.controllers.data.ability; import kamkeel.npcs.controllers.AbilityController; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; import net.minecraft.nbt.NBTTagCompound; /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/ConcurrentSlot.java b/src/main/java/kamkeel/npcs/controllers/data/ability/ConcurrentSlot.java index cdfead9c0..af9e31ba0 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/ConcurrentSlot.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/ConcurrentSlot.java @@ -1,5 +1,6 @@ package kamkeel.npcs.controllers.data.ability; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; import net.minecraft.entity.EntityLivingBase; /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/LockType.java b/src/main/java/kamkeel/npcs/controllers/data/ability/LockType.java deleted file mode 100644 index 904a6c876..000000000 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/LockType.java +++ /dev/null @@ -1,47 +0,0 @@ -package kamkeel.npcs.controllers.data.ability; - -/** - * Defines what an ability locks when Lock Position is enabled. - */ -public enum LockType { - MOVEMENT, - ROTATION, - BOTH; - - public boolean locksMovement() { - return this == MOVEMENT || this == BOTH; - } - - public boolean locksRotation() { - return this == ROTATION || this == BOTH; - } - - public String getDisplayKey() { - switch (this) { - case MOVEMENT: - return "ability.lockType.movement"; - case ROTATION: - return "ability.lockType.rotation"; - case BOTH: - return "ability.lockType.both"; - default: - return "ability.lockType.both"; - } - } - - public static String[] getDisplayKeys() { - return new String[]{ - "ability.lockType.movement", - "ability.lockType.rotation", - "ability.lockType.both" - }; - } - - public static LockType fromOrdinal(int ordinal) { - LockType[] values = values(); - if (ordinal >= 0 && ordinal < values.length) { - return values[ordinal]; - } - return BOTH; - } -} diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/AbilityCondition.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/AbilityCondition.java index 479776930..5b3fc38ea 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/AbilityCondition.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/AbilityCondition.java @@ -3,7 +3,7 @@ package kamkeel.npcs.controllers.data.ability.conditions; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; -import kamkeel.npcs.controllers.data.ability.UserType; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Condition.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/Condition.java similarity index 99% rename from src/main/java/kamkeel/npcs/controllers/data/ability/Condition.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/conditions/Condition.java index 1183fe858..2dbb0d6c0 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Condition.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/Condition.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.conditions; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionFilter.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionFilter.java index 6c8e0c24e..08c5b5da2 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionFilter.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionFilter.java @@ -1,7 +1,5 @@ package kamkeel.npcs.controllers.data.ability.conditions; -import kamkeel.npcs.controllers.data.ability.UserType; - public enum ConditionFilter { CASTER, TARGET, diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHasEffect.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHasEffect.java index bf98c73c9..eca7aded0 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHasEffect.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHasEffect.java @@ -2,7 +2,7 @@ package kamkeel.npcs.controllers.data.ability.conditions; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.UserType; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java index d47e19506..263cd28af 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java @@ -2,7 +2,7 @@ package kamkeel.npcs.controllers.data.ability.conditions; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.UserType; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityIconData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/AbilityIconData.java similarity index 98% rename from src/main/java/kamkeel/npcs/controllers/data/ability/AbilityIconData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/AbilityIconData.java index 2120e9ca6..77dd746ea 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityIconData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/AbilityIconData.java @@ -1,5 +1,6 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data; +import kamkeel.npcs.controllers.data.ability.Ability; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/ChainedAbility.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java similarity index 98% rename from src/main/java/kamkeel/npcs/controllers/data/ability/ChainedAbility.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java index 5a80166c7..f9927d42e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/ChainedAbility.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java @@ -1,6 +1,9 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data; import kamkeel.npcs.controllers.AbilityController; +import kamkeel.npcs.controllers.data.ability.Ability; +import kamkeel.npcs.controllers.data.ability.data.entry.ChainedAbilityEntry; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import kamkeel.npcs.controllers.data.ability.conditions.AbilityCondition; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityAction.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/IAbilityAction.java similarity index 84% rename from src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityAction.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/IAbilityAction.java index 612cd9145..59a296f7b 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityAction.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/IAbilityAction.java @@ -1,5 +1,8 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data; +import kamkeel.npcs.controllers.data.ability.Ability; +import kamkeel.npcs.controllers.data.ability.AbilityAction; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import kamkeel.npcs.controllers.data.ability.conditions.AbilityCondition; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ProjectileData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ProjectileData.java index 94850470f..acb16a2a9 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ProjectileData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ProjectileData.java @@ -1,6 +1,8 @@ package kamkeel.npcs.controllers.data.ability.data; -import kamkeel.npcs.controllers.data.ability.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.enums.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import net.minecraft.nbt.NBTTagCompound; /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityCustomEffect.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/AbilityCustomEffect.java similarity index 98% rename from src/main/java/kamkeel/npcs/controllers/data/ability/AbilityCustomEffect.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/AbilityCustomEffect.java index 22428b704..4ded168d5 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityCustomEffect.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/AbilityCustomEffect.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data.effect; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityPotionEffect.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/AbilityPotionEffect.java similarity index 98% rename from src/main/java/kamkeel/npcs/controllers/data/ability/AbilityPotionEffect.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/AbilityPotionEffect.java index cb2984946..7fe6422f0 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityPotionEffect.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/AbilityPotionEffect.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data.effect; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/IEffectAction.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/IEffectAction.java similarity index 95% rename from src/main/java/kamkeel/npcs/controllers/data/ability/IEffectAction.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/IEffectAction.java index 2f0323c76..b674bd51f 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/IEffectAction.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/effect/IEffectAction.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data.effect; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyAnchorData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyAnchorData.java similarity index 95% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyAnchorData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyAnchorData.java index 99c51b23c..b4ceb830f 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyAnchorData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyAnchorData.java @@ -1,6 +1,6 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; -import kamkeel.npcs.controllers.data.ability.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.enums.AnchorPoint; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.ability.data.IEnergyAnchorData; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyBarrierData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyBarrierData.java similarity index 99% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyBarrierData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyBarrierData.java index d54f205cc..130b7d2ba 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyBarrierData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyBarrierData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyChargingData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyChargingData.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyChargingData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyChargingData.java index c12cec47f..ec53aaeb5 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyChargingData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyChargingData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyCombatData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyCombatData.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyCombatData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyCombatData.java index e6026e18e..b494a8b15 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyCombatData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyCombatData.java @@ -1,6 +1,6 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; -import kamkeel.npcs.controllers.data.ability.HitType; +import kamkeel.npcs.controllers.data.ability.enums.HitType; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.ability.data.IEnergyCombatData; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyDisplayData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyDisplayData.java similarity index 98% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyDisplayData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyDisplayData.java index 6363a69cb..f15f31b6d 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyDisplayData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyDisplayData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.ability.data.IEnergyDisplayData; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyHomingData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyHomingData.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyHomingData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyHomingData.java index 4f75c0841..a0825fac1 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyHomingData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyHomingData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.ability.data.IEnergyHomingData; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyLifespanData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyLifespanData.java similarity index 96% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyLifespanData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyLifespanData.java index 2c8d1f6a1..fcb516242 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyLifespanData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyLifespanData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.ability.data.IEnergyLifespanData; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyLightningData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyLightningData.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyLightningData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyLightningData.java index b8423e7aa..72a412cfd 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyLightningData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyLightningData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.ability.data.IEnergyLightningData; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyPanelData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyPanelData.java similarity index 98% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyPanelData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyPanelData.java index 3a5206f21..c57e0bbf5 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyPanelData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyPanelData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyTrajectoryData.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyTrajectoryData.java similarity index 99% rename from src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyTrajectoryData.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyTrajectoryData.java index 10014fb5f..f888472d7 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/EnergyTrajectoryData.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/energy/EnergyTrajectoryData.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability.data; +package kamkeel.npcs.controllers.data.ability.data.energy; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.Constants; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityEffectActionEntry.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/AbilityEffectActionEntry.java similarity index 95% rename from src/main/java/kamkeel/npcs/controllers/data/ability/AbilityEffectActionEntry.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/AbilityEffectActionEntry.java index 245d153b2..6540e1f5e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityEffectActionEntry.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/AbilityEffectActionEntry.java @@ -1,6 +1,7 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data.entry; import kamkeel.npcs.controllers.AbilityController; +import kamkeel.npcs.controllers.data.ability.data.effect.IEffectAction; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/ToggleEntry.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/AbilityToggleEntry.java similarity index 79% rename from src/main/java/kamkeel/npcs/controllers/data/ability/ToggleEntry.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/AbilityToggleEntry.java index 4a758bead..d200fefa6 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/ToggleEntry.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/AbilityToggleEntry.java @@ -1,4 +1,6 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data.entry; + +import kamkeel.npcs.controllers.data.ability.Ability; /** * Tracks the state of a single active toggle for an entity. @@ -7,12 +9,12 @@ package kamkeel.npcs.controllers.data.ability; * State is 1-based: state 1 = first ON state, state 2 = second, etc. * State 0 means OFF (entry should not exist in the map). */ -public class ToggleEntry { +public class AbilityToggleEntry { private final Ability ability; private int tickCount; private int state; - public ToggleEntry(Ability ability, int state) { + public AbilityToggleEntry(Ability ability, int state) { this.ability = ability; this.tickCount = 0; this.state = Math.max(1, state); diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/ChainedAbilityEntry.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/ChainedAbilityEntry.java similarity index 98% rename from src/main/java/kamkeel/npcs/controllers/data/ability/ChainedAbilityEntry.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/ChainedAbilityEntry.java index a5bb7571b..85fa819ff 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/ChainedAbilityEntry.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/ChainedAbilityEntry.java @@ -1,6 +1,8 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.data.entry; import kamkeel.npcs.controllers.AbilityController; +import kamkeel.npcs.controllers.data.ability.Ability; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import net.minecraft.nbt.NBTTagCompound; /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityPhase.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/AbilityPhase.java similarity index 85% rename from src/main/java/kamkeel/npcs/controllers/data/ability/AbilityPhase.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/AbilityPhase.java index af1bd8d30..a0549b09a 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityPhase.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/AbilityPhase.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; public enum AbilityPhase { IDLE, // Not executing diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AnchorPoint.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/AnchorPoint.java similarity index 97% rename from src/main/java/kamkeel/npcs/controllers/data/ability/AnchorPoint.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/AnchorPoint.java index 959aa2cf4..567713d34 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AnchorPoint.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/AnchorPoint.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; /** * Defines anchor points for ability charging effects. diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/HitType.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/HitType.java similarity index 92% rename from src/main/java/kamkeel/npcs/controllers/data/ability/HitType.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/HitType.java index 3892e9362..ad1f07d0e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/HitType.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/HitType.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; /** * Shared hit behavior for energy projectiles. diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/LockMovementType.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/LockMode.java similarity index 87% rename from src/main/java/kamkeel/npcs/controllers/data/ability/LockMovementType.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/LockMode.java index 1b81a3bb3..47d7b1d1d 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/LockMovementType.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/LockMode.java @@ -1,9 +1,9 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; /** * Defines when an ability locks NPC movement and rotation. */ -public enum LockMovementType { +public enum LockMode { /** * No movement lock - NPC can move freely during both phases. */ @@ -71,10 +71,10 @@ public enum LockMovementType { } /** - * Get LockMovementType from ordinal, with fallback to WINDUP. + * Get LockMode from ordinal, with fallback to WINDUP. */ - public static LockMovementType fromOrdinal(int ordinal) { - LockMovementType[] values = values(); + public static LockMode fromOrdinal(int ordinal) { + LockMode[] values = values(); if (ordinal >= 0 && ordinal < values.length) { return values[ordinal]; } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/RotationMode.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/RotationMode.java similarity index 92% rename from src/main/java/kamkeel/npcs/controllers/data/ability/RotationMode.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/RotationMode.java index e1142b571..f8f1ec860 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/RotationMode.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/RotationMode.java @@ -1,8 +1,8 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; /** * Defines what happens to NPC rotation during ability phases. - * Used with a LockMovementType to control WHEN it applies. + * Used with a LockMode to control WHEN it applies. */ public enum RotationMode { /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/TargetFilter.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/TargetFilter.java similarity index 92% rename from src/main/java/kamkeel/npcs/controllers/data/ability/TargetFilter.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/TargetFilter.java index 0247cc170..91d5b2434 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/TargetFilter.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/TargetFilter.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; /** * Filter for determining which entities an ability should affect in AOE mode. diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/TargetingMode.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/TargetingMode.java similarity index 93% rename from src/main/java/kamkeel/npcs/controllers/data/ability/TargetingMode.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/TargetingMode.java index 7e84c6a14..b32b04c9a 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/TargetingMode.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/TargetingMode.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; /** * Defines how an ability selects its target(s). diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/UserType.java b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/UserType.java similarity index 90% rename from src/main/java/kamkeel/npcs/controllers/data/ability/UserType.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/enums/UserType.java index d68693f59..7055174f8 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/UserType.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/enums/UserType.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.enums; /** * Defines which entity types can use an ability. diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityExtender.java b/src/main/java/kamkeel/npcs/controllers/data/ability/extender/IAbilityExtender.java similarity index 96% rename from src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityExtender.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/extender/IAbilityExtender.java index f3e7ccfd8..7f76919cb 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityExtender.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/extender/IAbilityExtender.java @@ -1,5 +1,7 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.extender; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.Ability; import net.minecraft.entity.EntityLivingBase; /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldBuilder.java b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldBuilder.java index 4aa9d54ae..0a05bc3d6 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldBuilder.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldBuilder.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; -import kamkeel.npcs.controllers.data.ability.AbilityCustomEffect; -import kamkeel.npcs.controllers.data.ability.AbilityEffectActionEntry; -import kamkeel.npcs.controllers.data.ability.AbilityPotionEffect; -import kamkeel.npcs.controllers.data.ability.IEffectAction; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityCustomEffect; +import kamkeel.npcs.controllers.data.ability.data.entry.AbilityEffectActionEntry; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect; +import kamkeel.npcs.controllers.data.ability.data.effect.IEffectAction; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.advanced.SubGuiCustomEffectSelect; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldDefs.java b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldDefs.java index d34620c75..3bbd80f9b 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldDefs.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/AbilityFieldDefs.java @@ -2,9 +2,9 @@ package kamkeel.npcs.controllers.data.ability.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.AbilityCustomEffect; -import kamkeel.npcs.controllers.data.ability.AbilityEffectActionEntry; -import kamkeel.npcs.controllers.data.ability.AbilityPotionEffect; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityCustomEffect; +import kamkeel.npcs.controllers.data.ability.data.entry.AbilityEffectActionEntry; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect; import noppes.npcs.client.gui.builder.FieldDef; import noppes.npcs.client.gui.builder.FieldType; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiAbilityInterface.java b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/GuiAbilityInterface.java similarity index 98% rename from src/main/java/noppes/npcs/client/gui/util/GuiAbilityInterface.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/gui/GuiAbilityInterface.java index 4bf2ffd58..0ff9b31f1 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiAbilityInterface.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/GuiAbilityInterface.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.gui.util; +package kamkeel.npcs.controllers.data.ability.gui; import kamkeel.npcs.client.renderer.TelegraphRenderer; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; @@ -11,6 +11,8 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import noppes.npcs.client.ClientEventHandler; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -40,7 +42,7 @@ public class GuiAbilityInterface extends GuiNPCInterface2 { /** * NPC facing direction - affects anchor points and visual facing */ - protected static float NPC_FACING_YAW = 160.0f; + public static float NPC_FACING_YAW = 160.0f; /** * Camera pitch (slight downward angle) */ diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityFieldProvider.java b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/IAbilityFieldProvider.java similarity index 89% rename from src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityFieldProvider.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/gui/IAbilityFieldProvider.java index f196b307b..615234a7c 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/IAbilityFieldProvider.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/IAbilityFieldProvider.java @@ -1,5 +1,6 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.gui; +import kamkeel.npcs.controllers.data.ability.Ability; import noppes.npcs.client.gui.builder.FieldDef; import java.util.List; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/IChainedAbilityFieldProvider.java b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/IChainedAbilityFieldProvider.java similarity index 88% rename from src/main/java/kamkeel/npcs/controllers/data/ability/IChainedAbilityFieldProvider.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/gui/IChainedAbilityFieldProvider.java index 95e8b70e0..8eec036f5 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/IChainedAbilityFieldProvider.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/gui/IChainedAbilityFieldProvider.java @@ -1,5 +1,6 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.gui; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import noppes.npcs.client.gui.builder.FieldDef; import java.util.List; diff --git a/src/main/java/noppes/npcs/client/gui/util/AbilityPreviewExecutor.java b/src/main/java/kamkeel/npcs/controllers/data/ability/preview/AbilityPreviewExecutor.java similarity index 98% rename from src/main/java/noppes/npcs/client/gui/util/AbilityPreviewExecutor.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/preview/AbilityPreviewExecutor.java index bde8ae194..930a1a198 100644 --- a/src/main/java/noppes/npcs/client/gui/util/AbilityPreviewExecutor.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/preview/AbilityPreviewExecutor.java @@ -1,16 +1,16 @@ -package noppes.npcs.client.gui.util; +package kamkeel.npcs.controllers.data.ability.preview; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityPhase; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.ChainedAbilityEntry; -import kamkeel.npcs.controllers.data.ability.PreviewEntityHandler; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.entry.ChainedAbilityEntry; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import kamkeel.npcs.controllers.data.ability.gui.GuiAbilityInterface; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.entity.EntityCustomNpc; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/PreviewEntityHandler.java b/src/main/java/kamkeel/npcs/controllers/data/ability/preview/PreviewEntityHandler.java similarity index 86% rename from src/main/java/kamkeel/npcs/controllers/data/ability/PreviewEntityHandler.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/preview/PreviewEntityHandler.java index 13c8bc526..d5917260c 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/PreviewEntityHandler.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/preview/PreviewEntityHandler.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.preview; import net.minecraft.entity.Entity; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java index 4f7021705..c5aedfb39 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java @@ -2,10 +2,10 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetFilter; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; @@ -43,7 +43,7 @@ public class AbilityCharge extends AbilityMovement implements IAbilityCharge { this.targetingMode = TargetingMode.AGGRO_TARGET; this.maxRange = 20.0f; this.minRange = 4.0f; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.cooldownTicks = 0; this.windUpTicks = 20; // LINE telegraph showing charge path diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java index 6db0f832e..c7b88961e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetFilter; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; @@ -71,7 +71,7 @@ public class AbilityCutter extends Ability implements IAbilityCutter { this.name = "Cutter"; this.targetingMode = TargetingMode.AOE_SELF; this.maxRange = 8.0f; - this.lockMovement = LockMovementType.NO; + this.lockMovement = LockMode.NO; this.cooldownTicks = 0; this.windUpTicks = 20; this.telegraphType = TelegraphType.CONE; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java index b5342e3d8..fb228fc3e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java @@ -2,8 +2,8 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; @@ -98,7 +98,7 @@ public class AbilityDash extends AbilityMovement implements IAbilityDash { this.targetingMode = TargetingMode.AGGRO_TARGET; this.maxRange = 20.0f; this.minRange = 0.0f; - this.lockMovement = LockMovementType.NO; + this.lockMovement = LockMode.NO; this.cooldownTicks = 0; this.windUpTicks = 5; // No telegraph for dash - it's a quick evasive move diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEffect.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEffect.java index d4f9c474b..9a1a2c180 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEffect.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEffect.java @@ -4,13 +4,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityCustomEffect; -import kamkeel.npcs.controllers.data.ability.AbilityEffectActionEntry; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityCustomEffect; +import kamkeel.npcs.controllers.data.ability.data.entry.AbilityEffectActionEntry; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetFilter; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.entity.Entity; @@ -73,7 +73,7 @@ public class AbilityEffect extends Ability implements IAbilityEffect { this.typeId = "ability.cnpc.effect"; this.name = "Effect"; this.targetingMode = TargetingMode.SELF; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.cooldownTicks = 0; this.windUpTicks = 30; this.telegraphType = TelegraphType.NONE; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java index 1a1555f11..5224f5bc7 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityPhase; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.UserType; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -52,7 +52,7 @@ public class AbilityGuard extends Ability implements IAbilityGuard { this.typeId = "ability.cnpc.guard"; this.name = "Guard"; this.targetingMode = TargetingMode.SELF; - this.lockMovement = LockMovementType.ACTIVE; + this.lockMovement = LockMode.ACTIVE; this.cooldownTicks = 0; this.windUpTicks = 0; this.interruptible = false; // Hard to interrupt while guarding diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java index a9c505a56..64638510a 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java @@ -2,7 +2,7 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.entity.EntityAbilityZone; import kamkeel.npcs.entity.EntityAbilityZone.ZoneShape; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java index 7e61f04c0..03299a67f 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetFilter; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.entity.Entity; @@ -38,7 +38,7 @@ public class AbilityHeavyHit extends Ability implements IAbilityHeavyHit { this.targetingMode = TargetingMode.AOE_SELF; this.maxRange = 5.0f; this.minRange = 0.0f; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.cooldownTicks = 0; this.windUpTicks = 30; this.telegraphType = TelegraphType.LINE; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java index 1aba9ff3c..2c9945299 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java @@ -3,8 +3,8 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.entity.Entity; @@ -42,7 +42,7 @@ public class AbilityProjectile extends Ability implements IAbilityProjectile { this.maxRange = 20.0f; this.cooldownTicks = 0; this.windUpTicks = 15; - this.lockMovement = LockMovementType.NO; + this.lockMovement = LockMode.NO; // No telegraph for projectile - it's a ranged attack this.telegraphType = TelegraphType.NONE; this.showTelegraph = false; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java index d600e006d..b04dd2766 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetFilter; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -35,7 +35,7 @@ public class AbilityShockwave extends Ability implements IAbilityShockwave { this.name = "Shockwave"; this.targetingMode = TargetingMode.AOE_SELF; this.maxRange = 8.0f; - this.lockMovement = LockMovementType.WINDUP_AND_ACTIVE; + this.lockMovement = LockMode.WINDUP_AND_ACTIVE; this.cooldownTicks = 0; this.windUpTicks = 25; this.telegraphType = TelegraphType.CIRCLE; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java index 079bcbf0f..84afb11b6 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetFilter; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; @@ -68,7 +68,7 @@ public class AbilitySlam extends Ability implements IAbilitySlam { this.targetingMode = TargetingMode.AOE_SELF; // Can also be AOE_TARGET to leap to target this.windUpTicks = 30; this.cooldownTicks = 0; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.minRange = 2.0f; this.maxRange = 15.0f; this.telegraphType = TelegraphType.CIRCLE; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java index cc2deb4ea..1319e07ca 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java @@ -3,9 +3,9 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.UserType; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.block.Block; @@ -78,7 +78,7 @@ public class AbilityTeleport extends Ability implements IAbilityTeleport { this.minRange = 5.0f; this.cooldownTicks = 0; this.windUpTicks = 10; - this.lockMovement = LockMovementType.NO; + this.lockMovement = LockMode.NO; // No telegraph for teleport - it's instant repositioning this.telegraphType = TelegraphType.NONE; this.showTelegraph = false; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java index 64e3e5b46..acd0e1378 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java @@ -2,8 +2,8 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.AbilityPotionEffect; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.entity.EntityAbilityZone; import kamkeel.npcs.entity.EntityAbilityZone.ZoneShape; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java index 59d2a280f..c20871dd6 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetFilter; -import kamkeel.npcs.controllers.data.ability.TargetingMode; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -54,7 +54,7 @@ public class AbilityVortex extends Ability implements IAbilityVortex { this.name = "Vortex"; this.targetingMode = TargetingMode.AOE_SELF; this.maxRange = 15.0f; - this.lockMovement = LockMovementType.WINDUP_AND_ACTIVE; + this.lockMovement = LockMode.WINDUP_AND_ACTIVE; this.cooldownTicks = 0; this.windUpTicks = 30; this.telegraphType = TelegraphType.CIRCLE; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityZone.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityZone.java index a1d1af290..968ff03ba 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityZone.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityZone.java @@ -3,11 +3,11 @@ package kamkeel.npcs.controllers.data.ability.type; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityPotionEffect; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.UserType; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.UserType; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; import kamkeel.npcs.entity.EntityAbilityZone; @@ -65,7 +65,7 @@ public abstract class AbilityZone extends Ability { this.colorData = defaultColors; this.targetingMode = TargetingMode.AGGRO_TARGET; this.maxRange = 20.0f; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.cooldownTicks = 0; this.allowedBy = UserType.BOTH; } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java index 841750d1c..980a1dfeb 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBarrier.java @@ -3,8 +3,8 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; -import kamkeel.npcs.controllers.data.ability.data.EnergyBarrierData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.entity.EntityAbilityBarrier; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBeam.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBeam.java index 0feda043a..a529ac488 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBeam.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityBeam.java @@ -3,13 +3,13 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.RotationMode; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.RotationMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; import kamkeel.npcs.controllers.data.ability.data.ProjectileData; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; @@ -47,9 +47,9 @@ public class AbilityBeam extends AbilityEnergyProjectile impl this.minRange = 5.0f; this.cooldownTicks = 0; this.windUpTicks = 40; - this.lockMovement = LockMovementType.WINDUP_AND_ACTIVE; + this.lockMovement = LockMode.WINDUP_AND_ACTIVE; this.rotationMode = RotationMode.LOCKED; - this.rotationPhase = LockMovementType.ACTIVE; + this.rotationPhase = LockMode.ACTIVE; this.telegraphType = TelegraphType.CIRCLE; this.showTelegraph = true; this.windUpAnimationName = "Ability_Beam_Windup"; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDisc.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDisc.java index 1a9194282..bc5883906 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDisc.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDisc.java @@ -3,12 +3,12 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; import kamkeel.npcs.controllers.data.ability.data.ProjectileData; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; @@ -49,7 +49,7 @@ public class AbilityDisc extends AbilityEnergyProjectile impl this.minRange = 5.0f; this.cooldownTicks = 0; this.windUpTicks = 60; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.telegraphType = TelegraphType.CIRCLE; this.showTelegraph = true; this.windUpAnimationName = "Ability_Disc_Windup"; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java index 1663f2447..99b431477 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityDome.java @@ -3,10 +3,10 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyBarrierData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import kamkeel.npcs.entity.EntityAbilityBarrier; import kamkeel.npcs.entity.EntityAbilityDome; @@ -37,7 +37,7 @@ public class AbilityDome extends AbilityBarrier { this.targetingMode = TargetingMode.SELF; this.cooldownTicks = 100; this.windUpTicks = 30; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.telegraphType = TelegraphType.RING; this.showTelegraph = true; this.windUpAnimationName = ""; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergy.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergy.java index 59917889e..461f3b50d 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergy.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergy.java @@ -3,8 +3,8 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.builder.FieldDef; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java index 3cb81720d..cfe9457a6 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java @@ -2,14 +2,14 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.HitType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.enums.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.enums.HitType; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import kamkeel.npcs.controllers.data.ability.data.ProjectileData; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityLaserShot.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityLaserShot.java index dafbc2200..ba1f08fba 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityLaserShot.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityLaserShot.java @@ -2,14 +2,14 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.RotationMode; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.enums.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.RotationMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; import kamkeel.npcs.controllers.data.ability.data.ProjectileData; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.Telegraph; @@ -49,9 +49,9 @@ public class AbilityLaserShot extends AbilityEnergyProjectile implem this.minRange = 5.0f; this.cooldownTicks = 0; this.windUpTicks = 30; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.telegraphType = TelegraphType.CIRCLE; this.showTelegraph = true; this.windUpAnimationName = "Ability_Orb_Windup"; @@ -117,7 +117,7 @@ public class AbilityOrb extends AbilityEnergyProjectile implem orb.setKnockbackUp(0.0f); orb.setProjectileCount(2); orb.setFireDelay(2); - a.setLockMovement(LockMovementType.WINDUP_AND_ACTIVE); + a.setLockMovement(LockMode.WINDUP_AND_ACTIVE); a.setMaxRange(75.0f); a.setBurstEnabled(true); a.setBurstAmount(15); diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java index 2d9c515a4..f7cbaa8fd 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityShield.java @@ -3,12 +3,12 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.UserType; -import kamkeel.npcs.controllers.data.ability.data.EnergyBarrierData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyPanelData; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.enums.UserType; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyPanelData; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import kamkeel.npcs.entity.EntityAbilityBarrier; import kamkeel.npcs.entity.EntityAbilityPanel; @@ -39,7 +39,7 @@ public class AbilityShield extends AbilityBarrier { this.targetingMode = TargetingMode.SELF; this.cooldownTicks = 60; this.windUpTicks = 10; - this.lockMovement = LockMovementType.WINDUP_AND_ACTIVE; + this.lockMovement = LockMode.WINDUP_AND_ACTIVE; this.telegraphType = TelegraphType.NONE; this.showTelegraph = false; this.windUpAnimationName = ""; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySlicer.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySlicer.java index 4d7a54b65..ca9cbc7eb 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySlicer.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySlicer.java @@ -3,12 +3,12 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; import kamkeel.npcs.controllers.data.ability.data.ProjectileData; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; @@ -45,7 +45,7 @@ public class AbilitySlicer extends AbilityEnergyProjectile { this.minRange = 3.0f; this.cooldownTicks = 40; this.windUpTicks = 15; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.telegraphType = TelegraphType.LINE; this.showTelegraph = true; this.windUpAnimationName = ""; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java index 2cc64bde4..942036d41 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilitySweeper.java @@ -2,9 +2,9 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs; import kamkeel.npcs.controllers.data.telegraph.Telegraph; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; @@ -49,7 +49,7 @@ public class AbilitySweeper extends AbilityEnergy implements IAbilitySweeper { this.targetingMode = TargetingMode.AGGRO_TARGET; this.maxRange = 15.0f; this.minRange = 0.0f; - this.lockMovement = LockMovementType.WINDUP_AND_ACTIVE; + this.lockMovement = LockMode.WINDUP_AND_ACTIVE; this.cooldownTicks = 0; this.windUpTicks = 60; // Circle telegraph to show range diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java index 5237485b8..1d820851d 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityWall.java @@ -3,11 +3,11 @@ package kamkeel.npcs.controllers.data.ability.type.energy; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.LockMovementType; -import kamkeel.npcs.controllers.data.ability.TargetingMode; -import kamkeel.npcs.controllers.data.ability.data.EnergyBarrierData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyPanelData; +import kamkeel.npcs.controllers.data.ability.enums.LockMode; +import kamkeel.npcs.controllers.data.ability.enums.TargetingMode; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyPanelData; import kamkeel.npcs.controllers.data.telegraph.TelegraphType; import kamkeel.npcs.entity.EntityAbilityBarrier; import kamkeel.npcs.entity.EntityAbilityPanel; @@ -40,7 +40,7 @@ public class AbilityWall extends AbilityBarrier { this.minRange = 2.0f; this.cooldownTicks = 80; this.windUpTicks = 20; - this.lockMovement = LockMovementType.WINDUP; + this.lockMovement = LockMode.WINDUP; this.telegraphType = TelegraphType.LINE; this.showTelegraph = true; this.windUpAnimationName = ""; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityTargetHelper.java b/src/main/java/kamkeel/npcs/controllers/data/ability/util/AbilityTargetHelper.java similarity index 95% rename from src/main/java/kamkeel/npcs/controllers/data/ability/AbilityTargetHelper.java rename to src/main/java/kamkeel/npcs/controllers/data/ability/util/AbilityTargetHelper.java index b45bd2b02..7f4c772c7 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityTargetHelper.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/util/AbilityTargetHelper.java @@ -1,5 +1,6 @@ -package kamkeel.npcs.controllers.data.ability; +package kamkeel.npcs.controllers.data.ability.util; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -84,7 +85,7 @@ public class AbilityTargetHelper { * @return true if the target should be affected */ public static boolean shouldAffect(EntityLivingBase caster, Entity target, - TargetFilter filter, boolean includeSelf) { + TargetFilter filter, boolean includeSelf) { if (target == caster) return includeSelf; if (!(target instanceof EntityLivingBase)) return false; if (!target.isEntityAlive()) return false; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityBarrier.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityBarrier.java index 02fbbdc4e..f1309bb97 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityBarrier.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityBarrier.java @@ -1,7 +1,7 @@ package kamkeel.npcs.entity; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.data.EnergyBarrierData; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java index d040d87e4..ff0de17df 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java @@ -1,12 +1,12 @@ package kamkeel.npcs.entity; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import kamkeel.npcs.util.AnchorPointHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java index 16a1423f0..556f4e68c 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityDisc.java @@ -1,12 +1,12 @@ package kamkeel.npcs.entity; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import kamkeel.npcs.util.AnchorPointHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityDome.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityDome.java index 149475d0d..8c0fc8fae 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityDome.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityDome.java @@ -2,9 +2,9 @@ package kamkeel.npcs.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.data.EnergyBarrierData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java index 67440bf07..aef9a7adb 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java @@ -1,11 +1,11 @@ package kamkeel.npcs.entity; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import kamkeel.npcs.util.AnchorPointHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityOrb.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityOrb.java index 6a12bf9ab..c203c61a5 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityOrb.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityOrb.java @@ -1,12 +1,12 @@ package kamkeel.npcs.entity; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import kamkeel.npcs.util.AnchorPointHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityPanel.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityPanel.java index f1a89012e..582151239 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityPanel.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityPanel.java @@ -2,10 +2,10 @@ package kamkeel.npcs.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.data.EnergyBarrierData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyPanelData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyBarrierData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyPanelData; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilitySweeper.java b/src/main/java/kamkeel/npcs/entity/EntityAbilitySweeper.java index f08ffeb2a..7efeec93b 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilitySweeper.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilitySweeper.java @@ -2,7 +2,7 @@ package kamkeel.npcs.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +10,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import noppes.npcs.LogWriter; import noppes.npcs.NpcDamageSource; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.data.Party; diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java index 129b87495..a3c034fcb 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java @@ -6,9 +6,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityPotionEffect; -import kamkeel.npcs.controllers.data.ability.AbilityTargetHelper; -import kamkeel.npcs.controllers.data.ability.TargetFilter; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect; +import kamkeel.npcs.controllers.data.ability.util.AbilityTargetHelper; +import kamkeel.npcs.controllers.data.ability.enums.TargetFilter; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java index 3b1bc0cc1..01b39f80d 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyAbility.java @@ -5,8 +5,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java index fae432710..718fe580f 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java @@ -3,16 +3,16 @@ package kamkeel.npcs.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; -import kamkeel.npcs.controllers.data.ability.AbilityPotionEffect; -import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.HitType; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.data.effect.AbilityPotionEffect; +import kamkeel.npcs.controllers.data.ability.enums.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.enums.HitType; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import kamkeel.npcs.util.AnchorPointHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergySlicer.java b/src/main/java/kamkeel/npcs/entity/EntityEnergySlicer.java index 4a8c3fbc2..b8b636171 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergySlicer.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergySlicer.java @@ -1,12 +1,12 @@ package kamkeel.npcs.entity; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSelectPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSelectPacket.java index 7a4e183a2..6b6262e8b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSelectPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSelectPacket.java @@ -1,9 +1,6 @@ package kamkeel.npcs.network.packets.player.ability; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.controllers.AbilityController; -import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; @@ -11,7 +8,6 @@ import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.data.AbilityHotbarData; import noppes.npcs.controllers.data.PlayerData; import java.io.IOException; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilityGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilityGetPacket.java index da8ca9d9f..2bcc48601 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilityGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilityGetPacket.java @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import kamkeel.npcs.controllers.AbilityController; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilitySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilitySavePacket.java index ca9925bbf..e4564e8f0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilitySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/ability/ChainedAbilitySavePacket.java @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import kamkeel.npcs.controllers.AbilityController; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; diff --git a/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java b/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java index 6a1a17c76..2da72ac7c 100644 --- a/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java +++ b/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java @@ -1,7 +1,7 @@ package kamkeel.npcs.util; -import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.enums.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.Vec3; diff --git a/src/main/java/kamkeel/npcs/util/Register.java b/src/main/java/kamkeel/npcs/util/Register.java index 75184778d..a01ef84c1 100644 --- a/src/main/java/kamkeel/npcs/util/Register.java +++ b/src/main/java/kamkeel/npcs/util/Register.java @@ -3,7 +3,7 @@ package kamkeel.npcs.util; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.IEffectAction; +import kamkeel.npcs.controllers.data.ability.data.effect.IEffectAction; import kamkeel.npcs.controllers.data.ability.conditions.AbilityCondition; import noppes.npcs.LogWriter; import noppes.npcs.controllers.AnimationController; diff --git a/src/main/java/noppes/npcs/AbstractDataAbilities.java b/src/main/java/noppes/npcs/AbstractDataAbilities.java index b63481c21..a2b94fdc9 100644 --- a/src/main/java/noppes/npcs/AbstractDataAbilities.java +++ b/src/main/java/noppes/npcs/AbstractDataAbilities.java @@ -2,11 +2,11 @@ package noppes.npcs; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityPhase; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.ChainedAbilityEntry; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.entry.ChainedAbilityEntry; import kamkeel.npcs.controllers.data.ability.ConcurrentSlot; -import kamkeel.npcs.controllers.data.ability.ToggleEntry; +import kamkeel.npcs.controllers.data.ability.data.entry.AbilityToggleEntry; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; @@ -296,7 +296,7 @@ public abstract class AbstractDataAbilities { /** * Currently active toggles. Key = ability key, Value = toggle entry with state and tick counter. */ - protected Map activeToggles = new LinkedHashMap<>(); + protected Map activeToggles = new LinkedHashMap<>(); /** * Cycle a toggle ability to its next state. @@ -306,7 +306,7 @@ public abstract class AbstractDataAbilities { * @return The new state (0 = off, 1+ = active state number) */ public int toggleAbility(String key) { - ToggleEntry existing = activeToggles.get(key); + AbilityToggleEntry existing = activeToggles.get(key); if (existing != null) { int currentState = existing.getState(); int maxStates = existing.getAbility().getToggleStates(); @@ -326,7 +326,7 @@ public abstract class AbstractDataAbilities { * @return 0 if not active, 1+ for active state */ public int getToggleState(String key) { - ToggleEntry entry = activeToggles.get(key); + AbilityToggleEntry entry = activeToggles.get(key); return entry != null ? entry.getState() : 0; } @@ -340,7 +340,7 @@ public abstract class AbstractDataAbilities { } return; } - ToggleEntry existing = activeToggles.get(key); + AbilityToggleEntry existing = activeToggles.get(key); if (existing != null) { int currentState = existing.getState(); if (currentState != state) { @@ -373,7 +373,7 @@ public abstract class AbstractDataAbilities { if (fireToggleEvent(ability, 0, state)) return false; - ToggleEntry entry = new ToggleEntry(ability, state); + AbilityToggleEntry entry = new AbilityToggleEntry(ability, state); activeToggles.put(key, entry); ability.onToggleOn(getEntity()); ability.onToggleStateChanged(getEntity(), 0, state); @@ -381,7 +381,7 @@ public abstract class AbstractDataAbilities { return true; } - private int cycleToggleState(String key, ToggleEntry entry, int oldState, int newState) { + private int cycleToggleState(String key, AbilityToggleEntry entry, int oldState, int newState) { Ability ability = entry.getAbility(); if (newState < 1 || newState > ability.getToggleStates()) return oldState; @@ -394,7 +394,7 @@ public abstract class AbstractDataAbilities { } private void deactivateToggle(String key) { - ToggleEntry entry = activeToggles.get(key); + AbilityToggleEntry entry = activeToggles.get(key); if (entry == null) return; int oldState = entry.getState(); @@ -418,8 +418,8 @@ public abstract class AbstractDataAbilities { EntityLivingBase entity = getEntity(); List toRemove = null; - for (Map.Entry mapEntry : activeToggles.entrySet()) { - ToggleEntry entry = mapEntry.getValue(); + for (Map.Entry mapEntry : activeToggles.entrySet()) { + AbilityToggleEntry entry = mapEntry.getValue(); entry.incrementTick(); if (entry.getAbility().hasActiveToggle()) { @@ -441,7 +441,7 @@ public abstract class AbstractDataAbilities { if (toRemove != null) { for (String key : toRemove) { - ToggleEntry entry = activeToggles.remove(key); + AbilityToggleEntry entry = activeToggles.remove(key); if (entry != null) { int oldState = entry.getState(); entry.getAbility().onToggleOff(entity); @@ -483,8 +483,8 @@ public abstract class AbstractDataAbilities { protected void clearActiveToggles() { if (activeToggles.isEmpty()) return; EntityLivingBase entity = getEntity(); - for (Map.Entry mapEntry : activeToggles.entrySet()) { - ToggleEntry entry = mapEntry.getValue(); + for (Map.Entry mapEntry : activeToggles.entrySet()) { + AbilityToggleEntry entry = mapEntry.getValue(); entry.getAbility().onToggleOff(entity); entry.getAbility().onToggleStateChanged(entity, entry.getState(), 0); } @@ -502,7 +502,7 @@ public abstract class AbstractDataAbilities { Ability ability = AbilityController.Instance != null ? AbilityController.Instance.resolveAbility(key) : null; if (ability != null && ability.isToggleable()) { - activeToggles.put(key, new ToggleEntry(ability, state)); + activeToggles.put(key, new AbilityToggleEntry(ability, state)); } } else { activeToggles.remove(key); diff --git a/src/main/java/noppes/npcs/DataAbilities.java b/src/main/java/noppes/npcs/DataAbilities.java index 548939a54..68d1231d7 100644 --- a/src/main/java/noppes/npcs/DataAbilities.java +++ b/src/main/java/noppes/npcs/DataAbilities.java @@ -3,10 +3,10 @@ package noppes.npcs; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.AbilityAction; -import kamkeel.npcs.controllers.data.ability.AbilityPhase; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.IAbilityAction; -import kamkeel.npcs.controllers.data.ability.ToggleEntry; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.data.entry.AbilityToggleEntry; import kamkeel.npcs.controllers.data.ability.type.AbilityGuard; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; import kamkeel.npcs.network.packets.data.telegraph.TelegraphRemovePacket; @@ -14,7 +14,6 @@ import kamkeel.npcs.network.packets.data.telegraph.TelegraphSpawnPacket; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; import net.minecraft.util.DamageSource; import noppes.npcs.controllers.data.Animation; import noppes.npcs.entity.EntityNPCInterface; @@ -1095,7 +1094,7 @@ public class DataAbilities extends AbstractDataAbilities { // Active toggles (compound format with state) NBTTagList toggleList = new NBTTagList(); - for (Map.Entry entry : activeToggles.entrySet()) { + for (Map.Entry entry : activeToggles.entrySet()) { NBTTagCompound toggleNbt = new NBTTagCompound(); toggleNbt.setString("Key", entry.getKey()); toggleNbt.setInteger("State", entry.getValue().getState()); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java index 85ef3e5d8..23d18ad20 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAbilities.java @@ -4,8 +4,8 @@ import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.AbilityAction; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.ChainedAbilityEntry; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.entry.ChainedAbilityEntry; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.ability.AbilitiesGetAllPacket; import kamkeel.npcs.network.packets.request.ability.AbilitiesNpcGetPacket; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java index 804f7e663..11a194d29 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiChainedAbilityConfig.java @@ -4,11 +4,11 @@ import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.AbilityAction; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.ChainedAbilityEntry; -import kamkeel.npcs.controllers.data.ability.AbilityIconData; -import kamkeel.npcs.controllers.data.ability.IChainedAbilityFieldProvider; -import kamkeel.npcs.controllers.data.ability.UserType; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.entry.ChainedAbilityEntry; +import kamkeel.npcs.controllers.data.ability.data.AbilityIconData; +import kamkeel.npcs.controllers.data.ability.gui.IChainedAbilityFieldProvider; +import kamkeel.npcs.controllers.data.ability.enums.UserType; import kamkeel.npcs.controllers.data.ability.conditions.AbilityCondition; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.ability.CustomAbilitySavePacket; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageAbilities.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageAbilities.java index f6562e7a5..95cce7cf9 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageAbilities.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageAbilities.java @@ -3,7 +3,7 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.AbilityVariant; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.ability.BuiltInAbilityGetPacket; import kamkeel.npcs.network.packets.request.ability.ChainedAbilitiesGetPacket; @@ -24,8 +24,8 @@ import noppes.npcs.client.gui.advanced.SubGuiAbilityTypeSelect; import noppes.npcs.client.gui.advanced.SubGuiAbilityVariantSelect; import noppes.npcs.client.gui.advanced.SubGuiChainedAbilityConfig; import noppes.npcs.client.gui.advanced.SubGuiDuplicateNameConfirm; -import noppes.npcs.client.gui.util.AbilityPreviewExecutor; -import noppes.npcs.client.gui.util.GuiAbilityInterface; +import kamkeel.npcs.controllers.data.ability.preview.AbilityPreviewExecutor; +import kamkeel.npcs.controllers.data.ability.gui.GuiAbilityInterface; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; diff --git a/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarComponent.java b/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarComponent.java index 4b3be2d6a..3bcf1a3c3 100644 --- a/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarComponent.java +++ b/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarComponent.java @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.packets.player.ability.AbilityHotbarSelectPacket; import net.minecraft.client.Minecraft; diff --git a/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarSlotRenderer.java b/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarSlotRenderer.java index c91ad016b..44d81c441 100644 --- a/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarSlotRenderer.java +++ b/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityHotbarSlotRenderer.java @@ -3,8 +3,8 @@ package noppes.npcs.client.gui.hud.ability; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityIcon.java b/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityIcon.java index 1371bcc2a..c36d06de2 100644 --- a/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityIcon.java +++ b/src/main/java/noppes/npcs/client/gui/hud/ability/AbilityIcon.java @@ -3,9 +3,9 @@ package noppes.npcs.client.gui.hud.ability; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityIconData; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.data.AbilityIconData; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiAbilities.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiAbilities.java index 1d0180463..36def1d43 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiAbilities.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiAbilities.java @@ -2,8 +2,8 @@ package noppes.npcs.client.gui.player.inventory; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.packets.player.ability.AbilityHotbarSavePacket; import kamkeel.npcs.network.packets.player.ability.AbilityHotbarSelectPacket; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/SubGuiSelectAbilityForSlot.java b/src/main/java/noppes/npcs/client/gui/player/inventory/SubGuiSelectAbilityForSlot.java index a3d85f7e4..dfef9e88b 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/SubGuiSelectAbilityForSlot.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/SubGuiSelectAbilityForSlot.java @@ -2,7 +2,7 @@ package noppes.npcs.client.gui.player.inventory; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.gui.util.GuiCustomScroll; diff --git a/src/main/java/noppes/npcs/client/gui/util/IChainedAbilityConfigCallback.java b/src/main/java/noppes/npcs/client/gui/util/IChainedAbilityConfigCallback.java index f714ea2c7..4584b7072 100644 --- a/src/main/java/noppes/npcs/client/gui/util/IChainedAbilityConfigCallback.java +++ b/src/main/java/noppes/npcs/client/gui/util/IChainedAbilityConfigCallback.java @@ -1,6 +1,6 @@ package noppes.npcs.client.gui.util; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; /** * Callback for when a chained ability is saved from the config SubGui. diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java index 79890baeb..18a58783a 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java @@ -2,10 +2,10 @@ package noppes.npcs.controllers.data; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.controllers.data.ability.AbilityPhase; -import kamkeel.npcs.controllers.data.ability.ChainedAbility; -import kamkeel.npcs.controllers.data.ability.IAbilityAction; -import kamkeel.npcs.controllers.data.ability.ToggleEntry; +import kamkeel.npcs.controllers.data.ability.enums.AbilityPhase; +import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; +import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; +import kamkeel.npcs.controllers.data.ability.data.entry.AbilityToggleEntry; import kamkeel.npcs.controllers.data.ability.type.AbilityGuard; import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance; import kamkeel.npcs.network.packets.data.ability.AbilityCooldownSyncPacket; @@ -23,7 +23,6 @@ import net.minecraft.util.DamageSource; import noppes.npcs.AbstractDataAbilities; import noppes.npcs.EventHooks; import noppes.npcs.LogWriter; -import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.api.ability.IPlayerAbilityData; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.controllers.ScriptController; @@ -995,7 +994,7 @@ public class PlayerAbilityData extends AbstractDataAbilities implements IPlayerA // Active toggles (compound format with state) NBTTagList toggleList = new NBTTagList(); - for (Map.Entry entry : activeToggles.entrySet()) { + for (Map.Entry entry : activeToggles.entrySet()) { NBTTagCompound toggleNbt = new NBTTagCompound(); toggleNbt.setString("Key", entry.getKey()); toggleNbt.setInteger("State", entry.getValue().getState()); diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java index f062d891c..abfea96e3 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerAbilityHotbarData.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers.data; import kamkeel.npcs.controllers.AbilityController; import kamkeel.npcs.controllers.data.ability.Ability; -import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.packets.data.ability.AbilityHotbarSyncPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/noppes/npcs/items/ItemStaff.java b/src/main/java/noppes/npcs/items/ItemStaff.java index 5891df2e1..1f9a45381 100644 --- a/src/main/java/noppes/npcs/items/ItemStaff.java +++ b/src/main/java/noppes/npcs/items/ItemStaff.java @@ -1,13 +1,13 @@ package noppes.npcs.items; -import kamkeel.npcs.controllers.data.ability.AnchorPoint; -import kamkeel.npcs.controllers.data.ability.data.EnergyAnchorData; -import kamkeel.npcs.controllers.data.ability.data.EnergyCombatData; -import kamkeel.npcs.controllers.data.ability.data.EnergyDisplayData; -import kamkeel.npcs.controllers.data.ability.data.EnergyHomingData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLifespanData; -import kamkeel.npcs.controllers.data.ability.data.EnergyLightningData; -import kamkeel.npcs.controllers.data.ability.data.EnergyTrajectoryData; +import kamkeel.npcs.controllers.data.ability.enums.AnchorPoint; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyAnchorData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyCombatData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyDisplayData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyHomingData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLifespanData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyLightningData; +import kamkeel.npcs.controllers.data.ability.data.energy.EnergyTrajectoryData; import kamkeel.npcs.entity.EntityAbilityOrb; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase;