From b85252d481f6ea7d24993b6fa710a8a71d4cce6a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 29 Aug 2020 14:22:07 +0100 Subject: [PATCH] Added Netheric and Enderism --- .../ecoenchants/enchantments/EcoEnchants.java | 2 + .../ecoenchants/normal/Enderism.java | 43 +++++++++++++++++++ .../ecoenchants/normal/Netheric.java | 43 +++++++++++++++++++ .../resources/enchants/normal/enderism.yml | 24 +++++++++++ .../resources/enchants/normal/netheric.yml | 24 +++++++++++ Plugin/src/main/resources/plugin.yml | 8 ++++ 6 files changed, 144 insertions(+) create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java create mode 100644 Plugin/src/main/resources/enchants/normal/enderism.yml create mode 100644 Plugin/src/main/resources/enchants/normal/netheric.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 f3dcd5e6..826bc710 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -198,6 +198,8 @@ public class EcoEnchants { public static final EcoEnchant BLIND = new Blind(); public static final EcoEnchant SICKENING = new Sickening(); public static final EcoEnchant DEFENDER = new Defender(); + public static final EcoEnchant NETHERIC = new Netheric(); + public static final EcoEnchant ENDERISM = new Enderism(); /** * Get all registered {@link EcoEnchant}s diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java new file mode 100644 index 00000000..a844ea2b --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java @@ -0,0 +1,43 @@ +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.nms.Target; +import com.willfp.ecoenchants.util.HasEnchant; +import org.bukkit.World; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Enderism extends EcoEnchant { + public Enderism() { + super( + new EcoEnchantBuilder("enderism", EnchantmentType.NORMAL, new Target.Applicable[]{Target.Applicable.BOW, Target.Applicable.CROSSBOW}, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onHit(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Arrow)) + return; + if (!(((Arrow) event.getDamager()).getShooter() instanceof Player)) + return; + + Player player = (Player) ((Arrow) event.getDamager()).getShooter(); + + assert player != null; + if(!player.getWorld().getEnvironment().equals(World.Environment.THE_END)) + return; + + if (!HasEnchant.playerHeld(player, this)) return; + + int level = HasEnchant.getPlayerLevel(player, this); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + + event.setDamage(event.getDamage() * (1 + (level * multiplier))); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java new file mode 100644 index 00000000..1cb55968 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java @@ -0,0 +1,43 @@ +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.nms.Target; +import com.willfp.ecoenchants.util.HasEnchant; +import org.bukkit.World; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Netheric extends EcoEnchant { + public Netheric() { + super( + new EcoEnchantBuilder("netheric", EnchantmentType.NORMAL, new Target.Applicable[]{Target.Applicable.BOW, Target.Applicable.CROSSBOW}, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onHit(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Arrow)) + return; + if (!(((Arrow) event.getDamager()).getShooter() instanceof Player)) + return; + + Player player = (Player) ((Arrow) event.getDamager()).getShooter(); + + assert player != null; + if(!player.getWorld().getEnvironment().equals(World.Environment.NETHER)) + return; + + if (!HasEnchant.playerHeld(player, this)) return; + + int level = HasEnchant.getPlayerLevel(player, this); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + + event.setDamage(event.getDamage() * (1 + (level * multiplier))); + } +} diff --git a/Plugin/src/main/resources/enchants/normal/enderism.yml b/Plugin/src/main/resources/enchants/normal/enderism.yml new file mode 100644 index 00000000..41c7483a --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/enderism.yml @@ -0,0 +1,24 @@ +# +# Enderism EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Enderism" + +description: Increases damage dealt in the end. + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + grindstoneable: true + conflicts: + - netheric + maximum-level: 5 + +config: + per-level-multiplier: 0.05 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/netheric.yml b/Plugin/src/main/resources/enchants/normal/netheric.yml new file mode 100644 index 00000000..9d9fd4ac --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/netheric.yml @@ -0,0 +1,24 @@ +# +# Netheric EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Netheric" + +description: Increases damage dealt in the nether. + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + grindstoneable: true + conflicts: + - enderism + maximum-level: 5 + +config: + per-level-multiplier: 0.05 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/plugin.yml b/Plugin/src/main/resources/plugin.yml index babead35..577a52ef 100644 --- a/Plugin/src/main/resources/plugin.yml +++ b/Plugin/src/main/resources/plugin.yml @@ -217,6 +217,8 @@ permissions: ecoenchants.fromtable.sickening: true ecoenchants.fromtable.blind: true ecoenchants.fromtable.defender: true + ecoenchants.fromtable.netheric: true + ecoenchants.fromtable.enderism: true ecoenchants.updateannounce: description: Informs admins of a new update @@ -740,4 +742,10 @@ permissions: default: true ecoenchants.fromtable.defender: description: Allows getting defender from an enchanting table + default: true + ecoenchants.fromtable.netheric: + description: Allows getting netheric from an enchanting table + default: true + ecoenchants.fromtable.enderism: + description: Allows getting enderism from an enchanting table default: true \ No newline at end of file