From b694eb4d0b318cc2bc21a058a0d52169642d521e Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 29 Aug 2020 14:02:49 +0100 Subject: [PATCH] Added Diurnal --- .../ecoenchants/enchantments/EcoEnchants.java | 1 + .../ecoenchants/normal/Diurnal.java | 41 +++++++++++++++++++ .../ecoenchants/normal/Nocturnal.java | 2 +- .../resources/enchants/normal/diurnal.yml | 24 +++++++++++ .../resources/enchants/normal/nocturnal.yml | 5 ++- Plugin/src/main/resources/plugin.yml | 4 ++ 6 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java create mode 100644 Plugin/src/main/resources/enchants/normal/diurnal.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 a2cb3146..8b045b23 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -190,6 +190,7 @@ public class EcoEnchants { public static final EcoEnchant LIME_ARTIFACT = new LimeArtifact(); public static final EcoEnchant FORCE = new Force(); public static final EcoEnchant END_INFUSION = new EndInfusion(); + public static final EcoEnchant DIURNAL = new Diurnal(); /** * Get all registered {@link EcoEnchant}s diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java new file mode 100644 index 00000000..c4f680c7 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java @@ -0,0 +1,41 @@ +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.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Diurnal extends EcoEnchant { + public Diurnal() { + super( + new EcoEnchantBuilder("diurnal", EnchantmentType.NORMAL, Target.Applicable.SWORD, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onHit(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Player)) + return; + + Player player = (Player) event.getDamager(); + + if(!player.getWorld().getEnvironment().equals(World.Environment.NORMAL)) + return; + + if(!(player.getWorld().getTime() < 12300 && player.getWorld().getTime() > 23850)) 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/Nocturnal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java index 93bbe813..4937c979 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java @@ -12,7 +12,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public class Nocturnal extends EcoEnchant { public Nocturnal() { super( - new EcoEnchantBuilder("nocturnal", EnchantmentType.NORMAL, Target.Applicable.SWORD, 4.0) + new EcoEnchantBuilder("nocturnal", EnchantmentType.NORMAL, Target.Applicable.SWORD, 4.01) ); } diff --git a/Plugin/src/main/resources/enchants/normal/diurnal.yml b/Plugin/src/main/resources/enchants/normal/diurnal.yml new file mode 100644 index 00000000..b73d30ba --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/diurnal.yml @@ -0,0 +1,24 @@ +# +# Diurnal EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Diurnal" + +description: Increases damage dealt at daytime. + +obtaining: + table: true + villager: true + loot: true + rarity: rare + +general-config: + grindstoneable: true + conflicts: + - nocturnal + 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/nocturnal.yml b/Plugin/src/main/resources/enchants/normal/nocturnal.yml index 3a76067d..f429c14f 100644 --- a/Plugin/src/main/resources/enchants/normal/nocturnal.yml +++ b/Plugin/src/main/resources/enchants/normal/nocturnal.yml @@ -2,7 +2,7 @@ # Nocturnal EcoEnchant # -config-version: 4.0 # Don't edit this. +config-version: 4.01 # Don't edit this. name: "Nocturnal" @@ -16,7 +16,8 @@ obtaining: general-config: grindstoneable: true - conflicts: [] + conflicts: + - diurnal maximum-level: 5 config: diff --git a/Plugin/src/main/resources/plugin.yml b/Plugin/src/main/resources/plugin.yml index a48eab48..09ada895 100644 --- a/Plugin/src/main/resources/plugin.yml +++ b/Plugin/src/main/resources/plugin.yml @@ -209,6 +209,7 @@ permissions: ecoenchants.fromtable.limeartifact: true ecoenchants.fromtable.force: true ecoenchants.fromtable.endinfusion: true + ecoenchants.fromtable.diurnal: true ecoenchants.updateannounce: description: Informs admins of a new update @@ -708,4 +709,7 @@ permissions: default: true ecoenchants.fromtable.endinfusion: description: Allows getting end infusion from an enchanting table + default: true + ecoenchants.fromtable.diurnal: + description: Allows getting diurnal from an enchanting table default: true \ No newline at end of file