diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar b/local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar rename to local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.md5 b/local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.md5 rename to local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.sha1 b/local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.sha1 rename to local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.jar.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom b/local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom rename to local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.md5 b/local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.md5 rename to local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.sha1 b/local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.sha1 rename to local-repo/net/Indyuce/mmocore/lib/CMI/8.6.5.0/CMI-8.6.5.0.pom.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/maven-metadata.xml b/local-repo/net/Indyuce/mmocore/lib/CMI/maven-metadata.xml similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/maven-metadata.xml rename to local-repo/net/Indyuce/mmocore/lib/CMI/maven-metadata.xml diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/maven-metadata.xml.md5 b/local-repo/net/Indyuce/mmocore/lib/CMI/maven-metadata.xml.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/maven-metadata.xml.md5 rename to local-repo/net/Indyuce/mmocore/lib/CMI/maven-metadata.xml.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/CMI/maven-metadata.xml.sha1 b/local-repo/net/Indyuce/mmocore/lib/CMI/maven-metadata.xml.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/CMI/maven-metadata.xml.sha1 rename to local-repo/net/Indyuce/mmocore/lib/CMI/maven-metadata.xml.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.jar b/local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.jar similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.jar rename to local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.jar diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.jar.md5 b/local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.jar.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.jar.md5 rename to local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.jar.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.jar.sha1 b/local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.jar.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.jar.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.jar.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.pom b/local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.pom similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.pom rename to local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.pom diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.pom.md5 b/local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.pom.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.pom.md5 rename to local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.pom.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.pom.sha1 b/local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.pom.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/2.0.25/Citizens-2.0.25.pom.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Citizens/2.0.25/Citizens-2.0.25.pom.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/maven-metadata.xml b/local-repo/net/Indyuce/mmocore/lib/Citizens/maven-metadata.xml similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/maven-metadata.xml rename to local-repo/net/Indyuce/mmocore/lib/Citizens/maven-metadata.xml diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/maven-metadata.xml.md5 b/local-repo/net/Indyuce/mmocore/lib/Citizens/maven-metadata.xml.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/maven-metadata.xml.md5 rename to local-repo/net/Indyuce/mmocore/lib/Citizens/maven-metadata.xml.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Citizens/maven-metadata.xml.sha1 b/local-repo/net/Indyuce/mmocore/lib/Citizens/maven-metadata.xml.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Citizens/maven-metadata.xml.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Citizens/maven-metadata.xml.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.md5 b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.md5 rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.sha1 b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.sha1 rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.jar.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.md5 b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.md5 rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.sha1 b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.sha1 rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/2.8.5/GoogleGSON-2.8.5.pom.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/maven-metadata.xml b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/maven-metadata.xml similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/maven-metadata.xml rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/maven-metadata.xml diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/maven-metadata.xml.md5 b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/maven-metadata.xml.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/maven-metadata.xml.md5 rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/maven-metadata.xml.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/maven-metadata.xml.sha1 b/local-repo/net/Indyuce/mmocore/lib/GoogleGSON/maven-metadata.xml.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/GoogleGSON/maven-metadata.xml.sha1 rename to local-repo/net/Indyuce/mmocore/lib/GoogleGSON/maven-metadata.xml.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.jar b/local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.jar similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.jar rename to local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.jar diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.jar.md5 b/local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.jar.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.jar.md5 rename to local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.jar.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.jar.sha1 b/local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.jar.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.jar.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.jar.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.pom b/local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.pom similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.pom rename to local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.pom diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.pom.md5 b/local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.pom.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.pom.md5 rename to local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.pom.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.pom.sha1 b/local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.pom.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/2.9.1/Holograms-2.9.1.pom.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Holograms/2.9.1/Holograms-2.9.1.pom.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/maven-metadata.xml b/local-repo/net/Indyuce/mmocore/lib/Holograms/maven-metadata.xml similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/maven-metadata.xml rename to local-repo/net/Indyuce/mmocore/lib/Holograms/maven-metadata.xml diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/maven-metadata.xml.md5 b/local-repo/net/Indyuce/mmocore/lib/Holograms/maven-metadata.xml.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/maven-metadata.xml.md5 rename to local-repo/net/Indyuce/mmocore/lib/Holograms/maven-metadata.xml.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Holograms/maven-metadata.xml.sha1 b/local-repo/net/Indyuce/mmocore/lib/Holograms/maven-metadata.xml.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Holograms/maven-metadata.xml.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Holograms/maven-metadata.xml.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.md5 b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.md5 rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.sha1 b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.sha1 rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.jar.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.md5 b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.md5 rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.sha1 b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.sha1 rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/2.4.6/HolographicDisplays-2.4.6.pom.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/maven-metadata.xml b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/maven-metadata.xml similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/maven-metadata.xml rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/maven-metadata.xml diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/maven-metadata.xml.md5 b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/maven-metadata.xml.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/maven-metadata.xml.md5 rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/maven-metadata.xml.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/maven-metadata.xml.sha1 b/local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/maven-metadata.xml.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/HolographicDisplays/maven-metadata.xml.sha1 rename to local-repo/net/Indyuce/mmocore/lib/HolographicDisplays/maven-metadata.xml.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar b/local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar rename to local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.md5 b/local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.md5 rename to local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.sha1 b/local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.jar.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom b/local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom rename to local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.md5 b/local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.md5 rename to local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.sha1 b/local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Residence/4.8.7.2/Residence-4.8.7.2.pom.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/maven-metadata.xml b/local-repo/net/Indyuce/mmocore/lib/Residence/maven-metadata.xml similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/maven-metadata.xml rename to local-repo/net/Indyuce/mmocore/lib/Residence/maven-metadata.xml diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/maven-metadata.xml.md5 b/local-repo/net/Indyuce/mmocore/lib/Residence/maven-metadata.xml.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/maven-metadata.xml.md5 rename to local-repo/net/Indyuce/mmocore/lib/Residence/maven-metadata.xml.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/Residence/maven-metadata.xml.sha1 b/local-repo/net/Indyuce/mmocore/lib/Residence/maven-metadata.xml.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/Residence/maven-metadata.xml.sha1 rename to local-repo/net/Indyuce/mmocore/lib/Residence/maven-metadata.xml.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.md5 b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.md5 rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.sha1 b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.sha1 rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.jar.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.md5 b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.md5 rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.sha1 b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.sha1 rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/1.0/SpartanAPI-1.0.pom.sha1 diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/maven-metadata.xml b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/maven-metadata.xml similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/maven-metadata.xml rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/maven-metadata.xml diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/maven-metadata.xml.md5 b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/maven-metadata.xml.md5 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/maven-metadata.xml.md5 rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/maven-metadata.xml.md5 diff --git a/local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/maven-metadata.xml.sha1 b/local-repo/net/Indyuce/mmocore/lib/SpartanAPI/maven-metadata.xml.sha1 similarity index 100% rename from local-repo/net/Indyuce/mmoitems/lib/SpartanAPI/maven-metadata.xml.sha1 rename to local-repo/net/Indyuce/mmocore/lib/SpartanAPI/maven-metadata.xml.sha1 diff --git a/pom.xml b/pom.xml index 8b7e1b4b..9289a0e2 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ ${basedir}/src/main/resources/ + org.apache.maven.plugins @@ -47,25 +48,13 @@ UTF-8 + org.apache.maven.plugins maven-shade-plugin - 3.2.4 + 3.3.0-SNAPSHOT - - - io.papermc.lib - net.indyuce.mmocore.shaded.paperlib - - - - - *:* - - net/mmogroup/** - - - + false @@ -76,6 +65,7 @@ + @@ -194,7 +184,6 @@ io.papermc paperlib 1.0.5 - provided @@ -228,42 +217,42 @@ - net.Indyuce.mmoitems.lib + net.Indyuce.mmocore.lib Residence 4.8.7.2 provided - net.Indyuce.mmoitems.lib + net.Indyuce.mmocore.lib CMI 8.6.5.0 provided - net.Indyuce.mmoitems.lib + net.Indyuce.mmocore.lib Holograms 2.9.1 provided - net.Indyuce.mmoitems.lib + net.Indyuce.mmocore.lib HolographicDisplays 2.4.6 provided - net.Indyuce.mmoitems.lib + net.Indyuce.mmocore.lib Citizens 2.0.25 provided - net.Indyuce.mmoitems.lib + net.Indyuce.mmocore.lib SpartanAPI 1.0 provided diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java index 392a020a..eb7dd8d3 100644 --- a/src/main/java/net/Indyuce/mmocore/MMOCore.java +++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java @@ -5,6 +5,7 @@ import java.lang.reflect.Field; import java.util.HashSet; import java.util.logging.Level; +import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandMap; @@ -168,6 +169,8 @@ public class MMOCore extends LuminePlugin { new Metrics(this); saveDefaultConfig(); + PaperLib.getMinecraftVersion(); + final int configVersion = getConfig().contains("config-version", true) ? getConfig().getInt("config-version") : -1; final int defConfigVersion = getConfig().getDefaults().getInt("config-version"); if (configVersion != defConfigVersion) { diff --git a/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java b/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java index 7913c2ae..0136173e 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java @@ -51,7 +51,7 @@ public class PlayerStats { * MMOLib. must be ran everytime the player levels up or changes class. */ public synchronized void updateStats() { - getMap().getInstances().forEach(ins -> ins.removeIf(key -> key.equals("mmocoreClass"))); + getMap().getInstances().forEach(ins -> ins.remove("mmocoreClass")); for (StatType stat : StatType.values()) { StatInstance instance = getMap().getInstance(stat.name());