TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-22 16:05:01 +00:00
Code Issues Projects Releases Wiki Activity

Re-organises packages (#685)

Browse source 
* Re-organises packages

* Re-adds instructions display in the help command
This commit is contained in:
Loony 2017-01-07 06:28:21 +00:00 committed by Christopher Martin
parent bba1973d31
commit 6885e0b4ba
71 changed files with 211 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/BendingManager.java
View file

@ -2,7 +2,7 @@ package com.projectkorra.projectkorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.chiblocking.ChiCombo;
import com.projectkorra.projectkorra.chiblocking.combo.ChiCombo;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
import com.projectkorra.projectkorra.util.Flight;

4
src/com/projectkorra/projectkorra/BendingPlayer.java
View file

@ -26,11 +26,11 @@ import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.chiblocking.Paralyze;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.MetalClips;
import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
import com.projectkorra.projectkorra.event.PlayerCooldownChangeEvent;
import com.projectkorra.projectkorra.event.PlayerCooldownChangeEvent.Result;
import com.projectkorra.projectkorra.storage.DBConnection;
import com.projectkorra.projectkorra.waterbending.Bloodbending;
import com.projectkorra.projectkorra.waterbending.blood.Bloodbending;
import com.projectkorra.spirits.SpiritElement;
import com.projectkorra.spirits.SpiritPlayer;

8
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -94,23 +94,23 @@ import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.airbending.AirBlast;
import com.projectkorra.projectkorra.airbending.AirCombo;
import com.projectkorra.projectkorra.airbending.AirShield;
import com.projectkorra.projectkorra.airbending.AirSpout;
import com.projectkorra.projectkorra.airbending.AirSuction;
import com.projectkorra.projectkorra.airbending.AirSwipe;
import com.projectkorra.projectkorra.airbending.combo.AirCombo;
import com.projectkorra.projectkorra.chiblocking.AcrobatStance;
import com.projectkorra.projectkorra.chiblocking.WarriorStance;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.EarthBlast;
import com.projectkorra.projectkorra.earthbending.EarthPassive;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.event.BendingPlayerCreationEvent;
import com.projectkorra.projectkorra.event.BendingReloadEvent;
import com.projectkorra.projectkorra.event.BindChangeEvent;
import com.projectkorra.projectkorra.firebending.Combustion;
import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.firebending.FireCombo;
import com.projectkorra.projectkorra.firebending.FireShield;
import com.projectkorra.projectkorra.firebending.combo.FireCombo;
import com.projectkorra.projectkorra.firebending.combustion.Combustion;
import com.projectkorra.projectkorra.object.Preset;
import com.projectkorra.projectkorra.storage.DBConnection;
import com.projectkorra.projectkorra.util.ActionBar;

44
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -85,7 +85,6 @@ import com.projectkorra.projectkorra.ability.util.PassiveManager;
import com.projectkorra.projectkorra.airbending.AirBlast;
import com.projectkorra.projectkorra.airbending.AirBubble;
import com.projectkorra.projectkorra.airbending.AirBurst;
import com.projectkorra.projectkorra.airbending.AirFlight;
import com.projectkorra.projectkorra.airbending.AirScooter;
import com.projectkorra.projectkorra.airbending.AirShield;
import com.projectkorra.projectkorra.airbending.AirSpout;
@ -93,11 +92,10 @@ import com.projectkorra.projectkorra.airbending.AirSuction;
import com.projectkorra.projectkorra.airbending.AirSwipe;
import com.projectkorra.projectkorra.airbending.Suffocate;
import com.projectkorra.projectkorra.airbending.Tornado;
import com.projectkorra.projectkorra.airbending.flight.AirFlight;
import com.projectkorra.projectkorra.airbending.passive.GracefulDescent;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.chiblocking.AcrobatStance;
import com.projectkorra.projectkorra.chiblocking.ChiCombo;
import com.projectkorra.projectkorra.chiblocking.ChiPassive;
import com.projectkorra.projectkorra.chiblocking.HighJump;
import com.projectkorra.projectkorra.chiblocking.Paralyze;
import com.projectkorra.projectkorra.chiblocking.QuickStrike;
@ -105,29 +103,31 @@ import com.projectkorra.projectkorra.chiblocking.RapidPunch;
import com.projectkorra.projectkorra.chiblocking.Smokescreen;
import com.projectkorra.projectkorra.chiblocking.SwiftKick;
import com.projectkorra.projectkorra.chiblocking.WarriorStance;
import com.projectkorra.projectkorra.chiblocking.combo.ChiCombo;
import com.projectkorra.projectkorra.chiblocking.passive.Acrobatics;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.metal.Extraction;
import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
import com.projectkorra.projectkorra.earthbending.Catapult;
import com.projectkorra.projectkorra.earthbending.Collapse;
import com.projectkorra.projectkorra.earthbending.CollapseWall;
import com.projectkorra.projectkorra.earthbending.EarthArmor;
import com.projectkorra.projectkorra.earthbending.EarthBlast;
import com.projectkorra.projectkorra.earthbending.EarthGrab;
import com.projectkorra.projectkorra.earthbending.EarthPassive;
import com.projectkorra.projectkorra.earthbending.EarthSmash;
import com.projectkorra.projectkorra.earthbending.EarthTunnel;
import com.projectkorra.projectkorra.earthbending.Extraction;
import com.projectkorra.projectkorra.earthbending.LavaFlow;
import com.projectkorra.projectkorra.earthbending.LavaFlow.AbilityType;
import com.projectkorra.projectkorra.earthbending.LavaSurge;
import com.projectkorra.projectkorra.earthbending.MetalClips;
import com.projectkorra.projectkorra.earthbending.RaiseEarth;
import com.projectkorra.projectkorra.earthbending.RaiseEarthWall;
import com.projectkorra.projectkorra.earthbending.SandSpout;
import com.projectkorra.projectkorra.earthbending.Shockwave;
import com.projectkorra.projectkorra.earthbending.Tremorsense;
import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
import com.projectkorra.projectkorra.earthbending.lava.LavaSurge;
import com.projectkorra.projectkorra.earthbending.lava.LavaFlow.AbilityType;
import com.projectkorra.projectkorra.earthbending.passive.DensityShift;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.earthbending.sand.SandSpout;
import com.projectkorra.projectkorra.event.EntityBendingDeathEvent;
import com.projectkorra.projectkorra.event.HorizontalVelocityChangeEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
@ -136,18 +136,18 @@ import com.projectkorra.projectkorra.event.PlayerJumpEvent;
import com.projectkorra.projectkorra.firebending.Blaze;
import com.projectkorra.projectkorra.firebending.BlazeArc;
import com.projectkorra.projectkorra.firebending.BlazeRing;
import com.projectkorra.projectkorra.firebending.Combustion;
import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.firebending.FireBlastCharged;
import com.projectkorra.projectkorra.firebending.FireBurst;
import com.projectkorra.projectkorra.firebending.FireCombo;
import com.projectkorra.projectkorra.firebending.FireDamageTimer;
import com.projectkorra.projectkorra.firebending.FireJet;
import com.projectkorra.projectkorra.firebending.FireShield;
import com.projectkorra.projectkorra.firebending.HeatControl;
import com.projectkorra.projectkorra.firebending.HeatControl.HeatControlType;
import com.projectkorra.projectkorra.firebending.combo.FireCombo;
import com.projectkorra.projectkorra.firebending.combustion.Combustion;
import com.projectkorra.projectkorra.firebending.lightning.Lightning;
import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
import com.projectkorra.projectkorra.firebending.Illumination;
import com.projectkorra.projectkorra.firebending.Lightning;
import com.projectkorra.projectkorra.firebending.WallOfFire;
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
import com.projectkorra.projectkorra.object.Preset;
@ -158,22 +158,22 @@ import com.projectkorra.projectkorra.util.Flight;
import com.projectkorra.projectkorra.util.PassiveHandler;
import com.projectkorra.projectkorra.util.TempArmor;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.Bloodbending;
import com.projectkorra.projectkorra.waterbending.HealingWaters;
import com.projectkorra.projectkorra.waterbending.IceBlast;
import com.projectkorra.projectkorra.waterbending.IceSpikeBlast;
import com.projectkorra.projectkorra.waterbending.OctopusForm;
import com.projectkorra.projectkorra.waterbending.PhaseChange;
import com.projectkorra.projectkorra.waterbending.PhaseChange.PhaseChangeType;
import com.projectkorra.projectkorra.waterbending.blood.Bloodbending;
import com.projectkorra.projectkorra.waterbending.healing.HealingWaters;
import com.projectkorra.projectkorra.waterbending.ice.IceBlast;
import com.projectkorra.projectkorra.waterbending.ice.IceSpikeBlast;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange.PhaseChangeType;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms;
import com.projectkorra.projectkorra.waterbending.SurgeWall;
import com.projectkorra.projectkorra.waterbending.SurgeWave;
import com.projectkorra.projectkorra.waterbending.Torrent;
import com.projectkorra.projectkorra.waterbending.WaterArms;
import com.projectkorra.projectkorra.waterbending.WaterManipulation;
import com.projectkorra.projectkorra.waterbending.WaterPassive;
import com.projectkorra.projectkorra.waterbending.WaterSpout;
import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;
import com.projectkorra.projectkorra.waterbending.passive.Hydrosink;
import com.projectkorra.projectkorra.waterbending.passive.WaterPassive;
import com.projectkorra.rpg.RPGMethods;
public class PKListener implements Listener {

10
src/com/projectkorra/projectkorra/ProjectKorra.java
View file

@ -16,12 +16,12 @@ import com.projectkorra.projectkorra.ability.util.CollisionManager;
import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.ability.util.PassiveManager;
import com.projectkorra.projectkorra.airbending.AirbendingManager;
import com.projectkorra.projectkorra.chiblocking.ChiblockingManager;
import com.projectkorra.projectkorra.airbending.util.AirbendingManager;
import com.projectkorra.projectkorra.chiblocking.util.ChiblockingManager;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.EarthbendingManager;
import com.projectkorra.projectkorra.firebending.FirebendingManager;
import com.projectkorra.projectkorra.earthbending.util.EarthbendingManager;
import com.projectkorra.projectkorra.firebending.util.FirebendingManager;
import com.projectkorra.projectkorra.object.Preset;
import com.projectkorra.projectkorra.storage.DBConnection;
import com.projectkorra.projectkorra.util.MetricsLite;
@ -29,7 +29,7 @@ import com.projectkorra.projectkorra.util.RevertChecker;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.Updater;
import com.projectkorra.projectkorra.util.logging.PKLogHandler;
import com.projectkorra.projectkorra.waterbending.WaterbendingManager;
import com.projectkorra.projectkorra.waterbending.util.WaterbendingManager;
public class ProjectKorra extends JavaPlugin {

2
src/com/projectkorra/projectkorra/ability/Ability.java
View file

@ -14,7 +14,7 @@ import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.firebending.FireBlastCharged;
import com.projectkorra.projectkorra.firebending.FireBurst;
import com.projectkorra.projectkorra.waterbending.TorrentWave;
import com.projectkorra.projectkorra.waterbending.WaterPassive;
import com.projectkorra.projectkorra.waterbending.passive.WaterPassive;
/**
* The Ability interface defines the set of methods that any CoreAbility, AddonAbility, ComboAbility, or

6
src/com/projectkorra/projectkorra/ability/EarthAbility.java
View file

@ -23,10 +23,10 @@ import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.EarthPassive;
import com.projectkorra.projectkorra.earthbending.LavaFlow;
import com.projectkorra.projectkorra.earthbending.RaiseEarth;
import com.projectkorra.projectkorra.earthbending.SandSpout;
import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.earthbending.sand.SandSpout;
import com.projectkorra.projectkorra.firebending.Illumination;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.Information;

4
src/com/projectkorra/projectkorra/ability/WaterAbility.java
View file

@ -18,11 +18,11 @@ import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.ParticleEffect.ParticleData;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.PhaseChange;
import com.projectkorra.projectkorra.waterbending.SurgeWall;
import com.projectkorra.projectkorra.waterbending.SurgeWave;
import com.projectkorra.projectkorra.waterbending.WaterArms;
import com.projectkorra.projectkorra.waterbending.WaterSpout;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms;
import com.projectkorra.rpg.RPGMethods;
public abstract class WaterAbility extends ElementalAbility {

32
src/com/projectkorra/projectkorra/ability/util/CollisionInitializer.java
View file

@ -5,9 +5,6 @@ import java.util.ArrayList;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.airbending.AirBlast;
import com.projectkorra.projectkorra.airbending.AirBubble;
import com.projectkorra.projectkorra.airbending.AirCombo.AirStream;
import com.projectkorra.projectkorra.airbending.AirCombo.AirSweep;
import com.projectkorra.projectkorra.airbending.AirFlight;
import com.projectkorra.projectkorra.airbending.AirScooter;
import com.projectkorra.projectkorra.airbending.AirShield;
import com.projectkorra.projectkorra.airbending.AirSpout;
@ -15,39 +12,42 @@ import com.projectkorra.projectkorra.airbending.AirSuction;
import com.projectkorra.projectkorra.airbending.AirSwipe;
import com.projectkorra.projectkorra.airbending.Suffocate;
import com.projectkorra.projectkorra.airbending.Tornado;
import com.projectkorra.projectkorra.airbending.combo.AirCombo.AirStream;
import com.projectkorra.projectkorra.airbending.combo.AirCombo.AirSweep;
import com.projectkorra.projectkorra.airbending.flight.AirFlight;
import com.projectkorra.projectkorra.earthbending.Catapult;
import com.projectkorra.projectkorra.earthbending.Collapse;
import com.projectkorra.projectkorra.earthbending.EarthArmor;
import com.projectkorra.projectkorra.earthbending.EarthBlast;
import com.projectkorra.projectkorra.earthbending.EarthSmash;
import com.projectkorra.projectkorra.earthbending.EarthTunnel;
import com.projectkorra.projectkorra.earthbending.LavaFlow;
import com.projectkorra.projectkorra.earthbending.RaiseEarth;
import com.projectkorra.projectkorra.earthbending.Ripple;
import com.projectkorra.projectkorra.earthbending.SandSpout;
import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
import com.projectkorra.projectkorra.earthbending.sand.SandSpout;
import com.projectkorra.projectkorra.firebending.BlazeArc;
import com.projectkorra.projectkorra.firebending.Combustion;
import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.firebending.FireBlastCharged;
import com.projectkorra.projectkorra.firebending.FireCombo.FireKick;
import com.projectkorra.projectkorra.firebending.FireCombo.FireSpin;
import com.projectkorra.projectkorra.firebending.FireCombo.FireWheel;
import com.projectkorra.projectkorra.firebending.combustion.Combustion;
import com.projectkorra.projectkorra.firebending.lightning.Lightning;
import com.projectkorra.projectkorra.firebending.FireJet;
import com.projectkorra.projectkorra.firebending.FireShield;
import com.projectkorra.projectkorra.firebending.Lightning;
import com.projectkorra.projectkorra.firebending.WallOfFire;
import com.projectkorra.projectkorra.waterbending.Bloodbending;
import com.projectkorra.projectkorra.waterbending.HealingWaters;
import com.projectkorra.projectkorra.waterbending.IceBlast;
import com.projectkorra.projectkorra.waterbending.IceSpikeBlast;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireKick;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireSpin;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireWheel;
import com.projectkorra.projectkorra.waterbending.OctopusForm;
import com.projectkorra.projectkorra.waterbending.SurgeWall;
import com.projectkorra.projectkorra.waterbending.SurgeWave;
import com.projectkorra.projectkorra.waterbending.Torrent;
import com.projectkorra.projectkorra.waterbending.TorrentWave;
import com.projectkorra.projectkorra.waterbending.WaterBubble;
import com.projectkorra.projectkorra.waterbending.WaterCombo.IceBullet;
import com.projectkorra.projectkorra.waterbending.WaterCombo.IceWave;
import com.projectkorra.projectkorra.waterbending.blood.Bloodbending;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo.IceBullet;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo.IceWave;
import com.projectkorra.projectkorra.waterbending.healing.HealingWaters;
import com.projectkorra.projectkorra.waterbending.ice.IceBlast;
import com.projectkorra.projectkorra.waterbending.ice.IceSpikeBlast;
import com.projectkorra.projectkorra.waterbending.WaterManipulation;
import com.projectkorra.projectkorra.waterbending.WaterSpout;
import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;

26
src/com/projectkorra/projectkorra/ability/util/ComboManager.java
View file

@ -15,22 +15,22 @@ import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.airbending.AirCombo.AirStream;
import com.projectkorra.projectkorra.airbending.AirCombo.AirSweep;
import com.projectkorra.projectkorra.airbending.AirCombo.Twister;
import com.projectkorra.projectkorra.chiblocking.ChiCombo.Immobilize;
import com.projectkorra.projectkorra.airbending.combo.AirCombo.AirStream;
import com.projectkorra.projectkorra.airbending.combo.AirCombo.AirSweep;
import com.projectkorra.projectkorra.airbending.combo.AirCombo.Twister;
import com.projectkorra.projectkorra.chiblocking.combo.ChiCombo.Immobilize;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.firebending.FireCombo.FireKick;
import com.projectkorra.projectkorra.firebending.FireCombo.FireSpin;
import com.projectkorra.projectkorra.firebending.FireCombo.FireWheel;
import com.projectkorra.projectkorra.firebending.FireCombo.JetBlast;
import com.projectkorra.projectkorra.firebending.FireCombo.JetBlaze;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireKick;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireSpin;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireWheel;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.JetBlast;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.JetBlaze;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.ReflectionHandler;
import com.projectkorra.projectkorra.waterbending.WaterCombo.IceBullet;
import com.projectkorra.projectkorra.waterbending.WaterCombo.IceBulletLeftClick;
import com.projectkorra.projectkorra.waterbending.WaterCombo.IceBulletRightClick;
import com.projectkorra.projectkorra.waterbending.WaterCombo.IceWave;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo.IceBullet;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo.IceBulletLeftClick;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo.IceBulletRightClick;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo.IceWave;
public class ComboManager {

4
src/com/projectkorra/projectkorra/airbending/AirCombo.java → src/com/projectkorra/projectkorra/airbending/combo/AirCombo.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.airbending;
package com.projectkorra.projectkorra.airbending.combo;
import java.util.ArrayList;
import java.util.List;
@ -19,7 +19,7 @@ import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.firebending.FireCombo.FireComboStream;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireComboStream;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.Flight;

2
src/com/projectkorra/projectkorra/airbending/AirFlight.java → src/com/projectkorra/projectkorra/airbending/flight/AirFlight.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.airbending;
package com.projectkorra.projectkorra.airbending.flight;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

2
src/com/projectkorra/projectkorra/airbending/AirPassive.java → src/com/projectkorra/projectkorra/airbending/passive/AirPassive.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.airbending;
package com.projectkorra.projectkorra.airbending.passive;
import com.projectkorra.projectkorra.configuration.ConfigManager;

5
src/com/projectkorra/projectkorra/airbending/AirbendingManager.java → src/com/projectkorra/projectkorra/airbending/util/AirbendingManager.java
View file

@ -1,6 +1,9 @@
package com.projectkorra.projectkorra.airbending;
package com.projectkorra.projectkorra.airbending.util;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.airbending.AirBlast;
import com.projectkorra.projectkorra.airbending.AirBubble;
import com.projectkorra.projectkorra.airbending.AirSuction;
public class AirbendingManager implements Runnable {

2
src/com/projectkorra/projectkorra/chiblocking/HighJump.java
View file

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.chiblocking;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.waterbending.WaterArmsWhip;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArmsWhip;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;

1
src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java
View file

@ -5,6 +5,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.util.DamageHandler;
public class QuickStrike extends ChiAbility {

1
src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java
View file

@ -3,6 +3,7 @@ package com.projectkorra.projectkorra.chiblocking;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.airbending.Suffocate;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.util.DamageHandler;
import org.bukkit.Location;

1
src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java
View file

@ -6,6 +6,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.util.DamageHandler;
public class SwiftKick extends ChiAbility {

2
src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java → src/com/projectkorra/projectkorra/chiblocking/combo/ChiCombo.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.chiblocking;
package com.projectkorra.projectkorra.chiblocking.combo;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;

5
src/com/projectkorra/projectkorra/chiblocking/ChiPassive.java → src/com/projectkorra/projectkorra/chiblocking/passive/ChiPassive.java
View file

@ -1,10 +1,13 @@
package com.projectkorra.projectkorra.chiblocking;
package com.projectkorra.projectkorra.chiblocking.passive;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.airbending.Suffocate;
import com.projectkorra.projectkorra.chiblocking.AcrobatStance;
import com.projectkorra.projectkorra.chiblocking.QuickStrike;
import com.projectkorra.projectkorra.chiblocking.SwiftKick;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import org.bukkit.Bukkit;

4
src/com/projectkorra/projectkorra/chiblocking/ChiblockingManager.java → src/com/projectkorra/projectkorra/chiblocking/util/ChiblockingManager.java
View file

@ -1,6 +1,8 @@
package com.projectkorra.projectkorra.chiblocking;
package com.projectkorra.projectkorra.chiblocking.util;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.chiblocking.Paralyze;
import com.projectkorra.projectkorra.chiblocking.Smokescreen;
import org.bukkit.Bukkit;
import org.bukkit.Material;

1
src/com/projectkorra/projectkorra/command/HelpCommand.java
View file

@ -124,6 +124,7 @@ public class HelpCommand extends PKCommand {
ChatColor color = ability.getElement().getColor();
sender.sendMessage(color + ability.getName() + " - ");
sender.sendMessage(color + ability.getDescription());
sender.sendMessage(ChatColor.GOLD + usage + ability.getInstructions());
} else if (Arrays.asList(Commands.airaliases).contains(args.get(0))) {
sender.sendMessage(Element.AIR.getColor() + air.replace("/b help AirCombos", Element.AIR.getSubColor() + "/b help AirCombos" + Element.AIR.getColor()));
sender.sendMessage(ChatColor.YELLOW + learnMore + ChatColor.DARK_AQUA + "http://tinyurl.com/qffg9m3");

1
src/com/projectkorra/projectkorra/earthbending/EarthBlast.java
View file

@ -15,6 +15,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;

2
src/com/projectkorra/projectkorra/earthbending/LavaFlow.java → src/com/projectkorra/projectkorra/earthbending/lava/LavaFlow.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.lava;
import java.util.ArrayList;
import java.util.List;

2
src/com/projectkorra/projectkorra/earthbending/LavaSurge.java → src/com/projectkorra/projectkorra/earthbending/lava/LavaSurge.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.lava;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.LavaAbility;

2
src/com/projectkorra/projectkorra/earthbending/LavaSurgeWall.java → src/com/projectkorra/projectkorra/earthbending/lava/LavaSurgeWall.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.lava;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.LavaAbility;

2
src/com/projectkorra/projectkorra/earthbending/LavaSurgeWave.java → src/com/projectkorra/projectkorra/earthbending/lava/LavaSurgeWave.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.lava;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.LavaAbility;

2
src/com/projectkorra/projectkorra/earthbending/Extraction.java → src/com/projectkorra/projectkorra/earthbending/metal/Extraction.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.metal;
import java.util.HashSet;
import java.util.Random;

2
src/com/projectkorra/projectkorra/earthbending/MetalClips.java → src/com/projectkorra/projectkorra/earthbending/metal/MetalClips.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.metal;
import java.util.ArrayList;
import java.util.Arrays;

4
src/com/projectkorra/projectkorra/earthbending/EarthPassive.java → src/com/projectkorra/projectkorra/earthbending/passive/EarthPassive.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.passive;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
@ -7,6 +7,8 @@ import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.lava.LavaSurgeWall;
import com.projectkorra.projectkorra.earthbending.lava.LavaSurgeWave;
import com.projectkorra.projectkorra.util.TempBlock;
import org.bukkit.Bukkit;

3
src/com/projectkorra/projectkorra/earthbending/SandSpout.java → src/com/projectkorra/projectkorra/earthbending/sand/SandSpout.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.sand;
import java.util.ArrayList;
import java.util.Collection;
@ -15,6 +15,7 @@ import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.SandAbility;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.Flight;

6
src/com/projectkorra/projectkorra/earthbending/EarthbendingManager.java → src/com/projectkorra/projectkorra/earthbending/util/EarthbendingManager.java
View file

@ -1,6 +1,10 @@
package com.projectkorra.projectkorra.earthbending;
package com.projectkorra.projectkorra.earthbending.util;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.earthbending.EarthTunnel;
import com.projectkorra.projectkorra.earthbending.Shockwave;
import com.projectkorra.projectkorra.earthbending.Tremorsense;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.util.RevertChecker;
import org.bukkit.Bukkit;

2
src/com/projectkorra/projectkorra/firebending/BlazeArc.java
View file

@ -2,7 +2,7 @@ package com.projectkorra.projectkorra.firebending;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.waterbending.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import org.bukkit.Location;
import org.bukkit.Material;

3
src/com/projectkorra/projectkorra/firebending/FireBlast.java
View file

@ -20,9 +20,10 @@ import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.waterbending.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
public class FireBlast extends FireAbility {

2
src/com/projectkorra/projectkorra/firebending/FireJet.java
View file

@ -2,7 +2,7 @@ package com.projectkorra.projectkorra.firebending;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.airbending.AirSpout;
import com.projectkorra.projectkorra.earthbending.SandSpout;
import com.projectkorra.projectkorra.earthbending.sand.SandSpout;
import com.projectkorra.projectkorra.util.Flight;
import com.projectkorra.projectkorra.util.ParticleEffect;

1
src/com/projectkorra/projectkorra/firebending/FireShield.java
View file

@ -16,6 +16,7 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
import com.projectkorra.projectkorra.util.ParticleEffect;
public class FireShield extends FireAbility {

6
src/com/projectkorra/projectkorra/firebending/HeatControl.java
View file

@ -26,13 +26,13 @@ import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.PhaseChange;
import com.projectkorra.projectkorra.waterbending.SurgeWave;
import com.projectkorra.projectkorra.waterbending.Torrent;
import com.projectkorra.projectkorra.waterbending.WaterArmsSpear;
import com.projectkorra.projectkorra.waterbending.WaterCombo;
import com.projectkorra.projectkorra.waterbending.WaterManipulation;
import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArmsSpear;
public class HeatControl extends FireAbility {

1
src/com/projectkorra/projectkorra/firebending/WallOfFire.java
View file

@ -14,6 +14,7 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;

4
src/com/projectkorra/projectkorra/firebending/FireCombo.java → src/com/projectkorra/projectkorra/firebending/combo/FireCombo.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.firebending;
package com.projectkorra.projectkorra.firebending.combo;
import java.util.ArrayList;
import java.util.List;
@ -25,6 +25,8 @@ import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.firebending.FireJet;
import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;

2
src/com/projectkorra/projectkorra/firebending/Combustion.java → src/com/projectkorra/projectkorra/firebending/combustion/Combustion.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.firebending;
package com.projectkorra.projectkorra.firebending.combustion;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;

2
src/com/projectkorra/projectkorra/firebending/Lightning.java → src/com/projectkorra/projectkorra/firebending/lightning/Lightning.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.firebending;
package com.projectkorra.projectkorra.firebending.lightning;
import java.util.ArrayList;
import java.util.List;

3
src/com/projectkorra/projectkorra/firebending/FirePassive.java → src/com/projectkorra/projectkorra/firebending/passive/FirePassive.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.firebending;
package com.projectkorra.projectkorra.firebending.passive;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
@ -8,6 +8,7 @@ import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.firebending.Illumination;
public class FirePassive {

3
src/com/projectkorra/projectkorra/firebending/FireDamageTimer.java → src/com/projectkorra/projectkorra/firebending/util/FireDamageTimer.java
View file

@ -1,7 +1,8 @@
package com.projectkorra.projectkorra.firebending;
package com.projectkorra.projectkorra.firebending.util;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.firebending.HeatControl;
import com.projectkorra.projectkorra.util.DamageHandler;
import org.bukkit.entity.Entity;

4
src/com/projectkorra/projectkorra/firebending/FirebendingManager.java → src/com/projectkorra/projectkorra/firebending/util/FirebendingManager.java
View file

@ -1,7 +1,9 @@
package com.projectkorra.projectkorra.firebending;
package com.projectkorra.projectkorra.firebending.util;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.firebending.BlazeArc;
import com.projectkorra.projectkorra.firebending.passive.FirePassive;
public class FirebendingManager implements Runnable {

4
src/com/projectkorra/projectkorra/util/Flight.java
View file

@ -13,10 +13,10 @@ import com.projectkorra.projectkorra.airbending.AirScooter;
import com.projectkorra.projectkorra.airbending.AirSpout;
import com.projectkorra.projectkorra.airbending.Tornado;
import com.projectkorra.projectkorra.earthbending.Catapult;
import com.projectkorra.projectkorra.earthbending.SandSpout;
import com.projectkorra.projectkorra.earthbending.sand.SandSpout;
import com.projectkorra.projectkorra.firebending.FireJet;
import com.projectkorra.projectkorra.waterbending.Bloodbending;
import com.projectkorra.projectkorra.waterbending.WaterSpout;
import com.projectkorra.projectkorra.waterbending.blood.Bloodbending;
public class Flight {

4
src/com/projectkorra/projectkorra/util/PassiveHandler.java
View file

@ -7,8 +7,8 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.airbending.AirPassive;
import com.projectkorra.projectkorra.chiblocking.ChiPassive;
import com.projectkorra.projectkorra.airbending.passive.AirPassive;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.ConfigManager;

5
src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
View file

@ -9,7 +9,10 @@ import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.PhaseChange.PhaseChangeType;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange.PhaseChangeType;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
import org.bukkit.Location;
import org.bukkit.Material;

2
src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
View file

@ -21,6 +21,8 @@ import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
public class SurgeWall extends WaterAbility {

2
src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
View file

@ -23,6 +23,8 @@ import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
public class SurgeWave extends WaterAbility {

2
src/com/projectkorra/projectkorra/waterbending/Torrent.java
View file

@ -10,6 +10,8 @@ import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
import org.bukkit.Location;
import org.bukkit.Material;

1
src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
View file

@ -3,6 +3,7 @@ package com.projectkorra.projectkorra.waterbending;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
import org.bukkit.Location;
import org.bukkit.Material;

3
src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
View file

@ -25,6 +25,9 @@ import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
public class WaterManipulation extends WaterAbility {

1
src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
View file

@ -23,6 +23,7 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
public class WaterSpoutWave extends WaterAbility {

2
src/com/projectkorra/projectkorra/waterbending/Bloodbending.java → src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.blood;
import java.util.ArrayList;
import java.util.List;

6
src/com/projectkorra/projectkorra/waterbending/WaterCombo.java → src/com/projectkorra/projectkorra/waterbending/combo/WaterCombo.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.combo;
import java.util.ArrayList;
import java.util.Collection;
@ -24,12 +24,14 @@ import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.firebending.FireCombo.FireComboStream;
import com.projectkorra.projectkorra.firebending.combo.FireCombo.FireComboStream;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;
import com.projectkorra.projectkorra.waterbending.util.WaterSourceGrabber;
/*
* TODO: Combo classes should eventually be rewritten so that each combo is

3
src/com/projectkorra/projectkorra/waterbending/HealingWaters.java → src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.healing;
import java.util.HashMap;
@ -20,6 +20,7 @@ import com.projectkorra.projectkorra.ability.HealingAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.chiblocking.Smokescreen;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
public class HealingWaters extends HealingAbility {

3
src/com/projectkorra/projectkorra/waterbending/IceBlast.java → src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.ice;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
@ -10,6 +10,7 @@ import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
import org.bukkit.Location;
import org.bukkit.Material;

4
src/com/projectkorra/projectkorra/waterbending/IceSpikeBlast.java → src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.ice;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
@ -7,6 +7,8 @@ import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
import org.bukkit.Location;
import org.bukkit.Material;

2
src/com/projectkorra/projectkorra/waterbending/IceSpikePillar.java → src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.ice;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;

2
src/com/projectkorra/projectkorra/waterbending/IceSpikePillarField.java → src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.ice;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.IceAbility;

6
src/com/projectkorra/projectkorra/waterbending/PhaseChange.java → src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.ice;
import java.util.ArrayList;
import java.util.HashMap;
@ -17,6 +17,10 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.SurgeWall;
import com.projectkorra.projectkorra.waterbending.SurgeWave;
import com.projectkorra.projectkorra.waterbending.Torrent;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArmsSpear;
public class PhaseChange extends IceAbility {

8
src/com/projectkorra/projectkorra/waterbending/WaterArms.java → src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArms.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.multiabilities;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
@ -6,11 +6,13 @@ import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.firebending.Lightning;
import com.projectkorra.projectkorra.firebending.lightning.Lightning;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.WaterArmsWhip.Whip;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArmsWhip.Whip;
import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
import org.bukkit.ChatColor;
import org.bukkit.Location;

18
src/com/projectkorra/projectkorra/waterbending/WaterArmsFreeze.java → src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsFreeze.java
View file

@ -1,12 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
import com.projectkorra.projectkorra.waterbending.WaterArms.Arm;
package com.projectkorra.projectkorra.waterbending.multiabilities;
import org.bukkit.Location;
import org.bukkit.Material;
@ -19,6 +11,14 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.IceAbility;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms.Arm;
public class WaterArmsFreeze extends IceAbility {
private boolean cancelled;

20
src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java → src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsSpear.java
View file

@ -1,10 +1,9 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.multiabilities;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.WaterArms.Arm;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Location;
import org.bukkit.Material;
@ -16,10 +15,11 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms.Arm;
public class WaterArmsSpear extends WaterAbility {

18
src/com/projectkorra/projectkorra/waterbending/WaterArmsWhip.java → src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsWhip.java
View file

@ -1,12 +1,6 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.multiabilities;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.WaterArms.Arm;
import java.util.HashMap;
import org.bukkit.Location;
import org.bukkit.Material;
@ -18,7 +12,13 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
import java.util.HashMap;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms.Arm;
public class WaterArmsWhip extends WaterAbility {

2
src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
View file

@ -8,8 +8,8 @@ import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.earthbending.EarthArmor;
import com.projectkorra.projectkorra.waterbending.WaterArms;
import com.projectkorra.projectkorra.waterbending.WaterSpout;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms;
public class FastSwim extends WaterAbility implements PassiveAbility {

2
src/com/projectkorra/projectkorra/waterbending/WaterPassive.java → src/com/projectkorra/projectkorra/waterbending/passive/WaterPassive.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.passive;
import org.bukkit.Material;
import org.bukkit.block.Block;

2
src/com/projectkorra/projectkorra/waterbending/PlantRegrowth.java → src/com/projectkorra/projectkorra/waterbending/plant/PlantRegrowth.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.plant;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.PlantAbility;

6
src/com/projectkorra/projectkorra/waterbending/WaterReturn.java → src/com/projectkorra/projectkorra/waterbending/util/WaterReturn.java
View file

@ -1,9 +1,13 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.util;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.OctopusForm;
import com.projectkorra.projectkorra.waterbending.SurgeWall;
import com.projectkorra.projectkorra.waterbending.WaterManipulation;
import com.projectkorra.projectkorra.waterbending.ice.IceSpikeBlast;
import org.bukkit.Location;
import org.bukkit.Material;

2
src/com/projectkorra/projectkorra/waterbending/WaterSourceGrabber.java → src/com/projectkorra/projectkorra/waterbending/util/WaterSourceGrabber.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.util;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;

4
src/com/projectkorra/projectkorra/waterbending/WaterbendingManager.java → src/com/projectkorra/projectkorra/waterbending/util/WaterbendingManager.java
View file

@ -1,6 +1,8 @@
package com.projectkorra.projectkorra.waterbending;
package com.projectkorra.projectkorra.waterbending.util;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.waterbending.Torrent;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms;
public class WaterbendingManager implements Runnable {