mirror of
https://github.com/TotalFreedomMC/TF-ProjectKorra.git
synced 2024-05-15 17:31:26 +00:00
9ae9c07c7e
## Additions * Added Statistics API * Added cooldown database * Added database cooldown to `AvatarState` * Added code to try a reconnect if the database connection is lost * Added a check to ensure an entity is an instance of `LivingEntity` before casting in `PKListener` * Added `FireManipulation` and Combo permissions to `plugin.yml` * Added an isBender method to `BendingPlayer` * Added a getter for the player object stored in `BendingPlayer` * Added `OFFHAND_TRIGGER` to `ClickType` * Added `ElementalAbility#getEarthbendableBlocks()`, returns String list from config * Added `GeneralMethods#getBlockFaceFromValue(int xyz, double value)` * Added `GeneralMethods#checkDiagonalWall(Location location, Vector direction)`, to determine if there is a diagonal wall * Added required variable to `ComboAbilityInfo`, Set of `CoreAbility` a `Player` must have active to use corresponding `ComboAbility` * Added `PassiveAbility#isProgressable()`, checks for if the ability uses its progress() method * Added overriding capabilities to `CollisionManager` * Added `TempArmorStand` utility class * Added new `EarthGrab` * Added new Earth combo, `EarthPillars`. * Added new `Flight` `MultiAbility` * Added a "Sticky" feature to `TremorSense` * Added “/b stats” command to display player statistics * Added `TimeUtil` to convert millisecond times into human readable increments * Added Dynamic Sourcing config option for Earth and Water * Added enable/disable option to `FireManipulation` * Added configurable duration values to `AirShield`, `AirSpout`, and `Tornado`, `WaterSpout`, `HealingWaters`, and `OctopusForm` * Added `IceBlast` and `IceSpike` blast to collisions * Added mechanics to `AirSuction` to close doors * Added configurable cooldown to “/b choose” located at “Properties.ChooseCooldown” * Added IRON_TRAPDOOR to `FerroControl` functionality * Added new config option that can prevent the Updater from connecting to the website when disabled in the config * Added more options to `AirSwipe` in `AvatarState` config portion ## Fixes * Fixed “Abilities.Chi.Smokescreen.Instructions” spelling error in `ConfigManager.java` * Fixed “Abilities.Water.Passive.HydroSink.Description” spelling error in `ConfigManager.java` * Fixed “Commands.PermaRemove.Description” spelling error in `ConfigManager.java` * Fixed “Extras.Fire.DayMessage” spelling error in `ConfigManager.java` * Fixed `QuickStrike` causing an endless chain of itself that never stops chiblocking and does no damage * Fixed `Paralyze` going indefinitely when it has a cooldown of 0 * Fixed damaging chi abilities not working in `WarriorStance` * Fixed `WarriorStance` NPE * Fixed `AcrobatStance` NPE when a user attempts to log out while the move is active * Fixed paralyzing abilities canceling the sneak event if the player was sneaking * Fixed `Passives` not being removed when a player has their bending changed * Fixed `Passives` being activated in Spectator mode * Fixed `DensityShift` softening your landing while you are an Airbender * Fixed the passives that weren't working. This includes `FerroControl`, `FastSwim`, `AirAgility` and `ChiAgility` * Fixed `MultiAbility` instances not being removed when a player has their bending changed * Fixed player binds not being filtered properly if they are using a `MultiAbility` * Fixed `FireWheel` going over air * Fixed `AvatarState` sound causing the ability to not work * Fixed bottlebending for `Surge`, `WaterManipulation`, and `OctopusForm` * Fixed `Bloodbending` ConcurrentModificationException when attempting to bend non-living entities * Fixed `PhaseChange` not working on blocks placed over already melted blocks * Fixed `IceBlast` going on cooldown after sneaking after selecting a block * Fixed `Surge` making `TempBlocks` revert * Fixed `WaterArms` grapple ability not working * Fixed `WaterArms` making `TempBlocks` revert * Fixed `WaterArmsSpear` checking if a block is placeable after placing the block * Fixed aiming bugs with `WaterArmsSpear` * Fixed `LavaFlow` causing drop duplications when cooled by another move * Fixed `EarthArmor` making people invincible * Fixed `EarthTunnel` so that it will work through tall grass and other transparent blocks * Fixed `EarthTunnel` not checking if a block it was trying to remove was in a protected region * Fixed `EarthSmash` values being incorrect * Fixed being able to remove the `EarthArmor` armor items from their slots * Fixed `EarthTunnel` not being able to be used on fallen blocks * Fixed `FireManipulation` being able to go through blocks * Fixed `FireSpin` and `FireKick` not expanding to full size when hitting an entity * Fixed `HeatControl` solidify not working on Minecraft version 1.9 * Fixed `Illumination` dropping a torch if water is placed on the user's feet via bucket * Fixed `FireCombos` not working with `AvatarState` * Fixed `FireWheel` not going down inclines * Fixed `FireWheel` insane wall climbing * Fixed `FireShield` duration * Fixed `FireWheel` not always damaging due to an invalid entity selection range * Fixed logic in `GeneralMethods#displayColoredParticle()` which caused random blips of other colors * FIxed `ClassCastException` in `PKListener.java` caused by `MetalClips` * Fixed typo in `GeneralMethods` which confused NETHER_WART_BLOCK with NETHER_STALK * Fixed permission based limit on how many Presets players can create. `bending.command.preset.create.#` * Fixed NPE in `WhoCommand` when performing offline lookups * Fixed various bad `Map#contains()` checks throughout the plugin * Fixed `BendingPlayer#addCooldown()` adding cooldowns even if their time is set to an invalid number. * Fixed the `PlayerCooldownChangeEvent` being fired on an invalid case * Fixed entity targeting methods in `GeneralMethods` registering dead players waiting to respawn as valid targets * Fixed NPE caused by checking for Lunar Eclipse, Solar Eclipse, Full Moon or Sozins Comet when not in the Overworld * Fixed `AirBlast`, `AirSweep`, `FireBlast` going through diagonal walls * Fixed known fly glitches * Fixed ability redirection breaking bottlebending for that player until server restart ## Misc. Changes * Changed instructions in “/bending help <ability>” to `ChatColor.WHITE` * Changed “/bending help earth” message to match others * Improved check for exhaustion in move event * Changed `CoreAbility#getDescription()` to pull combos from the lang config as well * Renamed `Hydrosink.java` to `HydroSink.java` * Reduced combo cleanup delay to one minute * Improved `IceSpike` blast animation * Improved code in `ProjectKorra.java` * Improved `FireShield` animation * Changed passive classes to be more functional than previously * Changed `BendingPlayer#canBendPassive()` and `BendingPlayer#canUsePassive()` to have `CoreAbility` param instead of `Element` * Changed `PassiveAbility#isInstantiable()` to be a check if the ability must be activated by the player, not if it uses the constructor * Improved `CoreAbility#progressAll()` * Improved `AirAgility` and `ChiAgility` * Changed death messages that say “experienced kinetic damage” to “experienced a fatal collision” * Changed `AirShield` to permit `AirSwipe` and `AirSweep` to pass through it * Changed `FireShield` to permit `FireBlastCharged` to pass through it * Changed `AirBlast`, `AirSuction`, `Blaze`, and `Combustion` so they do not collide with any other abilities * Changed `AirSwipe` and `AirSweep` so they can respectively pass through other instances of themselves. * Removed all active abilities for a given player when they quit the server * Changed old `EarthGrab` to `EarthDome` combo * Changed `AirSwipe` to cool lava temporarily instead of permanently * Changed “/pk” to return the “/pk help” pages * Changed `InvincibleCommand` to use `i` as an alias. “/pk i” * Changed `Preset` bind command to use branding * Changed `Preset` list command to use pages * Changed bending preview to persist while on an ability slot * Changed moves that cool lava (`AirBlast`, `AirBurst`, `AirSwipe`, `HeatControl`) so that they revert `LavaFlow` blocks * Changed `LavaFlow` click to only produce particles on blocks it has affected * Updated the `Updater` URL * Updated “/pk help <element>” to support Avatar as an argument * Updated “/pk help <element>” to prompt users to enter “/pk display <element>” instead of “/pk h <elementcombos>” * Changed `FireWheel` default range in `AvatarState` config portion * Changed `AirStream` default hold duration in `AvatarState` config portion * Changed `WaterArms` to not go through tempblocks * Changed `HealingWaters` previous duration value to “PotionDuration” in order to accurately represent what the setting changed * Increased the default number of creatable presets to 5 * Disabled FireManipulation by default ## Removals * Removed `ImportCommand` * Removed `AirSwipes` capability to break blocks * Removed metal ores (Iron, Gold, and Quartz) from the Earthbendable's list * Removed `AirPassive.java` and `WaterPassive.java`, combos are in their own respective files. * Removed redundant checks in `PKListener` * Removed redundant Earthbendable checks in `Extraction` * Removed redundant checks in `BendingPlayer` * Removed unnecessary code from `GeneralMethods#getTargetedEntity()` * Removed unnecessary SuppressWarnings for deprecation in various classes * Removed unnecessary `SpiritPlayer` checks in `BendingPlayer#canBind(CoreAbility ability)`
105 lines
3.8 KiB
Java
105 lines
3.8 KiB
Java
package com.projectkorra.projectkorra.attribute;
|
|
|
|
import java.lang.reflect.Field;
|
|
|
|
import org.bukkit.Bukkit;
|
|
|
|
import com.projectkorra.projectkorra.Element;
|
|
import com.projectkorra.projectkorra.ability.CoreAbility;
|
|
import com.projectkorra.projectkorra.attribute.AttributeModifier.AttributeModifierType;
|
|
import com.projectkorra.projectkorra.event.AttributeModifyEvent;
|
|
|
|
public class Attributes {
|
|
/**
|
|
* Modifies all abilities of the provided element for the given attribute
|
|
* and modifier
|
|
*
|
|
* @param element The type of abilities being changed. Can be a subelement.
|
|
* @param attribute What attribute to modify
|
|
* @param modifier The modifier
|
|
*/
|
|
public static void modify(final Element element, final String attribute, final AttributeModifier modifier) {
|
|
for (final CoreAbility ability : CoreAbility.getAbilitiesByElement(element)) {
|
|
modify(ability, attribute, modifier);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Modifies all the attribute of the provided ability from the given
|
|
* attribute and modifier
|
|
*
|
|
* @param ability The ability to change
|
|
* @param attribute What attribute to modify
|
|
* @param modifier The modifier
|
|
*/
|
|
public static void modify(final CoreAbility ability, final String attribute, final AttributeModifier modifier) {
|
|
if (ability.getPlayer() == null) {
|
|
for (final CoreAbility ability2 : CoreAbility.getAbilities(ability.getClass())) {
|
|
modify(ability2, attribute, modifier);
|
|
}
|
|
return;
|
|
}
|
|
|
|
for (final Field field : ability.getClass().getDeclaredFields()) {
|
|
if (field.isAnnotationPresent(Attribute.class)) {
|
|
final Attribute annotation = field.getAnnotation(Attribute.class);
|
|
String attrToTest = ability.getName() + annotation.value();
|
|
if (!annotation.attribute().equals("")) {
|
|
attrToTest = annotation.attribute();
|
|
}
|
|
|
|
if (attrToTest.equalsIgnoreCase(attribute)) {
|
|
final boolean flag = field.isAccessible();
|
|
|
|
if (!flag) {
|
|
field.setAccessible(true);
|
|
}
|
|
|
|
try {
|
|
if (field.getDeclaringClass().equals(Double.TYPE.getClass())) {
|
|
final double oldValue = field.getDouble(ability);
|
|
double newValue = modifier.getType() == AttributeModifierType.MULTIPLY ? oldValue * modifier.getModifier(ability) : oldValue + modifier.getModifier(ability);
|
|
|
|
final AttributeModifyEvent event = new AttributeModifyEvent(ability, attribute, oldValue, newValue, modifier);
|
|
Bukkit.getPluginManager().callEvent(event);
|
|
newValue = event.getNewValue();
|
|
|
|
field.setDouble(ability, newValue);
|
|
} else if (field.getDeclaringClass().equals(Long.TYPE.getClass())) {
|
|
final long oldValue = field.getLong(ability);
|
|
long newValue = (long) (modifier.getType() == AttributeModifierType.MULTIPLY ? oldValue * modifier.getModifier(ability) : oldValue + modifier.getModifier(ability));
|
|
|
|
final AttributeModifyEvent event = new AttributeModifyEvent(ability, attribute, oldValue, newValue, modifier);
|
|
Bukkit.getPluginManager().callEvent(event);
|
|
newValue = (long) event.getNewValue();
|
|
|
|
field.setLong(ability, newValue);
|
|
} else if (field.getDeclaringClass().equals(Integer.TYPE.getClass())) {
|
|
final int oldValue = field.getInt(ability);
|
|
int newValue = (int) (modifier.getType() == AttributeModifierType.MULTIPLY ? oldValue * modifier.getModifier(ability) : oldValue + modifier.getModifier(ability));
|
|
|
|
final AttributeModifyEvent event = new AttributeModifyEvent(ability, attribute, oldValue, newValue, modifier);
|
|
Bukkit.getPluginManager().callEvent(event);
|
|
newValue = (int) event.getNewValue();
|
|
|
|
field.setInt(ability, newValue);
|
|
}
|
|
|
|
}
|
|
catch (final IllegalArgumentException e) {
|
|
e.printStackTrace();
|
|
}
|
|
catch (final IllegalAccessException e) {
|
|
e.printStackTrace();
|
|
}
|
|
|
|
if (!flag) {
|
|
field.setAccessible(false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|