Moved Anticheat + Antigrief integrations into eco-util

build.gradle

@@ -22,6 +22,25 @@ allprojects {
         maven { url 'https://jitpack.io' }
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
         maven { url 'https://repo.codemc.org/repository/nms/' }
+        maven { url 'https://repo.codemc.org/repository/maven-public' }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+        maven { url 'https://oss.sonatype.org/content/groups/public/' }
+        maven { url 'https://maven.enginehub.org/repo/' }
+        maven { url 'https://ci.ender.zone/plugin/repository/project/' }
+        maven { url 'https://ci.ender.zone/plugin/repository/everything/' }
+        maven { url 'https://repo.md-5.net/content/repositories/snapshots/' }
+        maven { url 'https://repo.dmulloy2.net/nexus/repository/public/' }
+        maven { url 'https://papermc.io/repo/repository/maven-public/' }
+        maven { url 'https://repo.maven.apache.org/maven2/' }
+        maven { url 'https://repo.dustplanet.de/artifactory/ext-release-local/' }
+        maven { url 'https://maven.seyfahni.de/repository/snapshots/' }
+        maven { url 'https://libraries.minecraft.net/' }
+        maven { url 'https://repo.spongepowered.org/maven/' }
+        maven { url 'https://org.kitteh.pastegg' }
+        maven { url 'https://repo.mikeprimm.com/' }
+        maven { url 'https://maven.sk89q.com/repo/' }
+        maven { url 'https://github.com/factions-site/repo/raw/public/' }
+        maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
     }
 
     jar {

eco-core/core-plugin/build.gradle

@@ -1,46 +1,13 @@
 group 'com.willfp'
 version rootProject.version
 
-repositories {
-    maven { url 'https://repo.codemc.org/repository/maven-public' }
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-    maven { url 'https://oss.sonatype.org/content/groups/public/' }
-    maven { url 'https://maven.enginehub.org/repo/' }
-    maven { url 'https://ci.ender.zone/plugin/repository/project/' }
-    maven { url 'https://ci.ender.zone/plugin/repository/everything/' }
-    maven { url 'https://repo.md-5.net/content/repositories/snapshots/' }
-    maven { url 'https://repo.dmulloy2.net/nexus/repository/public/' }
-    maven { url 'https://papermc.io/repo/repository/maven-public/' }
-    maven { url 'https://repo.maven.apache.org/maven2/' }
-    maven { url 'https://repo.dustplanet.de/artifactory/ext-release-local/' }
-    maven { url 'https://maven.seyfahni.de/repository/snapshots/' }
-    maven { url 'https://libraries.minecraft.net/' }
-    maven { url 'https://repo.spongepowered.org/maven/' }
-    maven { url 'https://org.kitteh.pastegg' }
-    maven { url 'https://repo.mikeprimm.com/' }
-    maven { url 'https://maven.sk89q.com/repo/' }
-    maven { url 'https://github.com/factions-site/repo/raw/public/' }
-    maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
-}
-
 dependencies {
     compileOnly project(":eco-core:core-proxy")
-
     compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
     compileOnly 'commons-io:commons-io:2.8.0'
-    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT'
-    compileOnly 'com.github.TechFortress:GriefPrevention:16.14.0'
-    compileOnly 'com.massivecraft:Factions:1.6.9.5-U0.5.10'
-    compileOnly 'com.github.cryptomorin:kingdoms:1.10.3.1'
-    compileOnly 'com.github.TownyAdvanced:Towny:0.96.2.0'
-    compileOnly 'com.github.angeschossen:LandsAPI:4.7.3'
-    compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
-    compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
     compileOnly 'net.ess3:EssentialsX:2.18.1'
     compileOnly 'com.destroystokyo.paper:paper-api:1.16.3-R0.1-SNAPSHOT'
     compileOnly 'com.gmail.nossr50.mcMMO:mcMMO:2.1.157'
     compileOnly 'me.clip:placeholderapi:2.10.9'
-    shadow files('../../lib/SpartanAPI.jar')
-    shadow files('../../lib/aac-api-5.0.0.jar')
 }

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java

@@ -29,18 +29,6 @@
 import com.willfp.ecoenchants.enchantments.support.obtaining.LootPopulator;
 import com.willfp.ecoenchants.enchantments.support.obtaining.VillagerListeners;
 import com.willfp.ecoenchants.enchantments.util.WatcherTriggers;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatAAC;
-import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatMatrix;
-import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatNCP;
-import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatSpartan;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefFactionsUUID;
-import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefGriefPrevention;
-import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefKingdoms;
-import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefLands;
-import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefTowny;
-import com.willfp.ecoenchants.integrations.antigrief.plugins.AntigriefWorldGuard;
 import com.willfp.ecoenchants.integrations.essentials.EssentialsManager;
 import com.willfp.ecoenchants.integrations.essentials.plugins.IntegrationEssentials;
 import com.willfp.ecoenchants.integrations.mcmmo.McmmoManager;
@@ -143,22 +131,9 @@ public void postLoad() {
     @Override
     public List<IntegrationLoader> getIntegrations() {
         return Arrays.asList(
-                // AntiGrief
                 new IntegrationLoader("WorldGuard", () -> {
-                    AntigriefManager.register(new AntigriefWorldGuard());
                     WorldguardManager.register(new WorldguardIntegrationImpl());
                 }),
-                new IntegrationLoader("GriefPrevention", () -> AntigriefManager.register(new AntigriefGriefPrevention())),
-                new IntegrationLoader("FactionsUUID", () -> AntigriefManager.register(new AntigriefFactionsUUID())),
-                new IntegrationLoader("Towny", () -> AntigriefManager.register(new AntigriefTowny())),
-                new IntegrationLoader("Lands", () -> AntigriefManager.register(new AntigriefLands(this))),
-                new IntegrationLoader("Kingdoms", () -> AntigriefManager.register(new AntigriefKingdoms())),
-
-                // AntiCheat
-                new IntegrationLoader("AAC", () -> AnticheatManager.register(new AnticheatAAC())),
-                new IntegrationLoader("Matrix", () -> AnticheatManager.register(new AnticheatMatrix())),
-                new IntegrationLoader("NoCheatPlus", () -> AnticheatManager.register(new AnticheatNCP())),
-                new IntegrationLoader("Spartan", () -> AnticheatManager.register(new AnticheatSpartan())),
 
                 // MISC
                 new IntegrationLoader("Essentials", () -> EssentialsManager.register(new IntegrationEssentials())),

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java

@@ -19,7 +19,9 @@ public Abattoir() {
 
     @Override
     public void onTridentDamage(LivingEntity attacker, LivingEntity victim, Trident trident, int level, EntityDamageByEntityEvent event) {
-        if(victim instanceof Monster) return;
+        if (victim instanceof Monster) {
+            return;
+        }
 
         double damage = event.getDamage();
         double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier");

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java

@@ -5,8 +5,8 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Particle;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java

@@ -6,8 +6,8 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockBreakEvent;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java

@@ -6,7 +6,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java

@@ -5,7 +5,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java

@@ -5,7 +5,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Ignite.java

@@ -3,7 +3,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java

@@ -5,7 +5,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Instantaneous.java

@@ -3,7 +3,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockDamageEvent;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java

@@ -6,8 +6,8 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java

@@ -6,8 +6,8 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java

@@ -5,7 +5,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java

@@ -4,7 +4,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java

@@ -6,7 +6,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tectonic.java

@@ -3,7 +3,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java

@@ -10,7 +10,7 @@
 import com.willfp.ecoenchants.enchantments.ecoenchants.special.Soulbound;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java

@@ -6,8 +6,8 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java

@@ -4,7 +4,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java

@@ -4,7 +4,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java

@@ -6,7 +6,7 @@
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java

@@ -4,8 +4,8 @@
 import com.willfp.eco.util.ProxyUtils;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.itemtypes.Spell;
-import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.Particle;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Quake.java

@@ -2,7 +2,7 @@
 
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.itemtypes.Spell;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java

@@ -87,7 +87,6 @@ public void enchantItem(EnchantItemEvent event) {
         boolean gotSpecial = false;
 
         for (EcoEnchant enchantment : enchantments) {
-
             if (!enchantment.canEnchantItem(item))
                 continue;
             if (NumberUtils.randFloat(0, 1) > enchantment.getRarity().getProbability() * multiplier)

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java

@@ -7,7 +7,7 @@
 import com.willfp.eco.util.injection.PluginDependent;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
-import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.ecoenchants.integrations.mcmmo.McmmoManager;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

eco-core/core-proxy/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java

@@ -1,9 +1,10 @@
 package com.willfp.eco.core.proxy;
 
-import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Map;
 
 public class ProxyFactory<T extends AbstractProxy> {
-    private static final HashMap<Class<? extends AbstractProxy>, Object> CACHE = new HashMap<>();
+    private static final Map<Class<? extends AbstractProxy>, Object> CACHE = new IdentityHashMap<>();
 
     private final Class<T> proxyClass;
 

eco-util/build.gradle

@@ -11,4 +11,14 @@ dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
     compileOnly 'me.clip:placeholderapi:2.10.9'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
+    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.4-SNAPSHOT'
+    compileOnly 'com.github.TechFortress:GriefPrevention:16.14.0'
+    compileOnly 'com.massivecraft:Factions:1.6.9.5-U0.5.10'
+    compileOnly 'com.github.cryptomorin:kingdoms:1.10.3.1'
+    compileOnly 'com.github.TownyAdvanced:Towny:0.96.2.0'
+    compileOnly 'com.github.angeschossen:LandsAPI:4.7.3'
+    compileOnly 'fr.neatmonster:nocheatplus:3.16.1-SNAPSHOT'
+    compileOnly 'com.github.jiangdashao:matrix-api-repo:317d4635fd'
+    shadow files('../../lib/SpartanAPI.jar')
+    shadow files('../../lib/aac-api-5.0.0.jar')
 }

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/anticheat/AnticheatManager.java → eco-util/src/main/java/com/willfp/eco/util/integrations/anticheat/AnticheatManager.java

@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.integrations.anticheat;
+package com.willfp.eco.util.integrations.anticheat;
 
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import org.bukkit.entity.Player;

eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/anticheat/AnticheatWrapper.java → eco-util/src/main/java/com/willfp/eco/util/integrations/anticheat/AnticheatWrapper.java

@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.integrations.anticheat;
+package com.willfp.eco.util.integrations.anticheat;
 
 import com.willfp.eco.util.integrations.Integration;
 import org.bukkit.entity.Player;