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 d3500fba..767a481e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -206,6 +206,14 @@ public class EcoEnchants { public static final EcoEnchant IDENTIFY = new Identify(); public static final EcoEnchant INFURIATE = new Infuriate(); public static final EcoEnchant ATMOSPHERIC = new Atmospheric(); + public static final EcoEnchant REVENANT = new Revenant(); + public static final EcoEnchant INSECTICIDE = new Insecticide(); + public static final EcoEnchant SLAUGHTER = new Slaughter(); + public static final EcoEnchant SETTLE = new Settle(); + public static final EcoEnchant PHANTASM = new Phantasm(); + public static final EcoEnchant ARACHNID = new Arachnid(); + public static final EcoEnchant PACIFY = new Pacify(); + public static final EcoEnchant ABATTOIR = new Abattoir(); /** * Get all registered {@link EcoEnchant}s diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java new file mode 100644 index 00000000..fce77b23 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java @@ -0,0 +1,45 @@ +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.nms.Target; +import com.willfp.ecoenchants.nms.TridentStack; +import org.bukkit.entity.Creeper; +import org.bukkit.entity.Monster; +import org.bukkit.entity.Trident; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.inventory.ItemStack; + +public class Abattoir extends EcoEnchant { + public Abattoir() { + super( + new EcoEnchantBuilder("abattoir", EnchantmentType.NORMAL, Target.Applicable.TRIDENT, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Trident)) + return; + + if(event.getEntity() instanceof Monster) return; + + Trident trident = (Trident) event.getDamager(); + 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 + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java new file mode 100644 index 00000000..c7811c08 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java @@ -0,0 +1,46 @@ +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.nms.Target; +import com.willfp.ecoenchants.nms.TridentStack; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Player; +import org.bukkit.entity.Spider; +import org.bukkit.entity.Trident; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.inventory.ItemStack; + +public class Arachnid extends EcoEnchant { + public Arachnid() { + super( + new EcoEnchantBuilder("arachnid", EnchantmentType.NORMAL, Target.Applicable.TRIDENT, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Trident)) + return; + + if(!(event.getEntity() instanceof Spider)) return; + + Trident trident = (Trident) event.getDamager(); + 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 + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java new file mode 100644 index 00000000..2976ae7b --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java @@ -0,0 +1,40 @@ +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.nms.Target; +import org.bukkit.entity.*; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Insecticide extends EcoEnchant { + public Insecticide() { + super( + new EcoEnchantBuilder("insecticide", EnchantmentType.NORMAL, Target.Applicable.BOW, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Arrow)) + return; + + if(!(event.getEntity() instanceof Spider)) return; + + Arrow arrow = (Arrow) event.getDamager(); + + if(!EnchantChecks.arrow(arrow, this)) + return; + + int level = EnchantChecks.getArrowLevel(arrow, this); + + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java new file mode 100644 index 00000000..24803842 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java @@ -0,0 +1,45 @@ +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.nms.Target; +import com.willfp.ecoenchants.nms.TridentStack; +import org.bukkit.entity.Creeper; +import org.bukkit.entity.Spider; +import org.bukkit.entity.Trident; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.inventory.ItemStack; + +public class Pacify extends EcoEnchant { + public Pacify() { + super( + new EcoEnchantBuilder("pacify", EnchantmentType.NORMAL, Target.Applicable.TRIDENT, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Trident)) + return; + + if(!(event.getEntity() instanceof Creeper)) return; + + Trident trident = (Trident) event.getDamager(); + 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 + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java new file mode 100644 index 00000000..b07ed515 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java @@ -0,0 +1,46 @@ +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.nms.Target; +import com.willfp.ecoenchants.nms.TridentStack; +import org.bukkit.entity.Monster; +import org.bukkit.entity.Skeleton; +import org.bukkit.entity.Trident; +import org.bukkit.entity.Zombie; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.inventory.ItemStack; + +public class Phantasm extends EcoEnchant { + public Phantasm() { + super( + new EcoEnchantBuilder("phantasm", EnchantmentType.NORMAL, Target.Applicable.TRIDENT, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Trident)) + return; + + if(!(event.getEntity() instanceof Zombie || event.getEntity() instanceof Skeleton)) return; + + Trident trident = (Trident) event.getDamager(); + 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 + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java new file mode 100644 index 00000000..21cacd7e --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java @@ -0,0 +1,40 @@ +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.nms.Target; +import org.bukkit.entity.*; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Revenant extends EcoEnchant { + public Revenant() { + super( + new EcoEnchantBuilder("revenant", EnchantmentType.NORMAL, Target.Applicable.BOW, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Arrow)) + return; + + if(!(event.getEntity() instanceof Zombie || event.getEntity() instanceof Skeleton)) return; + + Arrow arrow = (Arrow) event.getDamager(); + + if(!EnchantChecks.arrow(arrow, this)) + return; + + int level = EnchantChecks.getArrowLevel(arrow, this); + + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java index 1cfec71c..e5064ca5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java @@ -15,7 +15,7 @@ import org.bukkit.inventory.ItemStack; public class Serrated extends EcoEnchant { public Serrated() { super( - new EcoEnchantBuilder("serrated", EnchantmentType.NORMAL, Target.Applicable.TRIDENT, 4.0) + new EcoEnchantBuilder("serrated", EnchantmentType.NORMAL, Target.Applicable.TRIDENT, 4.01) ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.java new file mode 100644 index 00000000..1ec1915b --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.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.enchantments.util.checks.EnchantChecks; +import com.willfp.ecoenchants.nms.Target; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Creeper; +import org.bukkit.entity.Monster; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Settle extends EcoEnchant { + public Settle() { + super( + new EcoEnchantBuilder("settle", EnchantmentType.NORMAL, Target.Applicable.BOW, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Arrow)) + return; + + if(!(event.getEntity() instanceof Creeper)) return; + + Arrow arrow = (Arrow) event.getDamager(); + + if(!EnchantChecks.arrow(arrow, this)) + return; + + int level = EnchantChecks.getArrowLevel(arrow, this); + + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.java new file mode 100644 index 00000000..61c0ae96 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.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.enchantments.util.checks.EnchantChecks; +import com.willfp.ecoenchants.nms.Target; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Monster; +import org.bukkit.entity.Player; +import org.bukkit.entity.Spider; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Slaughter extends EcoEnchant { + public Slaughter() { + super( + new EcoEnchantBuilder("slaughter", EnchantmentType.NORMAL, Target.Applicable.BOW, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Arrow)) + return; + + if(event.getEntity() instanceof Monster) return; + + Arrow arrow = (Arrow) event.getDamager(); + + if(!EnchantChecks.arrow(arrow, this)) + return; + + int level = EnchantChecks.getArrowLevel(arrow, this); + + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = (multiplier * (level + 1)) + 1; + event.setDamage(damage * bonus); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java index 484955f2..1027c826 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java @@ -15,7 +15,7 @@ import org.bukkit.inventory.ItemStack; public class Bladed extends EcoEnchant { public Bladed() { super( - new EcoEnchantBuilder("bladed", EnchantmentType.SPECIAL, Target.Applicable.TRIDENT, 4.0) + new EcoEnchantBuilder("bladed", EnchantmentType.SPECIAL, Target.Applicable.TRIDENT, 4.01) ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java index 8f50654b..10214dd7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java @@ -13,7 +13,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public class Force extends EcoEnchant { public Force() { super( - new EcoEnchantBuilder("force", EnchantmentType.SPECIAL, Target.Applicable.BOW, 4.0) + new EcoEnchantBuilder("force", EnchantmentType.SPECIAL, Target.Applicable.BOW, 4.01) ); } diff --git a/Plugin/src/main/resources/enchants/normal/abattoir.yml b/Plugin/src/main/resources/enchants/normal/abattoir.yml new file mode 100644 index 00000000..30feb2cf --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/abattoir.yml @@ -0,0 +1,29 @@ +# +# Abattoir EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Abattoir" + +description: Increases damage against passive mobs. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - serrated + - bladed + - phantasm + - pacify + - arachnid + - impaling + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/arachnid.yml b/Plugin/src/main/resources/enchants/normal/arachnid.yml new file mode 100644 index 00000000..689c6e17 --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/arachnid.yml @@ -0,0 +1,29 @@ +# +# Arachnid EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Arachnid" + +description: Increases damage against spiders. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - serrated + - bladed + - phantasm + - pacify + - abattoir + - impaling + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/insecticide.yml b/Plugin/src/main/resources/enchants/normal/insecticide.yml new file mode 100644 index 00000000..0280ce8a --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/insecticide.yml @@ -0,0 +1,28 @@ +# +# Insecticide EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Insecticide" + +description: Increases damage against spiders. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - power + - force + - revenant + - slaughter + - settle + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/pacify.yml b/Plugin/src/main/resources/enchants/normal/pacify.yml new file mode 100644 index 00000000..69be6e17 --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/pacify.yml @@ -0,0 +1,29 @@ +# +# Pacify EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Pacify" + +description: Increases damage against creepers. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - serrated + - bladed + - phantasm + - arachnid + - abattoir + - impaling + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/phantasm.yml b/Plugin/src/main/resources/enchants/normal/phantasm.yml new file mode 100644 index 00000000..30ee1f6e --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/phantasm.yml @@ -0,0 +1,29 @@ +# +# Phantasm EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Phantasm" + +description: Increases damage against undead mobs. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - serrated + - bladed + - arachnid + - pacify + - abattoir + - impaling + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/revenant.yml b/Plugin/src/main/resources/enchants/normal/revenant.yml new file mode 100644 index 00000000..0d6338af --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/revenant.yml @@ -0,0 +1,28 @@ +# +# Revenant EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Revenant" + +description: Increases damage against undead mobs. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - power + - force + - insecticide + - slaughter + - settle + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/serrated.yml b/Plugin/src/main/resources/enchants/normal/serrated.yml index 193a834b..52e2f3f6 100644 --- a/Plugin/src/main/resources/enchants/normal/serrated.yml +++ b/Plugin/src/main/resources/enchants/normal/serrated.yml @@ -17,8 +17,12 @@ obtaining: general-config: grindstoneable: true conflicts: - - impaling - bladed + - phantasm + - arachnid + - pacify + - abattoir + - impaling maximum-level: 5 config: diff --git a/Plugin/src/main/resources/enchants/normal/settle.yml b/Plugin/src/main/resources/enchants/normal/settle.yml new file mode 100644 index 00000000..ebfae863 --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/settle.yml @@ -0,0 +1,28 @@ +# +# Settle EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Settle" + +description: Increases damage against creepers. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - power + - force + - revenant + - slaughter + - insecticide + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/slaughter.yml b/Plugin/src/main/resources/enchants/normal/slaughter.yml new file mode 100644 index 00000000..423460a0 --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/slaughter.yml @@ -0,0 +1,28 @@ +# +# Slaughter EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Slaughter" + +description: Increases damage against passive mobs. + +obtaining: + table: true + villager: true + loot: true + rarity: common + +general-config: + grindstoneable: true + conflicts: + - power + - force + - revenant + - insecticide + - settle + maximum-level: 5 + +config: + multiplier: 0.4 # Formula is (multiplier * (level + 1) + 1)*damage | Power is 0.25 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/special/bladed.yml b/Plugin/src/main/resources/enchants/special/bladed.yml index b3372669..2ba711c4 100644 --- a/Plugin/src/main/resources/enchants/special/bladed.yml +++ b/Plugin/src/main/resources/enchants/special/bladed.yml @@ -2,7 +2,7 @@ # Bladed EcoEnchant # -config-version: 4.0 # Don't edit this. +config-version: 4.01 # Don't edit this. name: "Bladed" @@ -19,6 +19,10 @@ general-config: conflicts: - impaling - serrated + - phantasm + - arachnid + - pacify + - abattoir maximum-level: 5 config: diff --git a/Plugin/src/main/resources/enchants/special/force.yml b/Plugin/src/main/resources/enchants/special/force.yml index 283e6e6a..6ae7ae55 100644 --- a/Plugin/src/main/resources/enchants/special/force.yml +++ b/Plugin/src/main/resources/enchants/special/force.yml @@ -2,7 +2,7 @@ # Force EcoEnchant # -config-version: 4.0 # Don't edit this. +config-version: 4.01 # Don't edit this. name: "Force" @@ -18,6 +18,10 @@ general-config: grindstoneable: true conflicts: - power + - revenant + - insecticide + - slaughter + - settle maximum-level: 5 config: diff --git a/Plugin/src/main/resources/plugin.yml b/Plugin/src/main/resources/plugin.yml index 2c8d46c3..c483d754 100644 --- a/Plugin/src/main/resources/plugin.yml +++ b/Plugin/src/main/resources/plugin.yml @@ -225,6 +225,14 @@ permissions: ecoenchants.fromtable.identify: true ecoenchants.fromtable.infuriate: true ecoenchants.fromtable.atmospheric: true + ecoenchants.fromtable.revenant: true + ecoenchants.fromtable.insecticide: true + ecoenchants.fromtable.slaughter: true + ecoenchants.fromtable.settle: true + ecoenchants.fromtable.phantasm: true + ecoenchants.fromtable.arachnid: true + ecoenchants.fromtable.pacify: true + ecoenchants.fromtable.abattoir: true ecoenchants.updateannounce: description: Informs admins of a new update @@ -772,4 +780,28 @@ permissions: default: true ecoenchants.fromtable.atmospheric: description: Allows getting atmospheric from an enchanting table + default: true + ecoenchants.fromtable.revenant: + description: Allows getting revenant from an enchanting table + default: true + ecoenchants.fromtable.insecticide: + description: Allows getting insecticide from an enchanting table + default: true + ecoenchants.fromtable.slaughter: + description: Allows getting slaughter from an enchanting table + default: true + ecoenchants.fromtable.settle: + description: Allows getting settle from an enchanting table + default: true + ecoenchants.fromtable.phantasm: + description: Allows getting phantasm from an enchanting table + default: true + ecoenchants.fromtable.arachnid: + description: Allows getting arachnid from an enchanting table + default: true + ecoenchants.fromtable.pacify: + description: Allows getting pacify from an enchanting table + default: true + ecoenchants.fromtable.abattoir: + description: Allows getting abattoir from an enchanting table default: true \ No newline at end of file