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

Port death messages to new config system and remove old config files

Browse source
This commit is contained in:
Alexander Meech 2019-08-17 03:24:32 -04:00
parent b0fe29f8da
commit 9661611945
266 changed files with 1049 additions and 2270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,9 +10,9 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.properties.FirePropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.properties.FirePropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
import com.projectkorra.projectkorra.util.ActionBar;

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

@ -27,8 +27,8 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.util.PassiveManager;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
import com.projectkorra.projectkorra.event.PlayerCooldownChangeEvent;
import com.projectkorra.projectkorra.event.PlayerCooldownChangeEvent.Result;

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

@ -10,8 +10,8 @@ import java.util.function.Supplier;
import org.bukkit.ChatColor;
import org.bukkit.plugin.Plugin;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.properties.ChatPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.properties.ChatPropertiesConfig;
public class Element {

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

@ -98,10 +98,10 @@ 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.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.BindCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.ChatPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.BindCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.ChatPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.earthbending.EarthBlast;
import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
import com.projectkorra.projectkorra.event.BendingPlayerCreationEvent;

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

@ -112,68 +112,69 @@ import com.projectkorra.projectkorra.chiblocking.WarriorStance;
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.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBlastConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBurstConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirScooterConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirShieldConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSpoutConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSuctionConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSwipeConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.FlightConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.SuffocateConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.TornadoConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.avatar.AvatarStateConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.AcrobatStanceConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.HighJumpConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ParalyzeConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.QuickStrikeConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.RapidPunchConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SmokescreenConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SwiftKickConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.WarriorStanceConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.CatapultConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.CollapseConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.DensityShiftConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthArmorConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthBlastConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthGrabConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthPillarsConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthSmashConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthTunnelConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.ExtractionConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.FerroControlConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.LavaFlowConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.MetalClipsConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.RaiseEarthConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.ShockwaveConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.TremorsenseConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.BlazeConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.CombustionConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBlastConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBurstConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireJetConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireManipulationConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireShieldConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.HeatControlConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.IlluminationConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.LightningConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.WallOfFireConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.BloodbendingConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.FastSwimConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.HealingWatersConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceBlastConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceSpikeConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.OctopusFormConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.PhaseChangeConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.SurgeConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.TorrentConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterArmsConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterBubbleConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterManipulationConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterSpoutConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.ChatPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBlastConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBurstConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirScooterConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirShieldConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSpoutConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSuctionConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSwipeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.FlightConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.SuffocateConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.TornadoConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.avatar.AvatarStateConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.AcrobatStanceConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.HighJumpConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ParalyzeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.QuickStrikeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.RapidPunchConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SmokescreenConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SwiftKickConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.WarriorStanceConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.CatapultConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.CollapseConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.DensityShiftConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthArmorConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthBlastConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthGrabConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthPillarsConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthSmashConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthTunnelConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.ExtractionConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.FerroControlConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.LavaFlowConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.MetalClipsConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.RaiseEarthConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.ShockwaveConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.TremorsenseConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.BlazeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.CombustionConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBlastConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBurstConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireJetConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireManipulationConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireShieldConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.HeatControlConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.IlluminationConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.LightningConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.fire.WallOfFireConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.BloodbendingConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.FastSwimConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.HealingWatersConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceBlastConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceSpikeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.OctopusFormConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.PhaseChangeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.SurgeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.TorrentConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterArmsConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterBubbleConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterManipulationConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterSpoutConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.ChatPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.earthbending.Catapult;
import com.projectkorra.projectkorra.earthbending.Collapse;
import com.projectkorra.projectkorra.earthbending.CollapseWall;
@ -250,7 +251,7 @@ import com.projectkorra.projectkorra.waterbending.passive.HydroSink;
import co.aikar.timings.lib.MCTiming;
@SuppressWarnings({ "unused", "deprecation", "rawtypes" })
@SuppressWarnings({ "unused", "deprecation", "rawtypes", "unchecked" })
public class PKListener implements Listener {
ProjectKorra plugin;
@ -1076,7 +1077,7 @@ public class PKListener implements Listener {
if (event.getEntity().getKiller() != null) {
if (BENDING_PLAYER_DEATH.containsKey(event.getEntity())) {
String message = ConfigManager.languageConfig.get().getString("DeathMessages.Default");
String message = ConfigManager.getConfig(GeneralPropertiesConfig.class).DefaultDeathMessage;
final String ability = BENDING_PLAYER_DEATH.get(event.getEntity());
final String tempAbility = ChatColor.stripColor(ability).replaceAll(" ", "");
final CoreAbility coreAbil = CoreAbility.getAbility(tempAbility);
@ -1088,25 +1089,13 @@ public class PKListener implements Listener {
}
if (HorizontalVelocityTracker.hasBeenDamagedByHorizontalVelocity(event.getEntity()) && Arrays.asList(HorizontalVelocityTracker.abils).contains(tempAbility)) {
if (ConfigManager.languageConfig.get().contains("Abilities." + element.getName() + "." + tempAbility + ".HorizontalVelocityDeath")) {
message = ConfigManager.languageConfig.get().getString("Abilities." + element.getName() + "." + tempAbility + ".HorizontalVelocityDeath");
if (coreAbil != null && ConfigManager.getConfig((Class<? extends AbilityConfig>) coreAbil.getConfigType()).HorizontalVelocityDeathMessage != null) {
message = ConfigManager.getConfig((Class<? extends AbilityConfig>) coreAbil.getConfigType()).HorizontalVelocityDeathMessage;
}
} else if (element != null) {
if (element instanceof SubElement) {
element = ((SubElement) element).getParentElement();
}
if (ConfigManager.languageConfig.get().contains("Abilities." + element.getName() + "." + tempAbility + ".DeathMessage")) {
message = ConfigManager.languageConfig.get().getString("Abilities." + element.getName() + "." + tempAbility + ".DeathMessage");
} else if (ConfigManager.languageConfig.get().contains("Abilities." + element.getName() + ".Combo." + tempAbility + ".DeathMessage")) {
message = ConfigManager.languageConfig.get().getString("Abilities." + element.getName() + ".Combo." + tempAbility + ".DeathMessage");
}
} else {
if (isAvatarAbility) {
if (ConfigManager.languageConfig.get().contains("Abilities.Avatar." + tempAbility + ".DeathMessage")) {
message = ConfigManager.languageConfig.get().getString("Abilities.Avatar." + tempAbility + ".DeathMessage");
}
} else if (ConfigManager.languageConfig.get().contains("Abilities.Avatar.Combo." + tempAbility + ".DeathMessage")) {
message = ConfigManager.languageConfig.get().getString("Abilities.Avatar.Combo." + tempAbility + ".DeathMessage");
} else if (coreAbil != null) {
AbilityConfig conf = ConfigManager.getConfig((Class<? extends AbilityConfig>) coreAbil.getConfigType());
if (conf.DeathMessage != null) {
message = conf.DeathMessage;
}
}
message = message.replace("{victim}", event.getEntity().getName()).replace("{attacker}", event.getEntity().getKiller().getName()).replace("{ability}", ability);

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

@ -22,8 +22,8 @@ import com.projectkorra.projectkorra.ability.util.PassiveManager;
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.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.earthbending.util.EarthbendingManager;
import com.projectkorra.projectkorra.firebending.util.FirebendingManager;
import com.projectkorra.projectkorra.hooks.PlaceholderAPIHook;

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

@ -13,9 +13,9 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.airbending.AirSpout;
import com.projectkorra.projectkorra.airbending.Suffocate;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.AirPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.AirPropertiesConfig;
import com.projectkorra.projectkorra.util.ParticleEffect;
public abstract class AirAbility<C extends AbilityConfig> extends ElementalAbility<C> {

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

@ -4,9 +4,9 @@ import org.bukkit.Location;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.avatar.AvatarStateConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.avatar.AvatarStateConfig;
public abstract class AvatarAbility<C extends AbilityConfig> extends ElementalAbility<C> {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class BloodAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class ChiAbility<C extends AbilityConfig> extends ElementalAbility<C> {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class CombustionAbility<C extends AbilityConfig> extends FireAbility<C> implements SubAbility {

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

@ -48,7 +48,7 @@ import com.projectkorra.projectkorra.ability.util.PassiveManager;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.attribute.AttributeModifier;
import com.projectkorra.projectkorra.attribute.AttributePriority;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.event.AbilityEndEvent;
import com.projectkorra.projectkorra.event.AbilityProgressEvent;
import com.projectkorra.projectkorra.event.AbilityStartEvent;
@ -765,6 +765,8 @@ public abstract class CoreAbility<C extends AbilityConfig> implements Ability {
public int getId() {
return this.id;
}
public abstract Class<C> getConfigType();
@Override
public boolean isHiddenAbility() {

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

@ -21,9 +21,9 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
import com.projectkorra.projectkorra.earthbending.RaiseEarth;
import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
import com.projectkorra.projectkorra.earthbending.passive.DensityShift;

8
src/com/projectkorra/projectkorra/ability/ElementalAbility.java
View file

@ -16,10 +16,10 @@ import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
/**
* ElementalAbility is used to hold methods that should be accessible by every

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

@ -17,9 +17,9 @@ import org.bukkit.inventory.ItemStack;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.FirePropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.FirePropertiesConfig;
import com.projectkorra.projectkorra.firebending.BlazeArc;
import com.projectkorra.projectkorra.util.Information;
import com.projectkorra.projectkorra.util.ParticleEffect;

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class FlightAbility<C extends AbilityConfig> extends AirAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class HealingAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class IceAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class LavaAbility<C extends AbilityConfig> extends EarthAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class LightningAbility<C extends AbilityConfig> extends FireAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class MetalAbility<C extends AbilityConfig> extends EarthAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class PlantAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class SandAbility<C extends AbilityConfig> extends EarthAbility<C> implements SubAbility {

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

@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public abstract class SpiritualAbility<C extends AbilityConfig> extends AirAbility<C> implements SubAbility {

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

@ -17,9 +17,9 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
import com.projectkorra.projectkorra.firebending.HeatControl;
import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ParticleEffect;

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

@ -15,8 +15,8 @@ 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.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthDomeConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthDomeConfig;
import com.projectkorra.projectkorra.earthbending.combo.EarthDomeOthers;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.ReflectionHandler;

9
src/com/projectkorra/projectkorra/airbending/AirBlast.java
View file

@ -29,8 +29,8 @@ import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBlastConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBlastConfig;
import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
import com.projectkorra.projectkorra.util.DamageHandler;
@ -650,5 +650,10 @@ public class AirBlast extends AirAbility<AirBlastConfig> {
public static double getSelectRange() {
return ConfigManager.getConfig(AirBlastConfig.class).SelectionRange;
}
@Override
public Class<AirBlastConfig> getConfigType() {
return AirBlastConfig.class;
}
}

11
src/com/projectkorra/projectkorra/airbending/AirBurst.java
View file

@ -12,9 +12,9 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBlastConfig;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBurstConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBlastConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBurstConfig;
public class AirBurst extends AirAbility<AirBurstConfig> {
@ -328,4 +328,9 @@ public class AirBurst extends AirAbility<AirBurstConfig> {
public ArrayList<Entity> getAffectedEntities() {
return this.affectedEntities;
}
@Override
public Class<AirBurstConfig> getConfigType() {
return AirBurstConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/AirScooter.java
View file

@ -18,7 +18,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirScooterConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirScooterConfig;
public class AirScooter extends AirAbility<AirScooterConfig> {
@ -326,4 +326,9 @@ public class AirScooter extends AirAbility<AirScooterConfig> {
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<AirScooterConfig> getConfigType() {
return AirScooterConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/AirShield.java
View file

@ -18,7 +18,7 @@ import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirShieldConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirShieldConfig;
public class AirShield extends AirAbility<AirShieldConfig> {
@ -286,4 +286,9 @@ public class AirShield extends AirAbility<AirShieldConfig> {
public HashMap<Integer, Integer> getAngles() {
return this.angles;
}
@Override
public Class<AirShieldConfig> getConfigType() {
return AirShieldConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/AirSpout.java
View file

@ -14,7 +14,7 @@ import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSpoutConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSpoutConfig;
public class AirSpout extends AirAbility<AirSpoutConfig> {
@ -279,5 +279,10 @@ public class AirSpout extends AirAbility<AirSpoutConfig> {
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<AirSpoutConfig> getConfigType() {
return AirSpoutConfig.class;
}
}

9
src/com/projectkorra/projectkorra/airbending/AirSuction.java
View file

@ -23,8 +23,8 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSuctionConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSuctionConfig;
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
import com.projectkorra.projectkorra.waterbending.WaterSpout;
@ -410,5 +410,10 @@ public class AirSuction extends AirAbility<AirSuctionConfig> {
public static double getSelectRange() {
return ConfigManager.getConfig(AirSuctionConfig.class).SelectionRange;
}
@Override
public Class<AirSuctionConfig> getConfigType() {
return AirSuctionConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/AirSwipe.java
View file

@ -24,7 +24,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSwipeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSwipeConfig;
import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
@ -451,5 +451,10 @@ public class AirSwipe extends AirAbility<AirSwipeConfig> {
public void setArcIncrement(final int arcIncrement) {
this.arcIncrement = arcIncrement;
}
@Override
public Class<AirSwipeConfig> getConfigType() {
return AirSwipeConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/Suffocate.java
View file

@ -15,7 +15,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.SuffocateConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.SuffocateConfig;
import com.projectkorra.projectkorra.util.DamageHandler;
/**
@ -647,4 +647,9 @@ public class Suffocate extends AirAbility<SuffocateConfig> {
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<SuffocateConfig> getConfigType() {
return SuffocateConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/Tornado.java
View file

@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.TornadoConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.TornadoConfig;
public class Tornado extends AirAbility<TornadoConfig> {
@ -323,4 +323,9 @@ public class Tornado extends AirAbility<TornadoConfig> {
public Map<Integer, Integer> getAngles() {
return this.angles;
}
@Override
public Class<TornadoConfig> getConfigType() {
return TornadoConfig.class;
}
}

9
src/com/projectkorra/projectkorra/airbending/combo/AirStream.java
View file

@ -15,8 +15,8 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirStreamConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirStreamConfig;
import com.projectkorra.projectkorra.util.ClickType;
public class AirStream extends AirAbility<AirStreamConfig> implements ComboAbility {
@ -301,4 +301,9 @@ public class AirStream extends AirAbility<AirStreamConfig> implements ComboAbili
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<AirStreamConfig> getConfigType() {
return AirStreamConfig.class;
}
}

9
src/com/projectkorra/projectkorra/airbending/combo/AirSweep.java
View file

@ -18,8 +18,8 @@ import com.projectkorra.projectkorra.ability.util.Collision;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSweepConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSweepConfig;
import com.projectkorra.projectkorra.firebending.combo.FireComboStream;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
@ -340,4 +340,9 @@ public class AirSweep extends AirAbility<AirSweepConfig> implements ComboAbility
public void setTasks(final ArrayList<BukkitRunnable> tasks) {
this.tasks = tasks;
}
@Override
public Class<AirSweepConfig> getConfigType() {
return AirSweepConfig.class;
}
}

9
src/com/projectkorra/projectkorra/airbending/combo/Twister.java
View file

@ -14,8 +14,8 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.TwisterConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.TwisterConfig;
import com.projectkorra.projectkorra.util.ClickType;
public class Twister extends AirAbility<TwisterConfig> implements ComboAbility {
@ -194,4 +194,9 @@ public class Twister extends AirAbility<TwisterConfig> implements ComboAbility {
twister.add(new AbilityInformation("AirBlast", ClickType.LEFT_CLICK));
return twister;
}
@Override
public Class<TwisterConfig> getConfigType() {
return TwisterConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/flight/FlightMultiAbility.java
View file

@ -27,7 +27,7 @@ import com.projectkorra.projectkorra.ability.util.MultiAbilityManager.MultiAbili
import com.projectkorra.projectkorra.airbending.AirScooter;
import com.projectkorra.projectkorra.airbending.AirSpout;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.FlightConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.FlightConfig;
import com.projectkorra.projectkorra.firebending.FireJet;
import com.projectkorra.projectkorra.util.ActionBar;
import com.projectkorra.projectkorra.util.DamageHandler;
@ -394,4 +394,9 @@ public class FlightMultiAbility extends FlightAbility<FlightConfig> implements M
}
return false;
}
@Override
public Class<FlightConfig> getConfigType() {
return FlightConfig.class;
}
}

8
src/com/projectkorra/projectkorra/airbending/passive/AirAgility.java
View file

@ -8,7 +8,7 @@ import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirAgilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirAgilityConfig;
public class AirAgility extends AirAbility<AirAgilityConfig> implements PassiveAbility {
@ -86,5 +86,9 @@ public class AirAgility extends AirAbility<AirAgilityConfig> implements PassiveA
public int getSpeedPower() {
return this.speedPower;
}
@Override
public Class<AirAgilityConfig> getConfigType() {
return AirAgilityConfig.class;
}
}

9
src/com/projectkorra/projectkorra/airbending/passive/AirSaturation.java
View file

@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSaturationConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSaturationConfig;
public class AirSaturation extends AirAbility<AirSaturationConfig> implements PassiveAbility {
public AirSaturation(final AirSaturationConfig config, final Player player) {
@ -54,4 +54,9 @@ public class AirSaturation extends AirAbility<AirSaturationConfig> implements Pa
public boolean isProgressable() {
return false;
}
@Override
public Class<AirSaturationConfig> getConfigType() {
return AirSaturationConfig.class;
}
}

7
src/com/projectkorra/projectkorra/airbending/passive/GracefulDescent.java
View file

@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.GracefulDescentConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.air.GracefulDescentConfig;
public class GracefulDescent extends AirAbility<GracefulDescentConfig> implements PassiveAbility {
@ -52,4 +52,9 @@ public class GracefulDescent extends AirAbility<GracefulDescentConfig> implement
public boolean isProgressable() {
return false;
}
@Override
public Class<GracefulDescentConfig> getConfigType() {
return GracefulDescentConfig.class;
}
}

9
src/com/projectkorra/projectkorra/avatar/AvatarState.java
View file

@ -9,8 +9,8 @@ import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.ability.AvatarAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.avatar.AvatarStateConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.avatar.AvatarStateConfig;
public class AvatarState extends AvatarAbility<AvatarStateConfig> {
@ -221,5 +221,10 @@ public class AvatarState extends AvatarAbility<AvatarStateConfig> {
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<AvatarStateConfig> getConfigType() {
return AvatarStateConfig.class;
}
}

7
src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
View file

@ -10,7 +10,7 @@ import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.AcrobatStanceConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.AcrobatStanceConfig;
@SuppressWarnings("rawtypes")
public class AcrobatStance extends ChiAbility<AcrobatStanceConfig> {
@ -147,5 +147,10 @@ public class AcrobatStance extends ChiAbility<AcrobatStanceConfig> {
public void setParalyzeDodgeBoost(final double paralyzeDodgeBoost) {
this.paralyzeDodgeBoost = paralyzeDodgeBoost;
}
@Override
public Class<AcrobatStanceConfig> getConfigType() {
return AcrobatStanceConfig.class;
}
}

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

@ -8,7 +8,7 @@ import org.bukkit.util.Vector;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.HighJumpConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.HighJumpConfig;
import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArmsWhip;
public class HighJump extends ChiAbility<HighJumpConfig> {
@ -90,5 +90,10 @@ public class HighJump extends ChiAbility<HighJumpConfig> {
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<HighJumpConfig> getConfigType() {
return HighJumpConfig.class;
}
}

7
src/com/projectkorra/projectkorra/chiblocking/Paralyze.java
View file

@ -13,7 +13,7 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.airbending.Suffocate;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ParalyzeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ParalyzeConfig;
import com.projectkorra.projectkorra.util.MovementHandler;
public class Paralyze extends ChiAbility<ParalyzeConfig> {
@ -104,4 +104,9 @@ public class Paralyze extends ChiAbility<ParalyzeConfig> {
public long getDuration() {
return this.duration;
}
@Override
public Class<ParalyzeConfig> getConfigType() {
return ParalyzeConfig.class;
}
}

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

@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.QuickStrikeConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.QuickStrikeConfig;
import com.projectkorra.projectkorra.util.DamageHandler;
public class QuickStrike extends ChiAbility<QuickStrikeConfig> {
@ -105,4 +105,9 @@ public class QuickStrike extends ChiAbility<QuickStrikeConfig> {
public void setTarget(final Entity target) {
this.target = target;
}
@Override
public Class<QuickStrikeConfig> getConfigType() {
return QuickStrikeConfig.class;
}
}

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

@ -9,7 +9,7 @@ import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.airbending.Suffocate;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.RapidPunchConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.RapidPunchConfig;
import com.projectkorra.projectkorra.util.DamageHandler;
public class RapidPunch extends ChiAbility<RapidPunchConfig> {
@ -125,5 +125,10 @@ public class RapidPunch extends ChiAbility<RapidPunchConfig> {
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<RapidPunchConfig> getConfigType() {
return RapidPunchConfig.class;
}
}

7
src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java
View file

@ -14,7 +14,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SmokescreenConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SmokescreenConfig;
import com.projectkorra.projectkorra.util.ParticleEffect;
public class Smokescreen extends ChiAbility<SmokescreenConfig> {
@ -152,5 +152,10 @@ public class Smokescreen extends ChiAbility<SmokescreenConfig> {
public static Map<String, Smokescreen> getBlindedToAbility() {
return BLINDED_TO_ABILITY;
}
@Override
public Class<SmokescreenConfig> getConfigType() {
return SmokescreenConfig.class;
}
}

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

@ -8,7 +8,7 @@ import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SwiftKickConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SwiftKickConfig;
import com.projectkorra.projectkorra.util.DamageHandler;
public class SwiftKick extends ChiAbility<SwiftKickConfig> {
@ -103,5 +103,10 @@ public class SwiftKick extends ChiAbility<SwiftKickConfig> {
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<SwiftKickConfig> getConfigType() {
return SwiftKickConfig.class;
}
}

7
src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
View file

@ -10,7 +10,7 @@ import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.WarriorStanceConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.WarriorStanceConfig;
@SuppressWarnings("rawtypes")
public class WarriorStance extends ChiAbility<WarriorStanceConfig> {
@ -127,5 +127,10 @@ public class WarriorStance extends ChiAbility<WarriorStanceConfig> {
public void setDuration(final long duration) {
this.duration = duration;
}
@Override
public Class<WarriorStanceConfig> getConfigType() {
return WarriorStanceConfig.class;
}
}

9
src/com/projectkorra/projectkorra/chiblocking/combo/Immobilize.java
View file

@ -15,8 +15,8 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ImmobilizeConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ImmobilizeConfig;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.MovementHandler;
@ -123,4 +123,9 @@ public class Immobilize extends ChiAbility<ImmobilizeConfig> implements ComboAbi
public void setCooldown(final long cooldown) {
this.cooldown = cooldown;
}
@Override
public Class<ImmobilizeConfig> getConfigType() {
return ImmobilizeConfig.class;
}
}

9
src/com/projectkorra/projectkorra/chiblocking/passive/Acrobatics.java
View file

@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.AcrobaticsConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.AcrobaticsConfig;
public class Acrobatics extends ChiAbility<AcrobaticsConfig> implements PassiveAbility {
public Acrobatics(final AcrobaticsConfig config, final Player player) {
@ -54,4 +54,9 @@ public class Acrobatics extends ChiAbility<AcrobaticsConfig> implements PassiveA
public boolean isProgressable() {
return false;
}
@Override
public Class<AcrobaticsConfig> getConfigType() {
return AcrobaticsConfig.class;
}
}

7
src/com/projectkorra/projectkorra/chiblocking/passive/ChiAgility.java
View file

@ -8,7 +8,7 @@ import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ChiAgilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ChiAgilityConfig;
public class ChiAgility extends ChiAbility<ChiAgilityConfig> implements PassiveAbility {
@ -86,5 +86,10 @@ public class ChiAgility extends ChiAbility<ChiAgilityConfig> implements PassiveA
public int getSpeedPower() {
return this.speedPower;
}
@Override
public Class<ChiAgilityConfig> getConfigType() {
return ChiAgilityConfig.class;
}
}

4
src/com/projectkorra/projectkorra/chiblocking/passive/ChiPassive.java
View file

@ -13,8 +13,8 @@ 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.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.properties.ChiPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.properties.ChiPropertiesConfig;
import com.projectkorra.projectkorra.util.ActionBar;
@SuppressWarnings("rawtypes")

9
src/com/projectkorra/projectkorra/chiblocking/passive/ChiSaturation.java
View file

@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ChiSaturationConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ChiSaturationConfig;
public class ChiSaturation extends ChiAbility<ChiSaturationConfig> implements PassiveAbility {
public ChiSaturation(final ChiSaturationConfig config, final Player player) {
@ -54,4 +54,9 @@ public class ChiSaturation extends ChiAbility<ChiSaturationConfig> implements Pa
public boolean isProgressable() {
return false;
}
@Override
public Class<ChiSaturationConfig> getConfigType() {
return ChiSaturationConfig.class;
}
}

6
src/com/projectkorra/projectkorra/command/AddCommand.java
View file

@ -12,10 +12,10 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.AddCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.AddCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;

2
src/com/projectkorra/projectkorra/command/BindCommand.java
View file

@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.configuration.better.configs.commands.BindCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.BindCommandConfig;
/**
* Executor for /bending bind. Extends {@link PKCommand}.

2
src/com/projectkorra/projectkorra/command/CheckCommand.java
View file

@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.configuration.better.configs.commands.CheckCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.CheckCommandConfig;
/**
* Executor for /bending check. Extends {@link PKCommand}.

8
src/com/projectkorra/projectkorra/command/ChooseCommand.java
View file

@ -12,12 +12,12 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.ChooseCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ChooseCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;

2
src/com/projectkorra/projectkorra/command/ClearCommand.java
View file

@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ClearCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.ClearCommandConfig;
/**
* Executor for /bending clear. Extends {@link PKCommand}.

38
src/com/projectkorra/projectkorra/command/Commands.java
View file

@ -10,25 +10,25 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.PluginCommand;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.AddCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.BindCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.CheckCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ChooseCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ClearCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.CopyCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.DebugCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.DisplayCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.HelpCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.InvincibleCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.PermaremoveCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.PresetCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ReloadCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.RemoveCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.StatsCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ToggleCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.VersionCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.commands.WhoCommandConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.AddCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.BindCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.CheckCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.ChooseCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.ClearCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.CopyCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.DebugCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.DisplayCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.HelpCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.InvincibleCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.PermaremoveCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.PresetCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.ReloadCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.RemoveCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.StatsCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.ToggleCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.VersionCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.WhoCommandConfig;
@SuppressWarnings({ "rawtypes", "unchecked" })
public class Commands {

6
src/com/projectkorra/projectkorra/command/CopyCommand.java
View file

@ -13,9 +13,9 @@ import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.CopyCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.CopyCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
@SuppressWarnings({ "rawtypes", "unchecked" })
public class CopyCommand extends PKCommand<CopyCommandConfig> {

2
src/com/projectkorra/projectkorra/command/DebugCommand.java
View file

@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.configs.commands.DebugCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.DebugCommandConfig;
/**
* Executor for /bending debug. Extends {@link PKCommand}.

6
src/com/projectkorra/projectkorra/command/DisplayCommand.java
View file

@ -20,9 +20,9 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.SubAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.ability.util.PassiveManager;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.DisplayCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.DisplayCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
/**
* Executor for /bending display. Extends {@link PKCommand}.

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

@ -16,14 +16,14 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.HelpCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.AirPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.AvatarPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.ChiPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.FirePropertiesConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.HelpCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.AirPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.AvatarPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.ChiPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.FirePropertiesConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
/**
* Executor for /bending help. Extends {@link PKCommand}.

2
src/com/projectkorra/projectkorra/command/InvincibleCommand.java
View file

@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.configs.commands.InvincibleCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.InvincibleCommandConfig;
/**
* Executor for /bending invincible. Extends {@link PKCommand}.

6
src/com/projectkorra/projectkorra/command/PKCommand.java
View file

@ -14,9 +14,9 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.CommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.CommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
/**
* Abstract representation of a command executor. Implements {@link SubCommand}.

2
src/com/projectkorra/projectkorra/command/PermaremoveCommand.java
View file

@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.configs.commands.PermaremoveCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.PermaremoveCommandConfig;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;

6
src/com/projectkorra/projectkorra/command/PresetCommand.java
View file

@ -12,9 +12,9 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
import com.projectkorra.projectkorra.configuration.better.ConfigManager;
import com.projectkorra.projectkorra.configuration.better.configs.commands.PresetCommandConfig;
import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.configuration.configs.commands.PresetCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
import com.projectkorra.projectkorra.object.Preset;
/**

2
src/com/projectkorra/projectkorra/command/ReloadCommand.java
View file

@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ReloadCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.ReloadCommandConfig;
/**
* Executor for /bending reload. Extends {@link PKCommand}.

2
src/com/projectkorra/projectkorra/command/RemoveCommand.java
View file

@ -11,8 +11,8 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.configuration.configs.commands.RemoveCommandConfig;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.configs.commands.RemoveCommandConfig;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;

2
src/com/projectkorra/projectkorra/command/StatsCommand.java
View file

@ -20,7 +20,7 @@ import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.configuration.better.configs.commands.StatsCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.StatsCommandConfig;
import com.projectkorra.projectkorra.storage.DBConnection;
import com.projectkorra.projectkorra.util.Statistic;
import com.projectkorra.projectkorra.util.StatisticsMethods;

2
src/com/projectkorra/projectkorra/command/SubCommand.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import org.bukkit.command.CommandSender;
import com.projectkorra.projectkorra.configuration.better.configs.commands.CommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.CommandConfig;
/**
* Interface representation of a command executor.

2
src/com/projectkorra/projectkorra/command/ToggleCommand.java
View file

@ -12,8 +12,8 @@ import org.bukkit.entity.Player;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.configuration.configs.commands.ToggleCommandConfig;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.better.configs.commands.ToggleCommandConfig;
/**
* Executor for /bending toggle. Extends {@link PKCommand}.

2
src/com/projectkorra/projectkorra/command/VersionCommand.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.configuration.better.configs.commands.VersionCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.VersionCommandConfig;
/**
* Executor for /bending version. Extends {@link PKCommand}.

2
src/com/projectkorra/projectkorra/command/WhoCommand.java
View file

@ -29,7 +29,7 @@ import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.configuration.better.configs.commands.WhoCommandConfig;
import com.projectkorra.projectkorra.configuration.configs.commands.WhoCommandConfig;
/**
* Executor for /bending who. Extends {@link PKCommand}.

2
src/com/projectkorra/projectkorra/configuration/better/Config.java → src/com/projectkorra/projectkorra/configuration/Config.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.configuration.better;
package com.projectkorra.projectkorra.configuration;
public interface Config {

2
src/com/projectkorra/projectkorra/configuration/better/ConfigManager.java → src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.configuration.better;
package com.projectkorra.projectkorra.configuration;
import java.io.BufferedReader;
import java.io.BufferedWriter;

95
src/com/projectkorra/projectkorra/configuration/OldConfig.java
View file

@ -1,95 +0,0 @@
package com.projectkorra.projectkorra.configuration;
import java.io.File;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import com.projectkorra.projectkorra.ProjectKorra;
/**
* A config utility class for Project Korra. To get the config itself use
* {@link #get()}.
*/
public class OldConfig {
private final ProjectKorra plugin;
private final File file;
private final FileConfiguration config;
/**
* Creates a new {@link Config} with the file being the configuration file.
*
* @param file The file to create/load
*/
public OldConfig(final File file) {
this.plugin = ProjectKorra.plugin;
this.file = new File(this.plugin.getDataFolder() + File.separator + file);
this.config = YamlConfiguration.loadConfiguration(this.file);
this.reload();
}
/**
* Creates a file for the {@link FileConfiguration} object. If there are
* missing folders, this method will try to create them before create a file
* for the config.
*/
public void create() {
if (!this.file.getParentFile().exists()) {
try {
this.file.getParentFile().mkdir();
this.plugin.getLogger().info("Generating new directory for " + this.file.getName() + "!");
} catch (final Exception e) {
this.plugin.getLogger().info("Failed to generate directory!");
e.printStackTrace();
}
}
if (!this.file.exists()) {
try {
this.file.createNewFile();
this.plugin.getLogger().info("Generating new " + this.file.getName() + "!");
} catch (final Exception e) {
this.plugin.getLogger().info("Failed to generate " + this.file.getName() + "!");
e.printStackTrace();
}
}
}
/**
* Gets the {@link FileConfiguration} object from the {@link Config}.
*
* @return the file configuration object
*/
public FileConfiguration get() {
return this.config;
}
/**
* Reloads the {@link FileConfiguration} object. If the config object does
* not exist it will run {@link #create()} first before loading the config.
*/
public void reload() {
this.create();
try {
this.config.load(this.file);
} catch (final Exception e) {
e.printStackTrace();
}
}
/**
* Saves the {@link FileConfiguration} object.
* {@code config.options().copyDefaults(true)} is called before saving the
* config.
*/
public void save() {
try {
this.config.options().copyDefaults(true);
this.config.save(this.file);
} catch (final Exception e) {
e.printStackTrace();
}
}
}

1555
src/com/projectkorra/projectkorra/configuration/OldConfigManager.java
View file

File diff suppressed because it is too large Load diff

50
src/com/projectkorra/projectkorra/configuration/OldConfigType.java
View file

@ -1,50 +0,0 @@
package com.projectkorra.projectkorra.configuration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
public class OldConfigType {
private static final HashMap<String, ConfigType> ALL_TYPES = new HashMap<>();
public static final ConfigType DEFAULT = new ConfigType("Default");
public static final ConfigType PRESETS = new ConfigType("Presets");
public static final ConfigType LANGUAGE = new ConfigType("Language");
public static final ConfigType[] CORE_TYPES = { DEFAULT, PRESETS, LANGUAGE };
private final String string;
public OldConfigType(final String string) {
this.string = string;
ALL_TYPES.put(string, this);
}
public static List<ConfigType> addonValues() {
final List<ConfigType> values = new ArrayList<>();
for (final String key : ALL_TYPES.keySet()) {
if (!Arrays.asList(CORE_TYPES).contains(ALL_TYPES.get(key))) {
values.add(ALL_TYPES.get(key));
}
}
return values;
}
public static List<ConfigType> coreValues() {
return Arrays.asList(CORE_TYPES);
}
@Override
public String toString() {
return this.string;
}
public static List<ConfigType> values() {
final List<ConfigType> values = new ArrayList<>();
for (final String key : ALL_TYPES.keySet()) {
values.add(ALL_TYPES.get(key));
}
return values;
}
}

17
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/AbilityConfig.java
View file

@ -1,17 +0,0 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities;
import com.projectkorra.projectkorra.configuration.better.Config;
public abstract class AbilityConfig implements Config {
public final boolean Enabled;
public final String Description;
public final String Instructions;
public AbilityConfig(boolean enabled, String description, String instructions) {
Enabled = enabled;
Description = description;
Instructions = instructions;
}
}

26
src/com/projectkorra/projectkorra/configuration/configs/abilities/AbilityConfig.java Normal file
View file

@ -0,0 +1,26 @@
package com.projectkorra.projectkorra.configuration.configs.abilities;
import com.projectkorra.projectkorra.configuration.Config;
public abstract class AbilityConfig implements Config {
public final boolean Enabled;
public final String Description;
public final String Instructions;
public final String DeathMessage;
public final String HorizontalVelocityDeathMessage;
public AbilityConfig(boolean enabled, String description, String instructions, String deathMessage, String horizontalVelocityDeathMessage) {
Enabled = enabled;
Description = description;
Instructions = instructions;
DeathMessage = deathMessage;
HorizontalVelocityDeathMessage = horizontalVelocityDeathMessage;
}
public AbilityConfig(boolean enabled, String description, String instructions) {
this(enabled, description, instructions, null, null);
}
}

2
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/EmptyAbilityConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/EmptyAbilityConfig.java
View file

@ -1,4 +1,4 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities;
package com.projectkorra.projectkorra.configuration.configs.abilities;
public class EmptyAbilityConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirAgilityConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirAgilityConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBlastConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirBlastConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBurstConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirBurstConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSaturationConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirSaturationConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirScooterConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirScooterConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirShieldConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirShieldConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSpoutConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirSpoutConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirStreamConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirStreamConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSuctionConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirSuctionConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSweepConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirSweepConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSwipeConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class AirSwipeConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/FlightConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class FlightConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/GracefulDescentConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/GracefulDescentConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class GracefulDescentConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/SuffocateConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class SuffocateConfig extends AbilityConfig {

4
src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/TornadoConfig.java → src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java
View file

@ -1,6 +1,6 @@
package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
package com.projectkorra.projectkorra.configuration.configs.abilities.air;
import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
public class TornadoConfig extends AbilityConfig {

Some files were not shown because too many files have changed in this diff Show more