Plugin Cleanup + JedCore Ability Death Messages (#8)

* Plugin Cleanup - Added Aztl to the JedCore dev list command - Removed pointless imports - Replaced a lot of deprecated methods with the non deprecated versions - Fixed Airbreath not extinguishing soul fire - Fixed bending board not support the easy hex color format - Fixed some signs not being supported in sign checking (warped, crimson, mangrove, bamboo, hanging) - Optimized a few minor things * Updated metal list in MagnetShield * Fixed firebreath message - Fixed rainbow FireBreath message being null when no one has used it in the server before * Added death messages for all JedCore abilities - Added JedCore death messages for all abilities - Fixed Backstab not dealing "bending" damage - Had to rename ElementSphere sub abilities due to them not working with the death message * Fixed LavaFlux - Fixed LavaFlux making perm stone and duplicating earth block items - Fixed LavaFlux destroying plants
Aztlon · Dec 22, 2022 · 2fe7528 · 2fe7528
1 parent d544c12
commit 2fe7528
Show file tree

Hide file tree

Showing 53 changed files with 301 additions and 236 deletions.
diff --git a/src/com/jedk1/jedcore/JCMethods.java b/src/com/jedk1/jedcore/JCMethods.java
@@ -4,6 +4,7 @@
 
 import com.jedk1.jedcore.util.*;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -226,22 +227,21 @@ else if(noClip)
 
 	private static byte full = 0x0;
 
-	@SuppressWarnings("deprecation")
 	public static void extinguishBlocks(Player player, String ability, int range, int radius, boolean fire, boolean lava){
 		for (Block block : GeneralMethods.getBlocksAroundPoint(player.getTargetBlock((HashSet<Material>) null, (int) range).getLocation(), 2)) {
 
 			Material mat = block.getType();
-			if(mat != Material.FIRE && mat != Material.LAVA)
+			if(mat != Material.FIRE && mat != Material.LAVA && mat != Material.SOUL_FIRE)
 				continue;
-			if (GeneralMethods.isRegionProtectedFromBuild(player, ability, block.getLocation()))
+			if (RegionProtection.isRegionProtected(player, block.getLocation(), ability))
 				continue;
-			if (block.getType() == Material.FIRE && fire) {
+			if ((mat == Material.FIRE || mat == Material.SOUL_FIRE) && fire) {
 				block.setType(Material.AIR);
 				block.getWorld().playEffect(block.getLocation(), Effect.EXTINGUISH, 0);
-			} else if (lava && block.getType() == Material.LAVA && isLiquidSource(block)) {
+			} else if (lava && mat == Material.LAVA && isLiquidSource(block)) {
 				block.setType(Material.OBSIDIAN);
 				block.getWorld().playEffect(block.getLocation(), Effect.EXTINGUISH, 0);
-			} else if (block.getType() == Material.LAVA && lava) {
+			} else if (mat == Material.LAVA && lava) {
 				if (block.getData() == full) {
 					block.setType(Material.OBSIDIAN);
 				} else {

diff --git a/src/com/jedk1/jedcore/ability/airbending/AirBlade.java b/src/com/jedk1/jedcore/ability/airbending/AirBlade.java
@@ -4,10 +4,10 @@
 import com.jedk1.jedcore.collision.CollisionDetector;
 import com.jedk1.jedcore.collision.Sphere;
 import com.jedk1.jedcore.configuration.JedCoreConfig;
-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.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 import org.bukkit.Location;
@@ -91,7 +91,7 @@ private void progressBlade() {
 				return;
 			}
 
-			if (GeneralMethods.isRegionProtectedFromBuild(player, "AirBlade", player.getLocation())) {
+			if (RegionProtection.isRegionProtected(player, player.getLocation(), this)) {
 				remove();
 				return;
 			}

diff --git a/src/com/jedk1/jedcore/ability/airbending/AirBreath.java b/src/com/jedk1/jedcore/ability/airbending/AirBreath.java
@@ -8,6 +8,7 @@
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -118,7 +119,7 @@ public void progress() {
 
 	private boolean isLocationSafe(Location loc) {
 		Block block = loc.getBlock();
-		if (GeneralMethods.isRegionProtectedFromBuild(player, "AirBreath", loc)) {
+		if (RegionProtection.isRegionProtected(player, loc, this)) {
 			return false;
 		}
 		return isTransparent(block);
@@ -147,7 +148,7 @@ private void createBeam() {
 
 			for (Entity entity : GeneralMethods.getEntitiesAroundPoint(loc, damageregion)) {
 				if (entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand)) {
-					if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(entity.getName()))){
+					if (RegionProtection.isRegionProtected(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(entity.getName()))){
 						continue;
 					}
 					if (entity instanceof LivingEntity) {

diff --git a/src/com/jedk1/jedcore/ability/airbending/AirPunch.java b/src/com/jedk1/jedcore/ability/airbending/AirPunch.java
@@ -9,6 +9,7 @@
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 import org.bukkit.Location;
@@ -117,7 +118,7 @@ private void progressShots() {
 					break;
 				}
 				loc = loc.add(loc.getDirection().clone().multiply(1));
-				if (GeneralMethods.isSolid(loc.getBlock()) || isWater(loc.getBlock()) || GeneralMethods.isRegionProtectedFromBuild(player, "AirPunch", loc)) {
+				if (GeneralMethods.isSolid(loc.getBlock()) || isWater(loc.getBlock()) || RegionProtection.isRegionProtected(player, loc, this)) {
 					cancel = true;
 					break;
 				}

diff --git a/src/com/jedk1/jedcore/ability/airbending/combo/AirSlam.java b/src/com/jedk1/jedcore/ability/airbending/combo/AirSlam.java
@@ -11,6 +11,7 @@
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
 import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.ClickType;
 
 import org.bukkit.Location;
@@ -44,7 +45,7 @@ public AirSlam(Player player) {
 
 		Entity target = GeneralMethods.getTargetedEntity(player, range, new ArrayList<>());
 		if (!(target instanceof LivingEntity)
-				|| GeneralMethods.isRegionProtectedFromBuild(this, target.getLocation())
+				|| RegionProtection.isRegionProtected(this, target.getLocation())
 				|| ((target instanceof Player) && Commands.invincible.contains(target.getName())))
 			return;
 		this.target = (LivingEntity) target;

diff --git a/src/com/jedk1/jedcore/ability/avatar/SpiritBeam.java b/src/com/jedk1/jedcore/ability/avatar/SpiritBeam.java
@@ -8,6 +8,7 @@
 import com.projectkorra.projectkorra.ability.AddonAbility;
 import com.projectkorra.projectkorra.ability.AvatarAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -101,7 +102,7 @@ private void createBeam() {
 		for (double i = 0; i < range; i += 0.5) {
 			location = location.add(direction.multiply(0.5).normalize());
 
-			if (GeneralMethods.isRegionProtectedFromBuild(player, "SpiritBeam", location)) {
+			if (RegionProtection.isRegionProtected(player, location, this)) {
 				return;
 			}
 

diff --git a/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESAir.java b/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESAir.java
@@ -8,6 +8,7 @@
 import com.projectkorra.projectkorra.ability.AvatarAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 import org.bukkit.Location;
@@ -46,7 +47,7 @@ public ESAir(Player player) {
 			return;
 		}
 		setFields();
-		if (GeneralMethods.isRegionProtectedFromBuild(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
+		if (RegionProtection.isRegionProtected(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
 			return;
 		}
 		location = player.getEyeLocation().clone().add(player.getEyeLocation().getDirection().multiply(1));
@@ -86,7 +87,7 @@ private void advanceAttack() {
 			if (travelled >= range)
 				return;
 			location = location.add(location.getDirection().clone().multiply(1));
-			if (GeneralMethods.isRegionProtectedFromBuild(this, location)) {
+			if (RegionProtection.isRegionProtected(this, location)) {
 				travelled = range;
 				return;
 			}
@@ -99,7 +100,7 @@ private void advanceAttack() {
 			AirAbility.playAirbendingSound(location);
 
 			for (Entity entity : GeneralMethods.getEntitiesAroundPoint(location, 2.5)) {
-				if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand) && !GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+				if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand) && !RegionProtection.isRegionProtected(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
 					DamageHandler.damageEntity(entity, damage, this);
 					GeneralMethods.setVelocity(this, entity, location.getDirection().multiply(knockback));
 					travelled = range;
@@ -120,7 +121,7 @@ public Location getLocation() {
 
 	@Override
 	public String getName() {
-		return "ElementSphere Air";
+		return "ElementSphereAir";
 	}
 
 	@Override

diff --git a/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESEarth.java b/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESEarth.java
@@ -10,6 +10,7 @@
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -54,7 +55,7 @@ public ESEarth(Player player) {
 		if (bPlayer.isOnCooldown("ESEarth")) {
 			return;
 		}
-		if (GeneralMethods.isRegionProtectedFromBuild(this, player.getTargetBlock(getTransparentMaterialSet(), 40).getLocation())) {
+		if (RegionProtection.isRegionProtected(this, player.getTargetBlock(getTransparentMaterialSet(), 40).getLocation())) {
 			return;
 		}
 		setFields();
@@ -86,15 +87,15 @@ public void progress() {
 			remove();
 			return;
 		}
-		if (GeneralMethods.isRegionProtectedFromBuild(this, tfb.getLocation())){
+		if (RegionProtection.isRegionProtected(this, tfb.getLocation())){
 			remove();
 			return;
 		}
 
 		EarthAbility.playEarthbendingSound(tfb.getLocation());
 
 		for (Entity entity : GeneralMethods.getEntitiesAroundPoint(tfb.getLocation(), 2.5)) {
-			if (entity instanceof LivingEntity && !(entity instanceof ArmorStand) && entity.getEntityId() != player.getEntityId() && !GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+			if (entity instanceof LivingEntity && !(entity instanceof ArmorStand) && entity.getEntityId() != player.getEntityId() && !RegionProtection.isRegionProtected(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
 				//explodeEarth(fb);
 				DamageHandler.damageEntity(entity, damage, this);
 			}
@@ -114,7 +115,7 @@ public static void explodeEarth(TempFallingBlock tempfallingblock) {
 			//	TempBlock.revertBlock(l.getBlock(), Material.AIR);
 			//	TempBlock.removeBlock(l.getBlock());
 			//}
-			if (isBreakable(l.getBlock()) && !GeneralMethods.isRegionProtectedFromBuild(player, "ElementSphere", l) && EarthAbility.isEarthbendable(player, l.getBlock())) {
+			if (isBreakable(l.getBlock()) && !RegionProtection.isRegionProtected(player, l, "ElementSphere") && EarthAbility.isEarthbendable(player, l.getBlock())) {
 				ParticleEffect.SMOKE_LARGE.display(l, 0, 0, 0, 0.1F, 2);
 				//new RegenTempBlock(l.getBlock(), Material.AIR, (byte) 0, (long) rand.nextInt((int) es.revertDelay - (int) (es.revertDelay - 1000)) + (es.revertDelay - 1000));
 				new RegenTempBlock(l.getBlock(), Material.AIR, Material.AIR.createBlockData(), (long) rand.nextInt((int) es.revertDelay - (int) (es.revertDelay - 1000)) + (es.revertDelay - 1000), false);
@@ -148,7 +149,7 @@ public Location getLocation() {
 
 	@Override
 	public String getName() {
-		return "ElementSphere Earth";
+		return "ElementSphereEarth";
 	}
 
 	@Override

diff --git a/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESFire.java b/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESFire.java
@@ -12,6 +12,7 @@
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
 import com.projectkorra.projectkorra.firebending.BlazeArc;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -55,7 +56,7 @@ public ESFire(Player player) {
 		if (bPlayer.isOnCooldown("ESFire")) {
 			return;
 		}
-		if (GeneralMethods.isRegionProtectedFromBuild(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
+		if (RegionProtection.isRegionProtected(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
 			return;
 		}
 		setFields();
@@ -112,7 +113,7 @@ private void advanceAttack() {
 				direction = GeneralMethods.getDirection(player.getLocation(), GeneralMethods.getTargetedLocation(player, range, Material.WATER)).normalize();
 
 			location = location.add(direction.clone().multiply(1));
-			if (GeneralMethods.isRegionProtectedFromBuild(this, location)) {
+			if (RegionProtection.isRegionProtected(this, location)) {
 				travelled = range;
 				return;
 			}
@@ -129,7 +130,7 @@ private void advanceAttack() {
 			placeFire();
 
 			for (Entity entity : GeneralMethods.getEntitiesAroundPoint(location, 2.5)) {
-				if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand) && !GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+				if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand) && !RegionProtection.isRegionProtected(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
 					DamageHandler.damageEntity(entity, damage, this);
 					entity.setFireTicks(Math.round(burnTime / 50F));
 					travelled = range;
@@ -157,7 +158,7 @@ public Location getLocation() {
 
 	@Override
 	public String getName() {
-		return "ElementSphere Fire";
+		return "ElementSphereFire";
 	}
 
 	@Override

diff --git a/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESStream.java b/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESStream.java
@@ -10,6 +10,7 @@
 import com.projectkorra.projectkorra.ability.AvatarAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -74,7 +75,7 @@ public ESStream(Player player) {
 			return;
 		}
 
-		if (GeneralMethods.isRegionProtectedFromBuild(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
+		if (RegionProtection.isRegionProtected(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
 			return;
 		}
 
@@ -123,7 +124,7 @@ public void progress() {
 			return;
 		}
 
-		if (GeneralMethods.isRegionProtectedFromBuild(player, "ElementSphere", stream)) {
+		if (RegionProtection.isRegionProtected(player, stream, this)) {
 			remove();
 			return;
 		}
@@ -149,15 +150,15 @@ public void progress() {
 			List<BlockState> blocks = new ArrayList<>();
 			for (Location loc : GeneralMethods.getCircle(stream, (int) radius, 0, false, true, 0)) {
 				if (JCMethods.isUnbreakable(loc.getBlock())) continue;
-				if (GeneralMethods.isRegionProtectedFromBuild(this, loc)) continue;
+				if (RegionProtection.isRegionProtected(this, loc)) continue;
 				blocks.add(loc.getBlock().getState());
 				new RegenTempBlock(loc.getBlock(), Material.AIR, Material.AIR.createBlockData(), regen, false);
 			}
 			for (Entity e : GeneralMethods.getEntitiesAroundPoint(stream, radius)) {
 				if (e instanceof Player && e == player) {
 					continue;
 				}
-				if (GeneralMethods.isRegionProtectedFromBuild(this, e.getLocation()) || ((e instanceof Player) && Commands.invincible.contains(((Player) e).getName()))){
+				if (RegionProtection.isRegionProtected(this, e.getLocation()) || ((e instanceof Player) && Commands.invincible.contains(((Player) e).getName()))){
 					continue;
 				}
 				GeneralMethods.setVelocity(this, e, dir.normalize().multiply(knockback));
@@ -240,7 +241,7 @@ public Location getLocation() {
 
 	@Override
 	public String getName() {
-		return "ElementSphere Stream";
+		return "ElementSphereStream";
 	}
 
 	@Override

diff --git a/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESWater.java b/src/com/jedk1/jedcore/ability/avatar/elementsphere/ESWater.java
@@ -9,6 +9,7 @@
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 import org.bukkit.Location;
@@ -48,7 +49,7 @@ public ESWater(Player player) {
 		if (bPlayer.isOnCooldown("ESWater")) {
 			return;
 		}
-		if (GeneralMethods.isRegionProtectedFromBuild(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
+		if (RegionProtection.isRegionProtected(this, player.getTargetBlock(getTransparentMaterialSet(), (int) range).getLocation())) {
 			return;
 		}
 		setFields();
@@ -91,7 +92,7 @@ private void advanceAttack() {
 			if (!player.isDead())
 				direction = GeneralMethods.getDirection(player.getLocation(), GeneralMethods.getTargetedLocation(player, range, Material.WATER)).normalize();
 			location = location.add(direction.clone().multiply(1));
-			if(GeneralMethods.isRegionProtectedFromBuild(this, location)){
+			if(RegionProtection.isRegionProtected(this, location)){
 				travelled = range;
 				return;
 			}
@@ -104,7 +105,7 @@ private void advanceAttack() {
 			new RegenTempBlock(location.getBlock(), Material.WATER, Material.WATER.createBlockData(bd -> ((Levelled) bd).setLevel(0)), 100L);
 
 			for (Entity entity : GeneralMethods.getEntitiesAroundPoint(location, 2.5)) {
-				if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand) && !GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
+				if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand) && !RegionProtection.isRegionProtected(this, entity.getLocation()) && !((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
 					DamageHandler.damageEntity(entity, damage, this);
 					travelled = range;
 				}
@@ -124,7 +125,7 @@ public Location getLocation() {
 
 	@Override
 	public String getName() {
-		return "ElementSphere Water";
+		return "ElementSphereWater";
 	}
 
 	@Override

diff --git a/src/com/jedk1/jedcore/ability/avatar/elementsphere/ElementSphere.java b/src/com/jedk1/jedcore/ability/avatar/elementsphere/ElementSphere.java
@@ -10,6 +10,7 @@
 import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
 import com.projectkorra.projectkorra.ability.util.MultiAbilityManager.MultiAbilityInfoSub;
 import com.projectkorra.projectkorra.attribute.Attribute;
+import com.projectkorra.projectkorra.region.RegionProtection;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 import org.bukkit.ChatColor;
@@ -178,7 +179,7 @@ public void progress() {
 		}
 
 		for (Entity entity : GeneralMethods.getEntitiesAroundPoint(location, 2.5)) {
-			if (!GeneralMethods.isRegionProtectedFromBuild(player, "ElementSphere", entity.getLocation())) {
+			if (!RegionProtection.isRegionProtected(player, entity.getLocation(), this)) {
 				if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId() && !(entity instanceof ArmorStand)) {
 					entity.setVelocity(entity.getLocation().toVector().subtract(player.getLocation().toVector()).multiply(1));
 				}