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

Commit 96e3f25

Browse files
SimpliciteeSimplicitee
committed
attributes
1 parent 5d9638b commit 96e3f25

33 files changed

+305
-65
lines changed

‎src/me/simplicitee/project/addons/MainListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void onEntityChangeBlock(EntityChangeBlockEvent event) {
276276
EarthKick.removeBlock(fb);
277277
} else if (MagmaSlap.isBlock(fb)) {
278278
event.setCancelled(true);
279-
((MagmaSlap) fb.getMetadata("lavaflux").get(0).value()).turnToTempBlock(event.getBlock());
279+
((MagmaSlap) fb.getMetadata("magmaslap").get(0).value()).turnToTempBlock(event.getBlock());
280280
} else if (fb.hasMetadata("earthring")) {
281281
event.setCancelled(true);
282282
} else if (fb.hasMetadata("lavasurge")) {

‎src/me/simplicitee/project/addons/ability/air/GaleGust.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,27 @@
1515
import com.projectkorra.projectkorra.GeneralMethods;
1616
import com.projectkorra.projectkorra.ability.AddonAbility;
1717
import com.projectkorra.projectkorra.ability.AirAbility;
18+
import com.projectkorra.projectkorra.attribute.Attribute;
1819
import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
1920
import com.projectkorra.projectkorra.util.DamageHandler;
2021

2122
import me.simplicitee.project.addons.ProjectAddons;
2223

2324
public class GaleGust extends AirAbility implements AddonAbility {
2425

25-
private Location current;
26+
@Attribute(Attribute.COOLDOWN)
2627
private long cooldown;
27-
private Vector direction;
28+
@Attribute(Attribute.KNOCKBACK)
2829
private double knockback;
30+
@Attribute(Attribute.RADIUS)
2931
private double radius;
32+
@Attribute(Attribute.DAMAGE)
3033
private double damage;
34+
@Attribute(Attribute.RANGE)
3135
private double range;
36+
37+
private Location current;
38+
private Vector direction;
3239
private Set<Point> points;
3340

3441
public GaleGust(Player player) {

‎src/me/simplicitee/project/addons/ability/air/Tailwind.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,18 @@
1111
import com.projectkorra.projectkorra.ability.AirAbility;
1212
import com.projectkorra.projectkorra.ability.ComboAbility;
1313
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
14+
import com.projectkorra.projectkorra.attribute.Attribute;
1415
import com.projectkorra.projectkorra.util.ClickType;
1516

1617
import me.simplicitee.project.addons.ProjectAddons;
1718

1819
public class Tailwind extends AirAbility implements ComboAbility, AddonAbility {
1920

21+
@Attribute(Attribute.COOLDOWN)
2022
private long cooldown;
23+
@Attribute(Attribute.DURATION)
2124
private long duration;
25+
@Attribute(Attribute.SPEED)
2226
private int speed;
2327

2428
public Tailwind(Player player) {

‎src/me/simplicitee/project/addons/ability/air/Zephyr.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@
1313
import com.projectkorra.projectkorra.GeneralMethods;
1414
import com.projectkorra.projectkorra.ability.AddonAbility;
1515
import com.projectkorra.projectkorra.ability.AirAbility;
16+
import com.projectkorra.projectkorra.attribute.Attribute;
1617
import com.projectkorra.projectkorra.util.ParticleEffect;
1718

1819
import me.simplicitee.project.addons.ProjectAddons;
1920

2021
public class Zephyr extends AirAbility implements AddonAbility {
2122

23+
@Attribute(Attribute.RADIUS)
2224
private double radius;
25+
@Attribute(Attribute.COOLDOWN)
2326
private long cooldown;
27+
2428
private int angle;
2529

2630
public Zephyr(Player player) {

‎src/me/simplicitee/project/addons/ability/avatar/EnergyBeam.java‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.projectkorra.projectkorra.GeneralMethods;
1919
import com.projectkorra.projectkorra.ability.AddonAbility;
2020
import com.projectkorra.projectkorra.ability.AvatarAbility;
21+
import com.projectkorra.projectkorra.attribute.Attribute;
2122
import com.projectkorra.projectkorra.util.DamageHandler;
2223
import com.projectkorra.projectkorra.util.ParticleEffect;
2324

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

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

30-
private Map<Location, Vector> map;
31-
private Map<Location, Integer> ranges;
31+
@Attribute(Attribute.DAMAGE)
3232
private double damage;
33+
@Attribute(Attribute.RANGE)
3334
private int range;
34-
private long cooldown, duration;
35-
private EnergyColor color;
35+
@Attribute(Attribute.COOLDOWN)
36+
private long cooldown;
37+
@Attribute(Attribute.DURATION)
38+
private long duration;
39+
@Attribute("EasterEgg")
3640
private boolean effects;
3741

42+
private Map<Location, Vector> map;
43+
private Map<Location, Integer> ranges;
44+
private EnergyColor color;
45+
3846
public static enum EnergyColor {
39-
WHITE("#ffffff"),
40-
BLACK("#000000"),
41-
RED("#ff5252"),
42-
BLUE("#0111ff"),
43-
GREEN("#229965"),
44-
PURPLE("#c606ff"),
45-
YELLOW("#c6c600"),
46-
ORANGE("#ffa500"),
47-
INDIGO("#0a0082"),
48-
BROWN("#d2691e"),
49-
PINK("#e77aea"),
47+
WHITE("ffffff"),
48+
BLACK("000000"),
49+
RED("ff5252"),
50+
BLUE("0111ff"),
51+
GREEN("229965"),
52+
PURPLE("c606ff"),
53+
YELLOW("c6c600"),
54+
ORANGE("ffa500"),
55+
INDIGO("0a0082"),
56+
BROWN("d2691e"),
57+
PINK("e77aea"),
5058
AQUA("00FFFF"),
5159
GRAY("647687"),
52-
53-
RAINBOW("#abcdef");
60+
RAINBOW("abcdef");
5461

5562
private String hex;
5663
private EnergyColor(String hex) {

‎src/me/simplicitee/project/addons/ability/chi/ChiblockJab.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@
1212
import com.projectkorra.projectkorra.ability.ChiAbility;
1313
import com.projectkorra.projectkorra.ability.ComboAbility;
1414
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
15+
import com.projectkorra.projectkorra.attribute.Attribute;
1516
import com.projectkorra.projectkorra.util.ClickType;
1617
import com.projectkorra.projectkorra.util.ParticleEffect;
1718

1819
import me.simplicitee.project.addons.ProjectAddons;
1920

2021
public class ChiblockJab extends ChiAbility implements ComboAbility, AddonAbility{
2122

22-
private Player attacked;
23+
@Attribute(Attribute.DURATION)
2324
private long duration;
25+
@Attribute(Attribute.COOLDOWN)
26+
private long cooldown;
27+
28+
private Player attacked;
2429
private BendingPlayer bp;
2530

2631
public ChiblockJab(Player player) {
@@ -35,6 +40,7 @@ public ChiblockJab(Player player) {
3540
}
3641

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

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

4955
@Override
5056
public long getCooldown() {
51-
return ProjectAddons.instance.getConfig().getLong("Combos.Chi.ChiblockJab.Cooldown");
57+
return cooldown;
5258
}
5359

5460
@Override

‎src/me/simplicitee/project/addons/ability/chi/Dodging.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
import com.projectkorra.projectkorra.ability.AddonAbility;
77
import com.projectkorra.projectkorra.ability.ChiAbility;
88
import com.projectkorra.projectkorra.ability.PassiveAbility;
9+
import com.projectkorra.projectkorra.attribute.Attribute;
910

1011
import me.simplicitee.project.addons.ProjectAddons;
1112

1213
public class Dodging extends ChiAbility implements AddonAbility, PassiveAbility {
1314

15+
@Attribute("Chance")
1416
private double chance;
1517

1618
public Dodging(Player player) {

‎src/me/simplicitee/project/addons/ability/chi/FlyingKick.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.projectkorra.projectkorra.ability.ChiAbility;
1515
import com.projectkorra.projectkorra.ability.ComboAbility;
1616
import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
17+
import com.projectkorra.projectkorra.attribute.Attribute;
1718
import com.projectkorra.projectkorra.util.ClickType;
1819
import com.projectkorra.projectkorra.util.DamageHandler;
1920
import com.projectkorra.projectkorra.util.ParticleEffect;
@@ -22,8 +23,12 @@
2223

2324
public class FlyingKick extends ChiAbility implements ComboAbility, AddonAbility{
2425

26+
@Attribute("LaunchPower")
2527
private double launch;
28+
@Attribute(Attribute.DAMAGE)
2629
private double damage;
30+
@Attribute(Attribute.COOLDOWN)
31+
private long cooldown;
2732

2833
public FlyingKick(Player player) {
2934
super(player);
@@ -46,14 +51,15 @@ public FlyingKick(Player player) {
4651

4752
launch = ProjectAddons.instance.getConfig().getDouble("Combos.Chi.FlyingKick.LaunchPower");
4853
damage = ProjectAddons.instance.getConfig().getDouble("Combos.Chi.FlyingKick.Damage");
54+
cooldown = ProjectAddons.instance.getConfig().getLong("Combos.Chi.FlyingKick.Cooldown");
4955
Vector v = player.getLocation().getDirection().add(new Vector(0, 0.25485, 0)).normalize().multiply(launch);
5056
player.setVelocity(v);
5157
start();
5258
}
5359

5460
@Override
5561
public long getCooldown() {
56-
return ProjectAddons.instance.getConfig().getLong("Combos.Chi.FlyingKick.Cooldown");
62+
return cooldown;
5763
}
5864

5965
@Override

‎src/me/simplicitee/project/addons/ability/chi/Jab.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import com.projectkorra.projectkorra.ability.AddonAbility;
99
import com.projectkorra.projectkorra.ability.ChiAbility;
10+
import com.projectkorra.projectkorra.attribute.Attribute;
1011
import com.projectkorra.projectkorra.util.DamageHandler;
1112
import com.projectkorra.projectkorra.util.ParticleEffect;
1213

@@ -18,9 +19,12 @@ public static enum JabHand {
1819
RIGHT, LEFT;
1920
}
2021

21-
private int uses = 0;
22+
@Attribute(Attribute.COOLDOWN)
2223
private long cooldown;
24+
@Attribute("MaxUses")
2325
private int maxUses;
26+
27+
private int uses = 0;
2428

2529
public Jab(Player player, Entity entity, JabHand hand) {
2630
super(player);

‎src/me/simplicitee/project/addons/ability/chi/NinjaStance.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,23 @@
99
import com.projectkorra.projectkorra.GeneralMethods;
1010
import com.projectkorra.projectkorra.ability.AddonAbility;
1111
import com.projectkorra.projectkorra.ability.ChiAbility;
12+
import com.projectkorra.projectkorra.attribute.Attribute;
1213

1314
import me.simplicitee.project.addons.ProjectAddons;
1415

1516
public class NinjaStance extends ChiAbility implements AddonAbility{
1617

18+
@Attribute(Attribute.DURATION)
19+
public long stealthDuration;
20+
@Attribute("SpeedBoost")
21+
public int speedAmp;
22+
@Attribute("JumpBoost")
23+
public int jumpAmp;
24+
1725
public boolean stealth, stealthReady, stealthStarted;
1826
public long stealthStart;
1927
public long stealthChargeTime;
2028
public long stealthReadyStart;
21-
public long stealthDuration;
22-
public int speedAmp, jumpAmp;
2329

2430
public NinjaStance(Player player) {
2531
super(player);

0 commit comments

Comments
 (0)