Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Simplicitee
Simplicitee committed Dec 31, 2019
1 parent 5d9638b commit 96e3f25
Show file tree
Hide file tree
Showing 33 changed files with 305 additions and 65 deletions.
2 changes: 1 addition & 1 deletion src/me/simplicitee/project/addons/MainListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public void onEntityChangeBlock(EntityChangeBlockEvent event) {
EarthKick.removeBlock(fb);
} else if (MagmaSlap.isBlock(fb)) {
event.setCancelled(true);
((MagmaSlap) fb.getMetadata("lavaflux").get(0).value()).turnToTempBlock(event.getBlock());
((MagmaSlap) fb.getMetadata("magmaslap").get(0).value()).turnToTempBlock(event.getBlock());
} else if (fb.hasMetadata("earthring")) {
event.setCancelled(true);
} else if (fb.hasMetadata("lavasurge")) {
Expand Down
11 changes: 9 additions & 2 deletions src/me/simplicitee/project/addons/ability/air/GaleGust.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,27 @@
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
import com.projectkorra.projectkorra.util.DamageHandler;

import me.simplicitee.project.addons.ProjectAddons;

public class GaleGust extends AirAbility implements AddonAbility {

private Location current;
@Attribute(Attribute.COOLDOWN)
private long cooldown;
private Vector direction;
@Attribute(Attribute.KNOCKBACK)
private double knockback;
@Attribute(Attribute.RADIUS)
private double radius;
@Attribute(Attribute.DAMAGE)
private double damage;
@Attribute(Attribute.RANGE)
private double range;

private Location current;
private Vector direction;
private Set<Point> points;

public GaleGust(Player player) {
Expand Down
4 changes: 4 additions & 0 deletions src/me/simplicitee/project/addons/ability/air/Tailwind.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;

import me.simplicitee.project.addons.ProjectAddons;

public class Tailwind extends AirAbility implements ComboAbility, AddonAbility {

@Attribute(Attribute.COOLDOWN)
private long cooldown;
@Attribute(Attribute.DURATION)
private long duration;
@Attribute(Attribute.SPEED)
private int speed;

public Tailwind(Player player) {
Expand Down
4 changes: 4 additions & 0 deletions src/me/simplicitee/project/addons/ability/air/Zephyr.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ParticleEffect;

import me.simplicitee.project.addons.ProjectAddons;

public class Zephyr extends AirAbility implements AddonAbility {

@Attribute(Attribute.RADIUS)
private double radius;
@Attribute(Attribute.COOLDOWN)
private long cooldown;

private int angle;

public Zephyr(Player player) {
Expand Down
41 changes: 24 additions & 17 deletions src/me/simplicitee/project/addons/ability/avatar/EnergyBeam.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.AvatarAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;

Expand All @@ -27,30 +28,36 @@ public class EnergyBeam extends AvatarAbility implements AddonAbility{

public static Map<UUID, EnergyColor> colors = new HashMap<>();

private Map<Location, Vector> map;
private Map<Location, Integer> ranges;
@Attribute(Attribute.DAMAGE)
private double damage;
@Attribute(Attribute.RANGE)
private int range;
private long cooldown, duration;
private EnergyColor color;
@Attribute(Attribute.COOLDOWN)
private long cooldown;
@Attribute(Attribute.DURATION)
private long duration;
@Attribute("EasterEgg")
private boolean effects;

private Map<Location, Vector> map;
private Map<Location, Integer> ranges;
private EnergyColor color;

public static enum EnergyColor {
WHITE("#ffffff"),
BLACK("#000000"),
RED("#ff5252"),
BLUE("#0111ff"),
GREEN("#229965"),
PURPLE("#c606ff"),
YELLOW("#c6c600"),
ORANGE("#ffa500"),
INDIGO("#0a0082"),
BROWN("#d2691e"),
PINK("#e77aea"),
WHITE("ffffff"),
BLACK("000000"),
RED("ff5252"),
BLUE("0111ff"),
GREEN("229965"),
PURPLE("c606ff"),
YELLOW("c6c600"),
ORANGE("ffa500"),
INDIGO("0a0082"),
BROWN("d2691e"),
PINK("e77aea"),
AQUA("00FFFF"),
GRAY("647687"),

RAINBOW("#abcdef");
RAINBOW("abcdef");

private String hex;
private EnergyColor(String hex) {
Expand Down
10 changes: 8 additions & 2 deletions src/me/simplicitee/project/addons/ability/chi/ChiblockJab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,20 @@
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.ParticleEffect;

import me.simplicitee.project.addons.ProjectAddons;

public class ChiblockJab extends ChiAbility implements ComboAbility, AddonAbility{

private Player attacked;
@Attribute(Attribute.DURATION)
private long duration;
@Attribute(Attribute.COOLDOWN)
private long cooldown;

private Player attacked;
private BendingPlayer bp;

public ChiblockJab(Player player) {
Expand All @@ -35,6 +40,7 @@ public ChiblockJab(Player player) {
}

duration = ProjectAddons.instance.getConfig().getLong("Combos.Chi.ChiblockJab.Duration");
cooldown = ProjectAddons.instance.getConfig().getLong("Combos.Chi.ChiblockJab.Cooldown");

if (attacked != null) {
bp = BendingPlayer.getBendingPlayer(attacked);
Expand All @@ -48,7 +54,7 @@ public ChiblockJab(Player player) {

@Override
public long getCooldown() {
return ProjectAddons.instance.getConfig().getLong("Combos.Chi.ChiblockJab.Cooldown");
return cooldown;
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions src/me/simplicitee/project/addons/ability/chi/Dodging.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.PassiveAbility;
import com.projectkorra.projectkorra.attribute.Attribute;

import me.simplicitee.project.addons.ProjectAddons;

public class Dodging extends ChiAbility implements AddonAbility, PassiveAbility {

@Attribute("Chance")
private double chance;

public Dodging(Player player) {
Expand Down
8 changes: 7 additions & 1 deletion src/me/simplicitee/project/addons/ability/chi/FlyingKick.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
Expand All @@ -22,8 +23,12 @@

public class FlyingKick extends ChiAbility implements ComboAbility, AddonAbility{

@Attribute("LaunchPower")
private double launch;
@Attribute(Attribute.DAMAGE)
private double damage;
@Attribute(Attribute.COOLDOWN)
private long cooldown;

public FlyingKick(Player player) {
super(player);
Expand All @@ -46,14 +51,15 @@ public FlyingKick(Player player) {

launch = ProjectAddons.instance.getConfig().getDouble("Combos.Chi.FlyingKick.LaunchPower");
damage = ProjectAddons.instance.getConfig().getDouble("Combos.Chi.FlyingKick.Damage");
cooldown = ProjectAddons.instance.getConfig().getLong("Combos.Chi.FlyingKick.Cooldown");
Vector v = player.getLocation().getDirection().add(new Vector(0, 0.25485, 0)).normalize().multiply(launch);
player.setVelocity(v);
start();
}

@Override
public long getCooldown() {
return ProjectAddons.instance.getConfig().getLong("Combos.Chi.FlyingKick.Cooldown");
return cooldown;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/me/simplicitee/project/addons/ability/chi/Jab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;

Expand All @@ -18,9 +19,12 @@ public static enum JabHand {
RIGHT, LEFT;
}

private int uses = 0;
@Attribute(Attribute.COOLDOWN)
private long cooldown;
@Attribute("MaxUses")
private int maxUses;

private int uses = 0;

public Jab(Player player, Entity entity, JabHand hand) {
super(player);
Expand Down
10 changes: 8 additions & 2 deletions src/me/simplicitee/project/addons/ability/chi/NinjaStance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,23 @@
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.attribute.Attribute;

import me.simplicitee.project.addons.ProjectAddons;

public class NinjaStance extends ChiAbility implements AddonAbility{

@Attribute(Attribute.DURATION)
public long stealthDuration;
@Attribute("SpeedBoost")
public int speedAmp;
@Attribute("JumpBoost")
public int jumpAmp;

public boolean stealth, stealthReady, stealthStarted;
public long stealthStart;
public long stealthChargeTime;
public long stealthReadyStart;
public long stealthDuration;
public int speedAmp, jumpAmp;

public NinjaStance(Player player) {
super(player);
Expand Down
10 changes: 8 additions & 2 deletions src/me/simplicitee/project/addons/ability/chi/WeakeningJab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.projectkorra.projectkorra.ability.ChiAbility;
import com.projectkorra.projectkorra.ability.ComboAbility;
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.ParticleEffect;

Expand All @@ -23,8 +24,12 @@ public class WeakeningJab extends ChiAbility implements ComboAbility, AddonAbili

private static Set<Integer> entities = new HashSet<>();

public LivingEntity entity = null;
@Attribute(Attribute.DURATION)
public long duration;
@Attribute(Attribute.COOLDOWN)
public long cooldown;

public LivingEntity entity = null;

public WeakeningJab(Player player) {
super(player);
Expand All @@ -37,6 +42,7 @@ public WeakeningJab(Player player) {
}

duration = ProjectAddons.instance.getConfig().getLong("Combos.Chi.WeakeningJab.Duration");
cooldown = ProjectAddons.instance.getConfig().getLong("Combos.Chi.WeakeningJab.Cooldown");

if (entity != null && !entities.contains(entity.getEntityId())) {
entities.add(entity.getEntityId());
Expand All @@ -46,7 +52,7 @@ public WeakeningJab(Player player) {

@Override
public long getCooldown() {
return ProjectAddons.instance.getConfig().getLong("Combos.Chi.WeakeningJab.Cooldown");
return cooldown;
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion src/me/simplicitee/project/addons/ability/earth/Accretion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
Expand All @@ -30,14 +31,20 @@

public class Accretion extends EarthAbility implements AddonAbility {

private boolean shot;
@Attribute(Attribute.DAMAGE)
private double damage;
@Attribute("Blocks")
private int blocks;
@Attribute(Attribute.SELECT_RANGE)
private int selectRange;
@Attribute("RevertTime")
private long revertTime;
@Attribute(Attribute.COOLDOWN)
private long cooldown;

private Set<FallingBlock> tracker;
private Set<TempBlock> temps;
private boolean shot;

public Accretion(Player player) {
super(player);
Expand Down
3 changes: 3 additions & 0 deletions src/me/simplicitee/project/addons/ability/earth/Bulwark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.earthbending.Collapse;
import com.projectkorra.projectkorra.earthbending.RaiseEarth;
import com.projectkorra.projectkorra.util.DamageHandler;
Expand All @@ -27,7 +28,9 @@

public class Bulwark extends EarthAbility implements AddonAbility {

@Attribute(Attribute.COOLDOWN)
private long cooldown;

private Set<Location> locs;
private Set<Block> blocks;
private Set<FallingBlock> fbs;
Expand Down
9 changes: 8 additions & 1 deletion src/me/simplicitee/project/addons/ability/earth/Crumble.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,22 @@
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.AddonAbility;
import com.projectkorra.projectkorra.ability.SandAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.TempBlock;

import me.simplicitee.project.addons.ProjectAddons;

public class Crumble extends SandAbility implements AddonAbility {

private int radius, maxRadius, counter, revertTime;
@Attribute(Attribute.RADIUS)
private int maxRadius;
@Attribute("RevertTime")
private int revertTime;
@Attribute(Attribute.COOLDOWN)
private long cooldown;

private int radius, counter;
private Block center;
private Map<Block, BlockData> revert;

Expand Down
Loading

0 comments on commit 96e3f25

Please sign in to comment.