Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Added Revenant, Insecticide, Slaughter, Settle, Phantasm, Arachnid, Pacify, and Abattoir

Browse Source
This commit is contained in:
Auxilor
2020-08-30 10:17:42 +01:00
parent 1e337d23c3
commit b2d1837fba
24 changed files with 634 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
View File

@@ -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

45
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java Normal file
View File

@@ -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);
}
}

46
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java Normal file
View File

@@ -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);
}
}

40
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java Normal file
View File

@@ -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);
}
}

45
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java Normal file
View File

@@ -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);
}
}

46
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java Normal file
View File

@@ -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);
}
}

40
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java Normal file
View File

@@ -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);
}
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java
View File

@@ -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)
);
}

43
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.java Normal file
View File

@@ -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);
}
}

43
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.java Normal file
View File

@@ -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);
}
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java
View File

@@ -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)
);
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java
View File

@@ -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)
);
}