From 1e337d23c3e63f6482f2151ad2bf16d5ab70cc9a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 30 Aug 2020 09:56:34 +0100 Subject: [PATCH] Added Atmospheric, Identify, Infuriate, Paralyze Fixed Aerial --- .../ecoenchants/enchantments/EcoEnchants.java | 6 +- .../ecoenchants/normal/Aerial.java | 22 ++++++ .../ecoenchants/normal/Atmospheric.java | 61 ++++++++++++++++ .../ecoenchants/normal/Identify.java | 57 +++++++++++++++ .../ecoenchants/normal/Infuriate.java | 71 +++++++++++++++++++ .../ecoenchants/normal/Paralyze.java | 57 +++++++++++++++ .../resources/enchants/normal/atmospheric.yml | 23 ++++++ .../resources/enchants/normal/identify.yml | 24 +++++++ .../resources/enchants/normal/infuriate.yml | 24 +++++++ .../resources/enchants/normal/paralyze.yml | 24 +++++++ Plugin/src/main/resources/plugin.yml | 16 +++++ 11 files changed, 384 insertions(+), 1 deletion(-) create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java create mode 100644 Plugin/src/main/resources/enchants/normal/atmospheric.yml create mode 100644 Plugin/src/main/resources/enchants/normal/identify.yml create mode 100644 Plugin/src/main/resources/enchants/normal/infuriate.yml create mode 100644 Plugin/src/main/resources/enchants/normal/paralyze.yml diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index 45e3f8f8..d3500fba 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -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 diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java index 5946bce8..856a31f3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java @@ -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); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java new file mode 100644 index 00000000..e927d8a1 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java @@ -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); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java new file mode 100644 index 00000000..c9eb2174 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java @@ -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)); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java new file mode 100644 index 00000000..996af704 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java @@ -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); + } + } + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java new file mode 100644 index 00000000..0b5ec2af --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java @@ -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)); + } +} diff --git a/Plugin/src/main/resources/enchants/normal/atmospheric.yml b/Plugin/src/main/resources/enchants/normal/atmospheric.yml new file mode 100644 index 00000000..e7f04a5d --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/atmospheric.yml @@ -0,0 +1,23 @@ +# +# Atmospheric EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Atmospheric" + +description: Increases trident damage when you are in air. + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + grindstoneable: true + conflicts: [] + maximum-level: 3 + +config: + damage-multiplier-per-level: 0.1 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/identify.yml b/Plugin/src/main/resources/enchants/normal/identify.yml new file mode 100644 index 00000000..3789da3a --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/identify.yml @@ -0,0 +1,24 @@ +# +# Identify EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Identify" + +description: Chance to give your attacker glowing. + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + grindstoneable: true + conflicts: [] + maximum-level: 2 + +config: + chance-per-level: 10 + ticks-per-level: 10 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/infuriate.yml b/Plugin/src/main/resources/enchants/normal/infuriate.yml new file mode 100644 index 00000000..39f36eca --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/infuriate.yml @@ -0,0 +1,24 @@ +# +# Infuriate EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Infuriate" + +description: Chance to cause nearby mobs to attack your opponent. + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + grindstoneable: true + conflicts: [] + maximum-level: 3 + +config: + chance-per-level: 5 + distance-per-level: 3 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/paralyze.yml b/Plugin/src/main/resources/enchants/normal/paralyze.yml new file mode 100644 index 00000000..00edc78e --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/paralyze.yml @@ -0,0 +1,24 @@ +# +# Paralyze EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Paralyze" + +description: Chance to give your attacker mining fatigue. + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + grindstoneable: true + conflicts: [] + maximum-level: 3 + +config: + chance-per-level: 2 + ticks-per-level: 10 \ No newline at end of file diff --git a/Plugin/src/main/resources/plugin.yml b/Plugin/src/main/resources/plugin.yml index 329f4511..2c8d46c3 100644 --- a/Plugin/src/main/resources/plugin.yml +++ b/Plugin/src/main/resources/plugin.yml @@ -221,6 +221,10 @@ permissions: ecoenchants.fromtable.enderism: true ecoenchants.fromtable.rage: true ecoenchants.fromtable.impact: true + ecoenchants.fromtable.paralyze: true + ecoenchants.fromtable.identify: true + ecoenchants.fromtable.infuriate: true + ecoenchants.fromtable.atmospheric: true ecoenchants.updateannounce: description: Informs admins of a new update @@ -756,4 +760,16 @@ permissions: default: true ecoenchants.fromtable.impact: description: Allows getting impact from an enchanting table + default: true + ecoenchants.fromtable.paralyze: + description: Allows getting paralyze from an enchanting table + default: true + ecoenchants.fromtable.identify: + description: Allows getting identify from an enchanting table + default: true + ecoenchants.fromtable.infuriate: + description: Allows getting infuriate from an enchanting table + default: true + ecoenchants.fromtable.atmospheric: + description: Allows getting atmospheric from an enchanting table default: true \ No newline at end of file