Added Atmospheric, Identify, Infuriate, Paralyze
Fixed Aerial
This commit is contained in:
@@ -201,7 +201,11 @@ public class EcoEnchants {
|
||||
public static final EcoEnchant NETHERIC = new Netheric();
|
||||
public static final EcoEnchant ENDERISM = new Enderism();
|
||||
public static final EcoEnchant RAGE = new Rage();
|
||||
//public static final EcoEnchant IMPACT = new Impact();
|
||||
public static final EcoEnchant IMPACT = new Impact();
|
||||
public static final EcoEnchant PARALYZE = new Paralyze();
|
||||
public static final EcoEnchant IDENTIFY = new Identify();
|
||||
public static final EcoEnchant INFURIATE = new Infuriate();
|
||||
public static final EcoEnchant ATMOSPHERIC = new Atmospheric();
|
||||
|
||||
/**
|
||||
* Get all registered {@link EcoEnchant}s
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.event.entity.ProjectileLaunchEvent;
|
||||
import org.bukkit.metadata.FixedMetadataValue;
|
||||
|
||||
public class Aerial extends EcoEnchant {
|
||||
public Aerial() {
|
||||
super(
|
||||
@@ -17,6 +22,22 @@ public class Aerial extends EcoEnchant {
|
||||
|
||||
// START OF LISTENERS
|
||||
|
||||
@EventHandler
|
||||
public void onLaunch(ProjectileLaunchEvent event) {
|
||||
if(!(event.getEntity() instanceof Arrow))
|
||||
return;
|
||||
|
||||
if(!(event.getEntity().getShooter() instanceof Player))
|
||||
return;
|
||||
|
||||
Arrow arrow = (Arrow) event.getEntity();
|
||||
Player player = (Player) arrow.getShooter();
|
||||
|
||||
if(player.isOnGround()) return;
|
||||
|
||||
arrow.setMetadata("shot-in-air", new FixedMetadataValue(EcoEnchantsPlugin.getInstance(), true));
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onDamage(EntityDamageByEntityEvent event) {
|
||||
if (!(event.getDamager() instanceof Arrow))
|
||||
@@ -24,6 +45,7 @@ public class Aerial extends EcoEnchant {
|
||||
|
||||
Arrow arrow = (Arrow) event.getDamager();
|
||||
if(EnchantChecks.arrow(arrow, this)) return;
|
||||
if(!arrow.hasMetadata("shot-in-air")) return;
|
||||
|
||||
int level = EnchantChecks.getArrowLevel(arrow, this);
|
||||
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.nms.TridentStack;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Trident;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.event.entity.ProjectileLaunchEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.metadata.FixedMetadataValue;
|
||||
|
||||
public class Atmospheric extends EcoEnchant {
|
||||
public Atmospheric() {
|
||||
super(
|
||||
new EcoEnchantBuilder("atmospheric", EnchantmentType.NORMAL, Target.Applicable.TRIDENT, 4.0)
|
||||
);
|
||||
}
|
||||
|
||||
// START OF LISTENERS
|
||||
|
||||
@EventHandler
|
||||
public void onLaunch(ProjectileLaunchEvent event) {
|
||||
if(!(event.getEntity() instanceof Trident))
|
||||
return;
|
||||
|
||||
if(!(event.getEntity().getShooter() instanceof Trident))
|
||||
return;
|
||||
|
||||
Trident trident = (Trident) event.getEntity();
|
||||
Player player = (Player) trident.getShooter();
|
||||
|
||||
if(player.isOnGround()) return;
|
||||
|
||||
trident.setMetadata("shot-in-air", new FixedMetadataValue(EcoEnchantsPlugin.getInstance(), true));
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onDamage(EntityDamageByEntityEvent event) {
|
||||
if (!(event.getDamager() instanceof Trident))
|
||||
return;
|
||||
|
||||
Trident trident = (Trident) event.getDamager();
|
||||
if(!trident.hasMetadata("shot-in-air")) return;
|
||||
ItemStack item = TridentStack.getTridentStack(trident);
|
||||
if(EnchantChecks.item(item, this)) return;
|
||||
|
||||
int level = EnchantChecks.getItemLevel(item, this);
|
||||
|
||||
double damage = event.getDamage();
|
||||
double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level");
|
||||
double reduction = 1 + (multiplier * level);
|
||||
event.setDamage(damage * reduction);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.Rand;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
|
||||
public class Identify extends EcoEnchant {
|
||||
public Identify() {
|
||||
super(
|
||||
new EcoEnchantBuilder("identify", EnchantmentType.NORMAL, Target.Applicable.SHIELD, 4.0)
|
||||
);
|
||||
}
|
||||
|
||||
// START OF LISTENERS
|
||||
|
||||
@EventHandler
|
||||
public void onBlock(EntityDamageByEntityEvent event) {
|
||||
if (!(event.getEntity() instanceof Player))
|
||||
return;
|
||||
|
||||
if (!(event.getDamager() instanceof LivingEntity))
|
||||
return;
|
||||
|
||||
Player player = (Player) event.getEntity();
|
||||
|
||||
LivingEntity victim = (LivingEntity) event.getDamager();
|
||||
|
||||
if(!player.isBlocking()) return;
|
||||
|
||||
if(!AntigriefManager.canInjure(player, victim)) return;
|
||||
|
||||
int level;
|
||||
if (!EnchantChecks.offhand(player, this) && !EnchantChecks.mainhand(player, this)) return;
|
||||
if(EnchantChecks.offhand(player, this)) level = EnchantChecks.getOffhandLevel(player, this);
|
||||
else level = EnchantChecks.getMainhandLevel(player, this);
|
||||
|
||||
double chance = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "chance-per-level");
|
||||
int duration = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "ticks-per-level");
|
||||
|
||||
double finalChance = (chance * level)/100;
|
||||
if(Rand.randFloat(0, 1) > finalChance) return;
|
||||
|
||||
int finalDuration = duration * level;
|
||||
|
||||
victim.addPotionEffect(new PotionEffect(PotionEffectType.GLOWING, finalDuration, 1, false, false, false));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.LocationUtils;
|
||||
import com.willfp.ecoenchants.util.Rand;
|
||||
import org.bukkit.entity.*;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
public class Infuriate extends EcoEnchant {
|
||||
public Infuriate() {
|
||||
super(
|
||||
new EcoEnchantBuilder("infuriate", EnchantmentType.NORMAL, Target.Applicable.SHIELD, 4.0)
|
||||
);
|
||||
}
|
||||
|
||||
// START OF LISTENERS
|
||||
|
||||
@EventHandler
|
||||
public void onBlock(EntityDamageByEntityEvent event) {
|
||||
if (!(event.getEntity() instanceof Player))
|
||||
return;
|
||||
|
||||
if (!(event.getDamager() instanceof LivingEntity))
|
||||
return;
|
||||
|
||||
Player player = (Player) event.getEntity();
|
||||
|
||||
LivingEntity victim = (LivingEntity) event.getDamager();
|
||||
|
||||
if(!player.isBlocking()) return;
|
||||
|
||||
if(!AntigriefManager.canInjure(player, victim)) return;
|
||||
|
||||
int level;
|
||||
if (!EnchantChecks.offhand(player, this) && !EnchantChecks.mainhand(player, this)) return;
|
||||
if(EnchantChecks.offhand(player, this)) level = EnchantChecks.getOffhandLevel(player, this);
|
||||
else level = EnchantChecks.getMainhandLevel(player, this);
|
||||
|
||||
double chance = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "chance-per-level");
|
||||
double finalChance = (chance * level)/100;
|
||||
if(Rand.randFloat(0, 1) > finalChance) return;
|
||||
|
||||
double distancePerLevel = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "distance-per-level");
|
||||
final double distance = distancePerLevel * level;
|
||||
|
||||
for (Entity e : victim.getWorld().getNearbyEntities(victim.getLocation(), distance, distance, distance)) {
|
||||
if(!(e instanceof Monster)) continue;
|
||||
|
||||
if(e instanceof PigZombie) {
|
||||
((PigZombie) e).setAngry(true);
|
||||
}
|
||||
|
||||
((Monster) e).setTarget(victim);
|
||||
|
||||
Vector vector = player.getLocation().toVector().clone().subtract(e.getLocation().toVector()).normalize().multiply(0.23d);
|
||||
|
||||
if(LocationUtils.isFinite(vector)) {
|
||||
e.setVelocity(vector);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.Rand;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
import org.bukkit.potion.PotionEffect;
|
||||
import org.bukkit.potion.PotionEffectType;
|
||||
|
||||
public class Paralyze extends EcoEnchant {
|
||||
public Paralyze() {
|
||||
super(
|
||||
new EcoEnchantBuilder("paralyze", EnchantmentType.NORMAL, Target.Applicable.SHIELD, 4.0)
|
||||
);
|
||||
}
|
||||
|
||||
// START OF LISTENERS
|
||||
|
||||
@EventHandler
|
||||
public void onBlock(EntityDamageByEntityEvent event) {
|
||||
if (!(event.getEntity() instanceof Player))
|
||||
return;
|
||||
|
||||
if (!(event.getDamager() instanceof LivingEntity))
|
||||
return;
|
||||
|
||||
Player player = (Player) event.getEntity();
|
||||
|
||||
LivingEntity victim = (LivingEntity) event.getDamager();
|
||||
|
||||
if(!player.isBlocking()) return;
|
||||
|
||||
if(!AntigriefManager.canInjure(player, victim)) return;
|
||||
|
||||
int level;
|
||||
if (!EnchantChecks.offhand(player, this) && !EnchantChecks.mainhand(player, this)) return;
|
||||
if(EnchantChecks.offhand(player, this)) level = EnchantChecks.getOffhandLevel(player, this);
|
||||
else level = EnchantChecks.getMainhandLevel(player, this);
|
||||
|
||||
double chance = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "chance-per-level");
|
||||
int duration = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "ticks-per-level");
|
||||
|
||||
double finalChance = (chance * level)/100;
|
||||
if(Rand.randFloat(0, 1) > finalChance) return;
|
||||
|
||||
int finalDuration = duration * level;
|
||||
|
||||
victim.addPotionEffect(new PotionEffect(PotionEffectType.SLOW_DIGGING, finalDuration, 10, false, false, false));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user