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

Commit 38b26e3

Browse files
SimpliciteeSimplicitee
committed
many things
1 parent fe2c6aa commit 38b26e3

File tree

18 files changed

+1082
-23
lines changed

18 files changed

+1082
-23
lines changed

‎.classpath‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
3+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
44
<attributes>
55
<attribute name="optional" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
9+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
1010
<attributes>
1111
<attribute name="maven.pomderived" value="true"/>
1212
</attributes>
1313
</classpathentry>
14-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
14+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
1515
<attributes>
1616
<attribute name="maven.pomderived" value="true"/>
1717
</attributes>

‎_config.yml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pom.xml‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>me.simplicitee</groupId>
44
<artifactId>projectaddons</artifactId>
5-
<version>1.0.5</version>
5+
<version>1.0.6</version>
66
<name>ProjectAddons</name>
77

88
<repositories>
@@ -16,7 +16,7 @@
1616
<dependency>
1717
<groupId>org.spigotmc</groupId>
1818
<artifactId>spigot-api</artifactId>
19-
<version>1.14.3-R0.1-SNAPSHOT</version>
19+
<version>1.15.2-R0.1-SNAPSHOT</version>
2020
<scope>provided</scope>
2121
</dependency>
2222

@@ -29,16 +29,42 @@
2929
</dependencies>
3030

3131
<build>
32-
<sourceDirectory>src</sourceDirectory>
32+
<defaultGoal>clean package install</defaultGoal>
33+
<finalName>${project.name}-${project.version}</finalName>
34+
<sourceDirectory>${project.basedir}/src/</sourceDirectory>
35+
<resources>
36+
<resource>
37+
<targetPath>.</targetPath>
38+
<filtering>true</filtering>
39+
<directory>${project.basedir}/src/</directory>
40+
<includes>
41+
<include>*.yml</include>
42+
</includes>
43+
</resource>
44+
</resources>
3345
<plugins>
3446
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
3548
<artifactId>maven-compiler-plugin</artifactId>
36-
<version>3.8.0</version>
49+
<version>3.1</version>
3750
<configuration>
3851
<source>1.8</source>
3952
<target>1.8</target>
4053
</configuration>
4154
</plugin>
55+
<plugin>
56+
<artifactId>maven-shade-plugin</artifactId>
57+
<version>2.3</version>
58+
<executions>
59+
<execution>
60+
<phase>package</phase>
61+
<goals>
62+
<goal>shade</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
<configuration />
67+
</plugin>
4268
</plugins>
4369
</build>
44-
</project>
70+
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void update(Player player, int newSlot) {
148148
name = name.substring(0, 15);
149149
}
150150

151-
String score = prefix + color + format + name;
151+
String score = "§" + i + "§r" + prefix + color + format + name;
152152

153153
if (!scores.containsKey(-i)) {
154154
bendingboard.getScore(score).setScore(-i);

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,13 @@
7272
import me.simplicitee.project.addons.ability.earth.ShrapnelBlast;
7373
import me.simplicitee.project.addons.ability.earth.ShrapnelShot;
7474
import me.simplicitee.project.addons.ability.fire.ArcSpark;
75+
import me.simplicitee.project.addons.ability.fire.ChargeBolt;
7576
import me.simplicitee.project.addons.ability.fire.CombustBeam;
7677
import me.simplicitee.project.addons.ability.fire.Electrify;
7778
import me.simplicitee.project.addons.ability.fire.Explode;
7879
import me.simplicitee.project.addons.ability.fire.FireDisc;
7980
import me.simplicitee.project.addons.ability.fire.Jets;
81+
import me.simplicitee.project.addons.ability.water.MistShards;
8082
import me.simplicitee.project.addons.ability.water.PlantArmor;
8183
import me.simplicitee.project.addons.ability.water.RazorLeaf;
8284

@@ -182,6 +184,14 @@ public void onLeftClick(final PlayerInteractEvent event) {
182184
}
183185
} else if (canBend(player, "SonicWave")) {
184186
new SonicWave(player);
187+
} else if (canBend(player, "ChargeBolt")) {
188+
if (CoreAbility.hasAbility(player, ChargeBolt.class)) {
189+
CoreAbility.getAbility(player, ChargeBolt.class).bolt();
190+
}
191+
} else if (canBend(player, "IceBlast", false)) {
192+
if (CoreAbility.hasAbility(player, MistShards.class)) {
193+
CoreAbility.getAbility(player, MistShards.class).clickFunction();
194+
}
185195
}
186196
}
187197

@@ -257,6 +267,8 @@ public void onSneak(PlayerToggleSneakEvent event) {
257267
new VocalMimicry(player);
258268
} else if (canBend(player, "Deafen")) {
259269
new Deafen(player);
270+
} else if (canBend(player, "ChargeBolt")) {
271+
new ChargeBolt(player);
260272
}
261273
}
262274

@@ -298,6 +310,8 @@ public void onEntityChangeBlock(EntityChangeBlockEvent event) {
298310
} else if (fb.hasMetadata("bulwark")) {
299311
event.setCancelled(true);
300312
fb.remove();
313+
} else if (fb.hasMetadata("rockslide")) {
314+
event.setCancelled(true);
301315
}
302316
}
303317
}
@@ -354,7 +368,7 @@ public void onHitDamage(EntityDamageByEntityEvent event) {
354368

355369
Dodging dodge = CoreAbility.getAbility(player, Dodging.class);
356370

357-
if (dodge != null && bPlayer.canBendPassive(dodge)) {
371+
if (dodge != null && bPlayer.canBendPassive(dodge) && bPlayer.isElementToggled(Element.CHI)) {
358372
if (dodge.check()) {
359373
event.setCancelled(true);
360374
ActionBar.sendActionBar(ChatColor.LIGHT_PURPLE + "!> " + Element.CHI.getColor() + "Dodged" + ChatColor.LIGHT_PURPLE + " <!", player);

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,15 @@ private void setupConfig() {
242242
c.addDefault("Abilities.Earth.Shrapnel.Blast.Spread", 24);
243243
c.addDefault("Abilities.Earth.Shrapnel.Blast.Speed", 1.7);
244244

245+
// RockSlide
246+
c.addDefault("Combos.Earth.RockSlide.Enabled", true);
247+
c.addDefault("Combos.Earth.RockSlide.Cooldown", 7000);
248+
c.addDefault("Combos.Earth.RockSlide.Damage", 1);
249+
c.addDefault("Combos.Earth.RockSlide.Knockback", 0.9);
250+
c.addDefault("Combos.Earth.RockSlide.Knockup", 0.4);
251+
c.addDefault("Combos.Earth.RockSlide.Speed", 1.1);
252+
c.addDefault("Combos.Earth.RockSlide.RequiredRockCount", 6);
253+
245254
// ---- Firebending ----
246255
// ArcSpark
247256
c.addDefault("Abilities.Fire.ArcSpark.Enabled", true);
@@ -264,6 +273,16 @@ private void setupConfig() {
264273
c.addDefault("Abilities.Fire.CombustBeam.Maximum.ChargeTime", 5000);
265274
c.addDefault("Abilities.Fire.CombustBeam.InterruptedDamage", 10);
266275

276+
// ChargeBolt
277+
c.addDefault("Abilities.Fire.ChargeBolt.Enabled", true);
278+
c.addDefault("Abilities.Fire.ChargeBolt.Damage", 2);
279+
c.addDefault("Abilities.Fire.ChargeBolt.Cooldown", 8000);
280+
c.addDefault("Abilities.Fire.ChargeBolt.Speed", 6);
281+
c.addDefault("Abilities.Fire.ChargeBolt.ChargeTime", 3000);
282+
c.addDefault("Abilities.Fire.ChargeBolt.BoltRange", 26);
283+
c.addDefault("Abilities.Fire.ChargeBolt.BlastRadius", 13);
284+
c.addDefault("Abilities.Fire.ChargeBolt.DischargeBoltCount", 6);
285+
267286
// Electrify
268287
c.addDefault("Abilities.Fire.Electrify.Enabled", true);
269288
c.addDefault("Abilities.Fire.Electrify.Cooldown", 4000);
@@ -318,7 +337,7 @@ private void setupConfig() {
318337
// ---- Waterbending ----
319338
// Hydrojet
320339
c.addDefault("Passives.Water.Hydrojet.Enabled", true);
321-
c.addDefault("Passives.Water.Hydrojet.Power", 8);
340+
c.addDefault("Passives.Water.Hydrojet.Speed", 8);
322341

323342
// RazorLeaf
324343
c.addDefault("Abilities.Water.RazorLeaf.Enabled", true);
@@ -389,11 +408,21 @@ private void setupConfig() {
389408
c.addDefault("Combos.Water.LeafStorm.Damage", 0.5);
390409
c.addDefault("Combos.Water.LeafStorm.Radius", 6);
391410

411+
// MistShards
412+
c.addDefault("Combos.Water.MistShards.Enabled", true);
413+
c.addDefault("Combos.Water.MistShards.Cooldown", 7000);
414+
c.addDefault("Combos.Water.MistShards.Damage", 1);
415+
c.addDefault("Combos.Water.MistShards.Range", 20);
416+
c.addDefault("Combos.Water.MistShards.IcicleCount", 8);
417+
392418
// ---- Chiblocking ----
393419
// Dodging
394420
c.addDefault("Passives.Chi.Dodging.Enabled", true);
395421
c.addDefault("Passives.Chi.Dodging.Chance", 18);
396422

423+
// Camouflage
424+
c.addDefault("Passives.Chi.Camouflage.Enabled", true);
425+
397426
// Jab
398427
c.addDefault("Abilities.Chi.Jab.Enabled", true);
399428
c.addDefault("Abilities.Chi.Jab.Cooldown", 3000);

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

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
package me.simplicitee.project.addons.ability.chi;
2+
3+
import org.bukkit.Location;
4+
import org.bukkit.Material;
5+
import org.bukkit.entity.Player;
6+
import org.bukkit.potion.PotionEffect;
7+
import org.bukkit.potion.PotionEffectType;
8+
9+
import com.projectkorra.projectkorra.ability.ChiAbility;
10+
import com.projectkorra.projectkorra.ability.PassiveAbility;
11+
12+
import me.simplicitee.project.addons.ProjectAddons;
13+
14+
public class Camouflage extends ChiAbility implements PassiveAbility {
15+
16+
public Camouflage(Player player) {
17+
super(player);
18+
19+
start();
20+
}
21+
22+
@Override
23+
public void progress() {
24+
if (!player.isSneaking()) {
25+
return;
26+
}
27+
28+
if (player.getLocation().getBlock().getType() == Material.TALL_GRASS && player.getEyeLocation().getBlock().getType() == Material.TALL_GRASS) {
29+
player.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 10, 10, true, false), true);
30+
}
31+
}
32+
33+
@Override
34+
public boolean isSneakAbility() {
35+
return true;
36+
}
37+
38+
@Override
39+
public boolean isHarmlessAbility() {
40+
return false;
41+
}
42+
43+
@Override
44+
public long getCooldown() {
45+
return 0;
46+
}
47+
48+
@Override
49+
public String getName() {
50+
return "Camouflage";
51+
}
52+
53+
@Override
54+
public Location getLocation() {
55+
return player.getLocation();
56+
}
57+
58+
@Override
59+
public boolean isInstantiable() {
60+
return true;
61+
}
62+
63+
@Override
64+
public boolean isProgressable() {
65+
return true;
66+
}
67+
68+
@Override
69+
public boolean isEnabled() {
70+
return ProjectAddons.instance.getConfig().getBoolean("Passives.Chi.Camouflage.Enabled");
71+
}
72+
73+
@Override
74+
public String getDescription() {
75+
return "Sneak while in tall grass to camouflage yourself!";
76+
}
77+
}

‎src/me/simplicitee/project/addons/ability/earth/Crumble.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,14 @@ public void progress() {
105105
Block block = center.getRelative((int)x, 0, (int)z);
106106
block = GeneralMethods.getTopBlock(block.getLocation(), 2);
107107

108-
if (block.isPassable() && !block.isLiquid()) {
109-
block.breakNaturally();
108+
int i = 0;
109+
while (block.isPassable() && i < 2) {
110+
if (isPlant(block)) {
111+
new TempBlock(block, Material.AIR).setRevertTime(revertTime);
112+
}
113+
110114
block = block.getRelative(BlockFace.DOWN);
115+
i++;
111116
}
112117

113118
if (TempBlock.isTempBlock(block)) {

‎src/me/simplicitee/project/addons/ability/earth/LandLaunch.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.bukkit.potion.PotionEffect;
77
import org.bukkit.potion.PotionEffectType;
88

9+
import com.projectkorra.projectkorra.Element;
910
import com.projectkorra.projectkorra.ability.AddonAbility;
1011
import com.projectkorra.projectkorra.ability.EarthAbility;
1112
import com.projectkorra.projectkorra.ability.PassiveAbility;
@@ -26,7 +27,7 @@ public LandLaunch(Player player) {
2627

2728
@Override
2829
public void progress() {
29-
if (player.isOnGround() && isEarthbendable(player.getLocation().getBlock().getRelative(BlockFace.DOWN))) {
30+
if (bPlayer.isElementToggled(Element.EARTH) && player.isOnGround() && isEarthbendable(player.getLocation().getBlock().getRelative(BlockFace.DOWN))) {
3031
player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP, 10, amp), true);
3132
}
3233
}

0 commit comments

Comments
 (0)