mirror of
https://github.com/Auxilor/EcoEnchants.git
synced 2024-11-25 15:35:11 +01:00
Started integration of new target system
This commit is contained in:
parent
2134e27dfa
commit
c5384fd6e0
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>com.willfp.ecoenchants</groupId>
|
||||
<version>4.1.0-pre20</version>
|
||||
<version>5.0.0-beta1</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
@ -1,29 +0,0 @@
|
||||
package com.willfp.ecoenchants.API;
|
||||
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public interface TargetWrapper {
|
||||
Set<Material> TOOL = new HashSet<>();
|
||||
Set<Material> ROD = new HashSet<>();
|
||||
Set<Material> ARMOR = new HashSet<>();
|
||||
Set<Material> ALL = new HashSet<>();
|
||||
Set<Material> AXE = new HashSet<>();
|
||||
Set<Material> BOOK = new HashSet<>();
|
||||
Set<Material> PICKAXE = new HashSet<>();
|
||||
Set<Material> HOE = new HashSet<>();
|
||||
Set<Material> SHOVEL = new HashSet<>();
|
||||
Set<Material> SWORD = new HashSet<>();
|
||||
Set<Material> HELMET = new HashSet<>();
|
||||
Set<Material> CHESTPLATE = new HashSet<>();
|
||||
Set<Material> LEGGINGS = new HashSet<>();
|
||||
Set<Material> BOOTS = new HashSet<>();
|
||||
Set<Material> ELYTRA = new HashSet<>();
|
||||
Set<Material> BOW = new HashSet<>();
|
||||
Set<Material> CROSSBOW = new HashSet<>();
|
||||
Set<Material> SHEARS = new HashSet<>();
|
||||
Set<Material> TRIDENT = new HashSet<>();
|
||||
Set<Material> SHIELD = new HashSet<>();
|
||||
}
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>com.willfp.ecoenchants</groupId>
|
||||
<version>4.1.0-pre20</version>
|
||||
<version>5.0.0-beta1</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
@ -1,149 +0,0 @@
|
||||
package com.willfp.ecoenchants.v1_15_R1;
|
||||
|
||||
import com.willfp.ecoenchants.API.TargetWrapper;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class Target implements TargetWrapper {
|
||||
|
||||
public final Set<Material> AXE = new HashSet<Material>() {{
|
||||
TargetWrapper.AXE.add(Material.WOODEN_AXE);
|
||||
TargetWrapper.AXE.add(Material.STONE_AXE);
|
||||
TargetWrapper.AXE.add(Material.IRON_AXE);
|
||||
TargetWrapper.AXE.add(Material.GOLDEN_AXE);
|
||||
TargetWrapper.AXE.add(Material.DIAMOND_AXE);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOOK = new HashSet<Material>() {{
|
||||
TargetWrapper.BOOK.add(Material.BOOK);
|
||||
TargetWrapper.BOOK.add(Material.ENCHANTED_BOOK);
|
||||
}};
|
||||
|
||||
public final Set<Material> PICKAXE = new HashSet<Material>() {{
|
||||
TargetWrapper.PICKAXE.add(Material.WOODEN_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.STONE_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.IRON_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.GOLDEN_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.DIAMOND_PICKAXE);
|
||||
}};
|
||||
|
||||
public final Set<Material> HOE = new HashSet<Material>() {{
|
||||
TargetWrapper.HOE.add(Material.WOODEN_HOE);
|
||||
TargetWrapper.HOE.add(Material.STONE_HOE);
|
||||
TargetWrapper.HOE.add(Material.IRON_HOE);
|
||||
TargetWrapper.HOE.add(Material.GOLDEN_HOE);
|
||||
TargetWrapper.HOE.add(Material.DIAMOND_HOE);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHOVEL = new HashSet<Material>() {{
|
||||
TargetWrapper.SHOVEL.add(Material.WOODEN_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.STONE_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.IRON_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.GOLDEN_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.DIAMOND_SHOVEL);
|
||||
}};
|
||||
|
||||
public final Set<Material> SWORD = new HashSet<Material>() {{
|
||||
TargetWrapper.SWORD.add(Material.WOODEN_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.STONE_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.IRON_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.GOLDEN_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.DIAMOND_SWORD);
|
||||
}};
|
||||
|
||||
public final Set<Material> HELMET = new HashSet<Material>() {{
|
||||
TargetWrapper.HELMET.add(Material.TURTLE_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.LEATHER_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.CHAINMAIL_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.IRON_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.GOLDEN_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.DIAMOND_HELMET);
|
||||
}};
|
||||
|
||||
public final Set<Material> CHESTPLATE = new HashSet<Material>() {{
|
||||
TargetWrapper.CHESTPLATE.add(Material.LEATHER_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.CHAINMAIL_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.IRON_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.GOLDEN_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.DIAMOND_CHESTPLATE);
|
||||
}};
|
||||
|
||||
public final Set<Material> LEGGINGS = new HashSet<Material>() {{
|
||||
TargetWrapper.LEGGINGS.add(Material.LEATHER_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.CHAINMAIL_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.IRON_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.GOLDEN_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.DIAMOND_LEGGINGS);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOOTS = new HashSet<Material>() {{
|
||||
TargetWrapper.BOOTS.add(Material.LEATHER_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.CHAINMAIL_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.IRON_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.GOLDEN_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.DIAMOND_BOOTS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ELYTRA = new HashSet<Material>() {{
|
||||
TargetWrapper.ELYTRA.add(Material.ELYTRA);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOW = new HashSet<Material>() {{
|
||||
TargetWrapper.BOW.add(Material.BOW);
|
||||
}};
|
||||
|
||||
public final Set<Material> CROSSBOW = new HashSet<Material>() {{
|
||||
TargetWrapper.CROSSBOW.add(Material.CROSSBOW);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHEARS = new HashSet<Material>() {{
|
||||
TargetWrapper.SHEARS.add(Material.SHEARS);
|
||||
}};
|
||||
|
||||
public final Set<Material> TRIDENT = new HashSet<Material>() {{
|
||||
TargetWrapper.TRIDENT.add(Material.TRIDENT);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHIELD = new HashSet<Material>() {{
|
||||
TargetWrapper.SHIELD.add(Material.SHIELD);
|
||||
}};
|
||||
|
||||
public final Set<Material> ROD = new HashSet<Material>() {{
|
||||
TargetWrapper.ROD.add(Material.FISHING_ROD);
|
||||
}};
|
||||
|
||||
|
||||
public final Set<Material> TOOL = new HashSet<Material>() {{
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.AXE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.PICKAXE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.SHOVEL);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.HOE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.SHEARS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ARMOR = new HashSet<Material>() {{
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.HELMET);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.CHESTPLATE);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.LEGGINGS);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.BOOTS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ALL = new HashSet<Material>() {{
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.TOOL);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ARMOR);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.TRIDENT);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.SHIELD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.BOW);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.CROSSBOW);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ROD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.BOOK);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.SWORD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ELYTRA);
|
||||
}};
|
||||
|
||||
public Target() {
|
||||
|
||||
}
|
||||
}
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>com.willfp.ecoenchants</groupId>
|
||||
<version>4.1.0-pre20</version>
|
||||
<version>5.0.0-beta1</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
@ -1,158 +0,0 @@
|
||||
package com.willfp.ecoenchants.v1_16_R1;
|
||||
|
||||
import com.willfp.ecoenchants.API.TargetWrapper;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class Target implements TargetWrapper {
|
||||
|
||||
public final Set<Material> AXE = new HashSet<Material>() {{
|
||||
TargetWrapper.AXE.add(Material.WOODEN_AXE);
|
||||
TargetWrapper.AXE.add(Material.STONE_AXE);
|
||||
TargetWrapper.AXE.add(Material.IRON_AXE);
|
||||
TargetWrapper.AXE.add(Material.GOLDEN_AXE);
|
||||
TargetWrapper.AXE.add(Material.DIAMOND_AXE);
|
||||
TargetWrapper.AXE.add(Material.NETHERITE_AXE);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOOK = new HashSet<Material>() {{
|
||||
TargetWrapper.BOOK.add(Material.BOOK);
|
||||
TargetWrapper.BOOK.add(Material.ENCHANTED_BOOK);
|
||||
}};
|
||||
|
||||
public final Set<Material> PICKAXE = new HashSet<Material>() {{
|
||||
TargetWrapper.PICKAXE.add(Material.WOODEN_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.STONE_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.IRON_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.GOLDEN_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.DIAMOND_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.NETHERITE_PICKAXE);
|
||||
}};
|
||||
|
||||
public final Set<Material> HOE = new HashSet<Material>() {{
|
||||
TargetWrapper.HOE.add(Material.WOODEN_HOE);
|
||||
TargetWrapper.HOE.add(Material.STONE_HOE);
|
||||
TargetWrapper.HOE.add(Material.IRON_HOE);
|
||||
TargetWrapper.HOE.add(Material.GOLDEN_HOE);
|
||||
TargetWrapper.HOE.add(Material.DIAMOND_HOE);
|
||||
TargetWrapper.HOE.add(Material.NETHERITE_HOE);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHOVEL = new HashSet<Material>() {{
|
||||
TargetWrapper.SHOVEL.add(Material.WOODEN_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.STONE_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.IRON_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.GOLDEN_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.DIAMOND_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.NETHERITE_SHOVEL);
|
||||
}};
|
||||
|
||||
public final Set<Material> SWORD = new HashSet<Material>() {{
|
||||
TargetWrapper.SWORD.add(Material.WOODEN_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.STONE_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.IRON_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.GOLDEN_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.DIAMOND_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.NETHERITE_SWORD);
|
||||
}};
|
||||
|
||||
public final Set<Material> HELMET = new HashSet<Material>() {{
|
||||
TargetWrapper.HELMET.add(Material.TURTLE_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.LEATHER_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.CHAINMAIL_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.IRON_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.GOLDEN_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.DIAMOND_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.NETHERITE_HELMET);
|
||||
}};
|
||||
|
||||
public final Set<Material> CHESTPLATE = new HashSet<Material>() {{
|
||||
TargetWrapper.CHESTPLATE.add(Material.LEATHER_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.CHAINMAIL_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.IRON_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.GOLDEN_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.DIAMOND_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.NETHERITE_CHESTPLATE);
|
||||
}};
|
||||
|
||||
public final Set<Material> LEGGINGS = new HashSet<Material>() {{
|
||||
TargetWrapper.LEGGINGS.add(Material.LEATHER_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.CHAINMAIL_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.IRON_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.GOLDEN_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.DIAMOND_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.NETHERITE_LEGGINGS);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOOTS = new HashSet<Material>() {{
|
||||
TargetWrapper.BOOTS.add(Material.LEATHER_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.CHAINMAIL_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.IRON_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.GOLDEN_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.DIAMOND_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.NETHERITE_BOOTS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ELYTRA = new HashSet<Material>() {{
|
||||
TargetWrapper.ELYTRA.add(Material.ELYTRA);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOW = new HashSet<Material>() {{
|
||||
TargetWrapper.BOW.add(Material.BOW);
|
||||
}};
|
||||
|
||||
public final Set<Material> CROSSBOW = new HashSet<Material>() {{
|
||||
TargetWrapper.CROSSBOW.add(Material.CROSSBOW);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHEARS = new HashSet<Material>() {{
|
||||
TargetWrapper.SHEARS.add(Material.SHEARS);
|
||||
}};
|
||||
|
||||
public final Set<Material> TRIDENT = new HashSet<Material>() {{
|
||||
TargetWrapper.TRIDENT.add(Material.TRIDENT);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHIELD = new HashSet<Material>() {{
|
||||
TargetWrapper.SHIELD.add(Material.SHIELD);
|
||||
}};
|
||||
|
||||
public final Set<Material> ROD = new HashSet<Material>() {{
|
||||
TargetWrapper.ROD.add(Material.FISHING_ROD);
|
||||
}};
|
||||
|
||||
|
||||
public final Set<Material> TOOL = new HashSet<Material>() {{
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.AXE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.PICKAXE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.SHOVEL);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.HOE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.SHEARS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ARMOR = new HashSet<Material>() {{
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.HELMET);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.CHESTPLATE);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.LEGGINGS);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.BOOTS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ALL = new HashSet<Material>() {{
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.TOOL);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ARMOR);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.TRIDENT);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.SHIELD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.BOW);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.CROSSBOW);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ROD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.BOOK);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.SWORD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ELYTRA);
|
||||
}};
|
||||
|
||||
public Target() {
|
||||
|
||||
}
|
||||
}
|
@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>com.willfp.ecoenchants</groupId>
|
||||
<version>4.1.0-pre20</version>
|
||||
<version>5.0.0-beta1</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
@ -1,158 +0,0 @@
|
||||
package com.willfp.ecoenchants.v1_16_R2;
|
||||
|
||||
import com.willfp.ecoenchants.API.TargetWrapper;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class Target implements TargetWrapper {
|
||||
|
||||
public final Set<Material> AXE = new HashSet<Material>() {{
|
||||
TargetWrapper.AXE.add(Material.WOODEN_AXE);
|
||||
TargetWrapper.AXE.add(Material.STONE_AXE);
|
||||
TargetWrapper.AXE.add(Material.IRON_AXE);
|
||||
TargetWrapper.AXE.add(Material.GOLDEN_AXE);
|
||||
TargetWrapper.AXE.add(Material.DIAMOND_AXE);
|
||||
TargetWrapper.AXE.add(Material.NETHERITE_AXE);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOOK = new HashSet<Material>() {{
|
||||
TargetWrapper.BOOK.add(Material.BOOK);
|
||||
TargetWrapper.BOOK.add(Material.ENCHANTED_BOOK);
|
||||
}};
|
||||
|
||||
public final Set<Material> PICKAXE = new HashSet<Material>() {{
|
||||
TargetWrapper.PICKAXE.add(Material.WOODEN_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.STONE_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.IRON_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.GOLDEN_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.DIAMOND_PICKAXE);
|
||||
TargetWrapper.PICKAXE.add(Material.NETHERITE_PICKAXE);
|
||||
}};
|
||||
|
||||
public final Set<Material> HOE = new HashSet<Material>() {{
|
||||
TargetWrapper.HOE.add(Material.WOODEN_HOE);
|
||||
TargetWrapper.HOE.add(Material.STONE_HOE);
|
||||
TargetWrapper.HOE.add(Material.IRON_HOE);
|
||||
TargetWrapper.HOE.add(Material.GOLDEN_HOE);
|
||||
TargetWrapper.HOE.add(Material.DIAMOND_HOE);
|
||||
TargetWrapper.HOE.add(Material.NETHERITE_HOE);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHOVEL = new HashSet<Material>() {{
|
||||
TargetWrapper.SHOVEL.add(Material.WOODEN_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.STONE_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.IRON_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.GOLDEN_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.DIAMOND_SHOVEL);
|
||||
TargetWrapper.SHOVEL.add(Material.NETHERITE_SHOVEL);
|
||||
}};
|
||||
|
||||
public final Set<Material> SWORD = new HashSet<Material>() {{
|
||||
TargetWrapper.SWORD.add(Material.WOODEN_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.STONE_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.IRON_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.GOLDEN_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.DIAMOND_SWORD);
|
||||
TargetWrapper.SWORD.add(Material.NETHERITE_SWORD);
|
||||
}};
|
||||
|
||||
public final Set<Material> HELMET = new HashSet<Material>() {{
|
||||
TargetWrapper.HELMET.add(Material.TURTLE_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.LEATHER_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.CHAINMAIL_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.IRON_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.GOLDEN_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.DIAMOND_HELMET);
|
||||
TargetWrapper.HELMET.add(Material.NETHERITE_HELMET);
|
||||
}};
|
||||
|
||||
public final Set<Material> CHESTPLATE = new HashSet<Material>() {{
|
||||
TargetWrapper.CHESTPLATE.add(Material.LEATHER_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.CHAINMAIL_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.IRON_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.GOLDEN_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.DIAMOND_CHESTPLATE);
|
||||
TargetWrapper.CHESTPLATE.add(Material.NETHERITE_CHESTPLATE);
|
||||
}};
|
||||
|
||||
public final Set<Material> LEGGINGS = new HashSet<Material>() {{
|
||||
TargetWrapper.LEGGINGS.add(Material.LEATHER_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.CHAINMAIL_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.IRON_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.GOLDEN_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.DIAMOND_LEGGINGS);
|
||||
TargetWrapper.LEGGINGS.add(Material.NETHERITE_LEGGINGS);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOOTS = new HashSet<Material>() {{
|
||||
TargetWrapper.BOOTS.add(Material.LEATHER_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.CHAINMAIL_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.IRON_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.GOLDEN_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.DIAMOND_BOOTS);
|
||||
TargetWrapper.BOOTS.add(Material.NETHERITE_BOOTS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ELYTRA = new HashSet<Material>() {{
|
||||
TargetWrapper.ELYTRA.add(Material.ELYTRA);
|
||||
}};
|
||||
|
||||
public final Set<Material> BOW = new HashSet<Material>() {{
|
||||
TargetWrapper.BOW.add(Material.BOW);
|
||||
}};
|
||||
|
||||
public final Set<Material> CROSSBOW = new HashSet<Material>() {{
|
||||
TargetWrapper.CROSSBOW.add(Material.CROSSBOW);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHEARS = new HashSet<Material>() {{
|
||||
TargetWrapper.SHEARS.add(Material.SHEARS);
|
||||
}};
|
||||
|
||||
public final Set<Material> TRIDENT = new HashSet<Material>() {{
|
||||
TargetWrapper.TRIDENT.add(Material.TRIDENT);
|
||||
}};
|
||||
|
||||
public final Set<Material> SHIELD = new HashSet<Material>() {{
|
||||
TargetWrapper.SHIELD.add(Material.SHIELD);
|
||||
}};
|
||||
|
||||
public final Set<Material> ROD = new HashSet<Material>() {{
|
||||
TargetWrapper.ROD.add(Material.FISHING_ROD);
|
||||
}};
|
||||
|
||||
|
||||
public final Set<Material> TOOL = new HashSet<Material>() {{
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.AXE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.PICKAXE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.SHOVEL);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.HOE);
|
||||
TargetWrapper.TOOL.addAll(TargetWrapper.SHEARS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ARMOR = new HashSet<Material>() {{
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.HELMET);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.CHESTPLATE);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.LEGGINGS);
|
||||
TargetWrapper.ARMOR.addAll(TargetWrapper.BOOTS);
|
||||
}};
|
||||
|
||||
public final Set<Material> ALL = new HashSet<Material>() {{
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.TOOL);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ARMOR);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.TRIDENT);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.SHIELD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.BOW);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.CROSSBOW);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ROD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.BOOK);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.SWORD);
|
||||
TargetWrapper.ALL.addAll(TargetWrapper.ELYTRA);
|
||||
}};
|
||||
|
||||
public Target() {
|
||||
|
||||
}
|
||||
}
|
@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<artifactId>parent</artifactId>
|
||||
<groupId>com.willfp.ecoenchants</groupId>
|
||||
<version>4.1.0-pre20</version>
|
||||
<version>5.0.0-beta1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>plugin</artifactId>
|
||||
|
@ -18,6 +18,7 @@ public class EcoEnchantsPlugin extends JavaPlugin {
|
||||
public static final HashMap<String, Double> configVersions = new HashMap<String, Double>() {{
|
||||
put("config", 4.1);
|
||||
put("lang", 4.01);
|
||||
put("target", 1.0);
|
||||
}};
|
||||
|
||||
/**
|
||||
|
@ -3,7 +3,6 @@ package com.willfp.ecoenchants.anvil;
|
||||
import com.willfp.ecoenchants.config.ConfigManager;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.Pair;
|
||||
import org.bukkit.enchantments.Enchantment;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
@ -38,7 +38,7 @@ public class CommandEcoreload implements CommandExecutor {
|
||||
HandlerList.unregisterAll(ecoEnchant);
|
||||
|
||||
Bukkit.getScheduler().runTaskLater(EcoEnchantsPlugin.getInstance(), () -> {
|
||||
if(!ecoEnchant.isDisabled()) {
|
||||
if(!ecoEnchant.isEnabled()) {
|
||||
Bukkit.getPluginManager().registerEvents(ecoEnchant, EcoEnchantsPlugin.getInstance());
|
||||
}
|
||||
}, 1);
|
||||
|
@ -3,6 +3,7 @@ package com.willfp.ecoenchants.config;
|
||||
import com.willfp.ecoenchants.config.configs.Config;
|
||||
import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
|
||||
import com.willfp.ecoenchants.config.configs.Lang;
|
||||
import com.willfp.ecoenchants.config.configs.Target;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
@ -10,6 +11,7 @@ import java.util.Set;
|
||||
public class ConfigManager {
|
||||
private static final Lang LANG = new Lang();
|
||||
private static final Config CONFIG = new Config();
|
||||
private static final Target TARGET = new Target();
|
||||
private static final Set<EnchantmentConfig> enchantmentConfigs = new HashSet<>();
|
||||
|
||||
/**
|
||||
@ -19,6 +21,7 @@ public class ConfigManager {
|
||||
public static void updateConfigs() {
|
||||
LANG.reload();
|
||||
CONFIG.reload();
|
||||
TARGET.reload();
|
||||
updateEnchantmentConfigs();
|
||||
}
|
||||
|
||||
@ -69,4 +72,12 @@ public class ConfigManager {
|
||||
public static Config getConfig() {
|
||||
return CONFIG;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get target.yml
|
||||
* @return target.yml
|
||||
*/
|
||||
public static Target getTarget() {
|
||||
return TARGET;
|
||||
}
|
||||
}
|
@ -2,7 +2,9 @@ package com.willfp.ecoenchants.config.configs;
|
||||
|
||||
import com.willfp.ecoenchants.config.EnchantmentYamlConfig;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.EnchantmentRarity;
|
||||
import com.willfp.ecoenchants.enchantments.EnchantmentTarget;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.enchantments.Enchantment;
|
||||
@ -83,14 +85,13 @@ public class EnchantmentConfig extends EnchantmentYamlConfig {
|
||||
return EnchantmentRarity.getByName(rarityName);
|
||||
}
|
||||
|
||||
public Set<Material> getTarget(Set<Material> initialTarget) {
|
||||
List<String> targetName = config.getStringList("general-config.target");
|
||||
if(targetName == null || targetName.isEmpty()) return initialTarget;
|
||||
public Set<EnchantmentTarget> getTargets() {
|
||||
List<String> targetNames = config.getStringList(EcoEnchants.GENERAL_LOCATION + "targets");
|
||||
if(targetNames == null || targetNames.isEmpty()) return new HashSet<>();
|
||||
Set<EnchantmentTarget> targets = new HashSet<>();
|
||||
|
||||
Set<Material> targets = new HashSet<>();
|
||||
targetName.forEach((s -> {
|
||||
Material mat = Material.getMaterial(s.toUpperCase());
|
||||
targets.add(mat);
|
||||
targetNames.forEach((s -> {
|
||||
targets.add(EnchantmentTarget.getByName(s));
|
||||
}));
|
||||
|
||||
return targets;
|
||||
|
@ -0,0 +1,32 @@
|
||||
package com.willfp.ecoenchants.config.configs;
|
||||
|
||||
import com.willfp.ecoenchants.config.YamlConfig;
|
||||
import com.willfp.ecoenchants.enchantments.EnchantmentTarget;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Wrapper for config.yml
|
||||
*/
|
||||
public class Target extends YamlConfig {
|
||||
public Target() {
|
||||
super("target");
|
||||
}
|
||||
|
||||
public Set<String> getTargets() {
|
||||
return config.getConfigurationSection("targets").getKeys(false);
|
||||
}
|
||||
|
||||
public Set<Material> getTargetMaterials(String target) {
|
||||
Set<Material> materials = new HashSet<>();
|
||||
config.getStringList("targets." + target).forEach((materialName) -> {
|
||||
materials.add(Material.getMaterial(materialName.toUpperCase()));
|
||||
});
|
||||
|
||||
return materials;
|
||||
}
|
||||
}
|
@ -5,7 +5,6 @@ import com.willfp.ecoenchants.EcoEnchantsPlugin;
|
||||
import com.willfp.ecoenchants.config.ConfigManager;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.apache.commons.lang.WordUtils;
|
||||
import org.bukkit.ChatColor;
|
||||
@ -201,7 +200,7 @@ public class EnchantDisplay {
|
||||
name = enchantment.getName();
|
||||
description = EcoEnchants.getFromEnchantment(enchantment).getDescription();
|
||||
description.replaceAll(line -> descriptionColor + line);
|
||||
if(EcoEnchants.getFromEnchantment(enchantment).isDisabled()) forRemoval.add(enchantment);
|
||||
if(EcoEnchants.getFromEnchantment(enchantment).isEnabled()) forRemoval.add(enchantment);
|
||||
} else {
|
||||
name = ConfigManager.getLang().getString("vanilla." + enchantment.getKey().getKey() + ".name");
|
||||
description = Arrays.asList(WordUtils.wrap(ConfigManager.getLang().getString("vanilla." + enchantment.getKey().getKey() + ".description"), ConfigManager.getConfig().getInt("lore.describe.wrap"), "\n", false).split("\\r?\\n"));
|
||||
|
@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments;
|
||||
import com.google.common.util.concurrent.AtomicDouble;
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.nms.TridentStack;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.Location;
|
||||
|
@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments;
|
||||
|
||||
import com.willfp.ecoenchants.config.ConfigManager;
|
||||
import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import org.apache.commons.lang.WordUtils;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.NamespacedKey;
|
||||
@ -18,7 +17,6 @@ import java.util.*;
|
||||
public abstract class EcoEnchant extends Enchantment implements Listener {
|
||||
private String name;
|
||||
private String description;
|
||||
private Set<Material> target;
|
||||
private final String permissionName;
|
||||
private final EnchantmentType type;
|
||||
|
||||
@ -32,8 +30,9 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
|
||||
private int maxLvl;
|
||||
private Set<Enchantment> conflicts;
|
||||
private EnchantmentRarity rarity;
|
||||
private Set<Material> target;
|
||||
|
||||
private boolean disabled;
|
||||
private boolean enabled;
|
||||
|
||||
/**
|
||||
* Create new EcoEnchant matching builder
|
||||
@ -45,7 +44,6 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
|
||||
|
||||
this.type = builder.type;
|
||||
this.name = builder.name;
|
||||
this.target = builder.target;
|
||||
this.permissionName = builder.permission;
|
||||
this.configVersion = builder.configVersion;
|
||||
this.config = builder.config;
|
||||
@ -67,8 +65,9 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
|
||||
maxLvl = config.getInt(EcoEnchants.GENERAL_LOCATION + "maximum-level", 1);
|
||||
name = config.getString("name");
|
||||
description = config.getString("description");
|
||||
target = config.getTarget(target);
|
||||
disabled = config.getBool("disabled", false);
|
||||
target.clear();
|
||||
config.getTargets().forEach(enchantmentTarget -> target.addAll(enchantmentTarget.getMaterials()));
|
||||
enabled = config.getBool("enabled", true);
|
||||
|
||||
this.register();
|
||||
}
|
||||
@ -131,11 +130,11 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get if enchantment is disabled
|
||||
* @return If disabled
|
||||
* Get if enchantment is enabled
|
||||
* @return If enabled
|
||||
*/
|
||||
public boolean isDisabled() {
|
||||
return this.disabled;
|
||||
public boolean isEnabled() {
|
||||
return this.enabled;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -204,7 +203,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the {@link Target} of enchantment
|
||||
* Get the target of enchantment
|
||||
* @return Set of enchantable items
|
||||
*/
|
||||
public Set<Material> getTarget() {
|
||||
@ -307,7 +306,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
|
||||
*/
|
||||
@Override
|
||||
public boolean canEnchantItem(ItemStack itemStack) {
|
||||
return target.contains(itemStack.getType()) || Target.Applicable.BOOK.getMaterials().contains(itemStack.getType());
|
||||
return target.contains(itemStack.getType()) || itemStack.getType().equals(Material.BOOK) || itemStack.getType().equals(Material.ENCHANTED_BOOK);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -3,19 +3,13 @@ package com.willfp.ecoenchants.enchantments;
|
||||
import com.willfp.ecoenchants.EcoEnchantsPlugin;
|
||||
import com.willfp.ecoenchants.config.ConfigManager;
|
||||
import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class EcoEnchantBuilder {
|
||||
public final String name;
|
||||
public final String key;
|
||||
public final String permission;
|
||||
public final Set<Material> target;
|
||||
public double configVersion;
|
||||
public final EnchantmentConfig config;
|
||||
public Class<?> plugin;
|
||||
@ -27,38 +21,10 @@ public class EcoEnchantBuilder {
|
||||
*
|
||||
* @param key The enchantment key name
|
||||
* @param type The enchantment type
|
||||
* @param applicable The materials that the enchantment can be applied to
|
||||
* @param version The config version
|
||||
*/
|
||||
public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable applicable, double version) {
|
||||
this(key, type, new Target.Applicable[]{applicable}, version);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates new EcoEnchantBuilder
|
||||
* Use for extensions
|
||||
*
|
||||
* @param key The enchantment key name
|
||||
* @param type The enchantment type
|
||||
* @param applicable The materials that the enchantment can be applied to
|
||||
* @param version The config version
|
||||
* @param plugin The main class of extension
|
||||
*/
|
||||
public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable applicable, double version, Class<?> plugin) {
|
||||
this(key, type, new Target.Applicable[]{applicable}, version, plugin);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates new EcoEnchantBuilder
|
||||
* Only used by base enchantments, do not use for extensions.
|
||||
*
|
||||
* @param key The enchantment key name
|
||||
* @param type The enchantment type
|
||||
* @param applicable The materials that the enchantment can be applied to
|
||||
* @param version The config version
|
||||
*/
|
||||
public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable[] applicable, double version) {
|
||||
this(key, type, applicable, version, EcoEnchantsPlugin.class);
|
||||
public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, double version) {
|
||||
this(key, type, version, EcoEnchantsPlugin.class);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -67,54 +33,14 @@ public class EcoEnchantBuilder {
|
||||
*
|
||||
* @param key The enchantment key name
|
||||
* @param type The enchantment type
|
||||
* @param applicable The materials that the enchantment can be applied to
|
||||
* @param version The config version
|
||||
* @param plugin The main class of extension
|
||||
*/
|
||||
public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable[] applicable, double version, Class<?> plugin) {
|
||||
public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, double version, Class<?> plugin) {
|
||||
if(Pattern.matches("[a-z_]", key)) throw new InvalidEnchantmentException("Key must only contain lowercase letters and underscores");
|
||||
this.key = key;
|
||||
this.permission = key.replace("_","");
|
||||
|
||||
Set<Material> target = new HashSet<>();
|
||||
Arrays.asList(applicable).forEach((applicable1 -> {
|
||||
target.addAll(applicable1.getMaterials());
|
||||
}));
|
||||
|
||||
this.target = target;
|
||||
|
||||
this.type = type;
|
||||
|
||||
this.plugin = plugin;
|
||||
|
||||
this.configVersion = version;
|
||||
|
||||
ConfigManager.addEnchantmentConfig(new EnchantmentConfig(permission, configVersion, plugin, this.type));
|
||||
this.config = ConfigManager.getEnchantmentConfig(permission);
|
||||
|
||||
this.name = config.getString("name");
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates new EcoEnchantBuilder for Extension
|
||||
* Use for extensions
|
||||
*
|
||||
* @param key The enchantment key name
|
||||
* @param type The enchantment type
|
||||
* @param target The materials that the enchantment can be applied to
|
||||
* @param version The config version
|
||||
* @param plugin The main class of extension
|
||||
*
|
||||
* @deprecated Use {@link Target.Applicable} instead
|
||||
*/
|
||||
@Deprecated
|
||||
public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Set<Material> target, double version, Class<?> plugin) {
|
||||
if(Pattern.matches("[a-z_]", key)) throw new InvalidEnchantmentException("Key must only contain lowercase letters and underscores");
|
||||
this.key = key;
|
||||
this.permission = key.replace("_","");
|
||||
|
||||
this.target = target;
|
||||
|
||||
this.type = type;
|
||||
|
||||
this.plugin = plugin;
|
||||
|
@ -0,0 +1,98 @@
|
||||
package com.willfp.ecoenchants.enchantments;
|
||||
|
||||
import com.willfp.ecoenchants.config.ConfigManager;
|
||||
import org.bukkit.Material;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Class for storing all enchantment rarities
|
||||
*/
|
||||
public class EnchantmentTarget {
|
||||
private static final Set<EnchantmentTarget> targets = new HashSet<>();
|
||||
public static final Set<Material> ALL = new HashSet<>();
|
||||
|
||||
private final String name;
|
||||
private final Set<Material> materials;
|
||||
|
||||
/**
|
||||
* Create new EnchantmentRarity
|
||||
* @param name The name of the rarity
|
||||
* @paran materials The items for the target
|
||||
*/
|
||||
public EnchantmentTarget(String name, Set<Material> materials) {
|
||||
this(name, materials, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create new EnchantmentRarity
|
||||
* @param name The name of the rarity
|
||||
* @paran materials The items for the target
|
||||
* @param noRegister Dont register internally
|
||||
*/
|
||||
public EnchantmentTarget(String name, Set<Material> materials, boolean noRegister) {
|
||||
Optional<EnchantmentTarget> matching = targets.stream().filter(rarity -> rarity.getName().equalsIgnoreCase(name)).findFirst();
|
||||
matching.ifPresent(targets::remove);
|
||||
matching.ifPresent(enchantmentTarget -> ALL.removeAll(enchantmentTarget.getMaterials()));
|
||||
|
||||
this.name = name;
|
||||
this.materials = materials;
|
||||
|
||||
if(!noRegister) {
|
||||
targets.add(this);
|
||||
ALL.addAll(materials);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the name of the rarity
|
||||
* @return The name
|
||||
*/
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the materials of the rarity
|
||||
* @return The materials
|
||||
*/
|
||||
public Set<Material> getMaterials() {
|
||||
return this.materials;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get EnchantmentTarget matching name
|
||||
* @param name The name to search for
|
||||
* @return The matching EnchantmentTarget, or null if not found
|
||||
*/
|
||||
public static EnchantmentTarget getByName(String name) {
|
||||
if(name.equalsIgnoreCase("all")) return new EnchantmentTarget("all", EnchantmentTarget.ALL, true);
|
||||
|
||||
Optional<EnchantmentTarget> matching = targets.stream().filter(rarity -> rarity.getName().equalsIgnoreCase(name)).findFirst();
|
||||
return matching.orElse(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update all targets
|
||||
* Called on /ecoreload
|
||||
*/
|
||||
public static void update() {
|
||||
Set<String> targetNames = ConfigManager.getTarget().getTargets();
|
||||
targetNames.forEach((target) -> {
|
||||
String name = target;
|
||||
Set<Material> materials = ConfigManager.getTarget().getTargetMaterials(target);
|
||||
|
||||
new EnchantmentTarget(name, materials);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all rarities
|
||||
* @return A set of all rarities
|
||||
*/
|
||||
public static Set<EnchantmentTarget> getAll() {
|
||||
return targets;
|
||||
}
|
||||
}
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.EcoRunnable;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.VectorUtils;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Monster;
|
||||
|
@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.EcoRunnable;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.ItemDurability;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.Repairable;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.player.PlayerItemDamageEvent;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Monster;
|
||||
|
@ -4,7 +4,6 @@ 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.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.FoodLevelChangeEvent;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse;
|
||||
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
|
||||
public class PermanenceCurse extends EcoEnchant {
|
||||
public PermanenceCurse() {
|
||||
super(
|
||||
|
@ -4,9 +4,7 @@ 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;
|
||||
|
@ -6,7 +6,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.ItemDurability;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -5,7 +5,6 @@ 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;
|
||||
|
@ -4,7 +4,6 @@ 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.Material;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -4,10 +4,7 @@ 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;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -5,10 +5,7 @@ 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.Bukkit;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Trident;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.queue.DropQueue;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.Material;
|
||||
|
@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
|
||||
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
|
||||
import com.willfp.ecoenchants.nms.BlockBreak;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -7,7 +7,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.NumberUtils;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.Boss;
|
||||
import org.bukkit.entity.ElderGuardian;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.SoundCategory;
|
||||
|
@ -4,7 +4,6 @@ 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.LivingEntity;
|
||||
import org.bukkit.entity.Monster;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
|
@ -7,7 +7,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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 com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
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.ItemDurability;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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;
|
||||
|
@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
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.entity.Tameable;
|
||||
|
@ -5,7 +5,6 @@ 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 org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.Creeper;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.attribute.Attribute;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -6,7 +6,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.World;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||
|
@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
|
||||
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
|
||||
import com.willfp.ecoenchants.nms.BlockBreak;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.VectorUtils;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -6,7 +6,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.Lightning;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -4,7 +4,6 @@ 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.World;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.World;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -5,7 +5,6 @@ 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.nms.TridentStack;
|
||||
import org.bukkit.attribute.Attribute;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -6,7 +6,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.ItemDurability;
|
||||
import com.willfp.ecoenchants.util.VectorShapes;
|
||||
import org.bukkit.Location;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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.attribute.Attribute;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchants;
|
||||
import com.willfp.ecoenchants.enchantments.EcoRunnable;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Monster;
|
||||
public class Forcefield extends EcoEnchant implements EcoRunnable {
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -5,7 +5,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -6,7 +6,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.VectorUtils;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.*;
|
||||
|
@ -4,7 +4,6 @@ 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.attribute.Attribute;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.util.NumberUtils;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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 org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -5,7 +5,6 @@ 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.ItemDurability;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.ItemDurability;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,10 +4,8 @@ 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.World;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Trident;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -5,7 +5,6 @@ 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 org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -4,7 +4,6 @@ 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.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -5,7 +5,6 @@ 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.NumberUtils;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -5,7 +5,6 @@ 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.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.NumberUtils;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
|
@ -6,7 +6,6 @@ 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.Cooldown;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
@ -4,7 +4,6 @@ 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 com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
|
@ -5,7 +5,6 @@ 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.Bukkit;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.queue.DropQueue;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.GameMode;
|
||||
|
@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchant;
|
||||
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
|
||||
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.nms.TridentStack;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
|
@ -5,7 +5,6 @@ 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.VectorUtils;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.*;
|
||||
|
@ -4,7 +4,6 @@ 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;
|
||||
|
@ -5,7 +5,6 @@ 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.anticheat.AnticheatManager;
|
||||
import com.willfp.ecoenchants.nms.Target;
|
||||
import com.willfp.ecoenchants.util.NumberUtils;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user