feat: Sub modules project setup and Sponge7 support

BREAKING CHANGE: Maven/Gradle artifacts changed

build.gradle

@@ -8,23 +8,9 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.0'
     id 'io.freefair.lombok' version '6.6.1'
     id 'java'
-    id 'jacoco'
     id 'idea'
 }
 
-apply from: "$rootDir/gradle/jacoco.gradle"
-apply from: "$rootDir/gradle/publish.gradle"
-
-if (project.hasProperty("local_script")) {
-    apply from: file(local_script + "/build.local.gradle")
-}
-
-ext {
-    mcVersion = project.property("mcVersion")
-}
-
-group project.property("group")
-
 compileJava {
     options.encoding = 'UTF-8'
     options.compilerArgs += ["-parameters"]
@@ -33,44 +19,64 @@ compileJava {
 }
 
 archivesBaseName = project.property("libName")
+group project.property("group")
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven { url = 'https://repo.codemc.org/repository/maven-public/' }
-    maven { url = 'https://jitpack.io' }
-    maven { url = 'https://repo.aikar.co/content/groups/aikar/' }
-    maven { url = 'https://repo.dmulloy2.net/repository/public/' }
-    maven { url 'https://hub.spigotmc.org/nexus/content/repositories/public/' }
-    maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' }
-    maven { url = 'https://nexus.velocitypowered.com/repository/maven-public/' }
-    maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
-}
+allprojects {
 
-dependencies {
-    compileOnly "io.papermc.paper:paper-api:${mcVersion}-R0.1-SNAPSHOT"
-    compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT'
-    compileOnly 'com.velocitypowered:velocity-api:3.1.1'
-    compileOnly 'org.spongepowered:spongeapi:9.0.0'
+    ext {
+        mcVersion = project.property("mcVersion")
+    }
 
-    compileOnly 'org.jetbrains:annotations:23.1.0'
-    compileOnly 'commons-codec:commons-codec:1.15'
-    compileOnly 'commons-io:commons-io:2.11.0'
-    compileOnly 'commons-lang:commons-lang:2.6'
-    compileOnly 'org.mongodb:mongodb-driver:3.12.11'
-    compileOnly 'com.mojang:authlib:1.11'
-    compileOnly 'me.clip:placeholderapi:2.11.2'
-    implementation 'de.tr7zw:item-nbt-api-plugin:2.11.1'
-    implementation 'com.github.cryptomorin:XSeries:9.2.0'
+    apply plugin: 'java'
+    apply plugin: 'idea'
+    apply plugin: 'io.freefair.lombok'
+    apply plugin: 'com.github.johnrengelman.shadow'
+    apply plugin: 'maven-publish'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
-    testImplementation 'org.mockito:mockito-core:4.11.0'
-    testImplementation 'com.github.seeseemelk:MockBukkit-v1.17:1.13.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
-}
+    processResources {
+        project.properties.put("version", this.version)
+        expand project.properties
+    }
 
-java {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven { url = 'https://repo.codemc.io/repository/maven-public/' }
+        maven { url = 'https://jitpack.io' }
+        maven { url = 'https://repo.aikar.co/content/groups/aikar/' }
+        maven { url = 'https://repo.dmulloy2.net/repository/public/' }
+        maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/public/' }
+        maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url = 'https://nexus.velocitypowered.com/repository/maven-public/' }
+        maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
+    }
+
+    dependencies {
+        compileOnly "io.papermc.paper:paper-api:${mcVersion}-R0.1-SNAPSHOT"
+        compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT'
+        compileOnly 'com.velocitypowered:velocity-api:3.1.1'
+
+        compileOnly 'org.jetbrains:annotations:23.1.0'
+        compileOnly 'commons-codec:commons-codec:1.15'
+        compileOnly 'commons-io:commons-io:2.11.0'
+        compileOnly 'commons-lang:commons-lang:2.6'
+        compileOnly 'org.mongodb:mongodb-driver:3.12.11'
+        compileOnly 'com.mojang:authlib:1.11'
+        compileOnly 'me.clip:placeholderapi:2.11.2'
+    }
+}
 
+dependencies {
+    implementation project(path: ':database')
+    implementation project(path: ':extensions')
+    implementation project(path: ':maps')
+    implementation project(path: ':scheduler')
+    implementation project(path: ':yaml')
+    implementation project(path: ':utilities')
+    implementation project(path: ':minecraft:bukkit')
+    implementation project(path: ':minecraft:bungee')
+    implementation project(path: ':minecraft:velocity')
+    implementation project(path: ':minecraft:sponge8')
 }
 
 shadowJar {
@@ -81,20 +87,5 @@ shadowJar {
     relocate 'com.cryptomorin.xseries', 'com.georgev22.library.minecraft.xseries'
 }
 
-tasks.build.dependsOn(shadowJar)
-tasks.publish.dependsOn(shadowJar)
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "skipped", "failed"
-    }
-    ignoreFailures = false
-}
-
-processResources {
-    project.properties.put("version", this.version)
-    expand project.properties
-}
 
 defaultTasks 'build'

database/build.gradle

@@ -0,0 +1,11 @@
+apply from: "$rootDir/gradle/publish.gradle"
+
+group 'com.georgev22.library'
+
+dependencies {
+    compileOnly project(path: ':utilities')
+    compileOnly project(path: ':maps')
+}
+
+tasks.build.dependsOn(shadowJar)
+tasks.publish.dependsOn(shadowJar)

src/main/java/com/georgev22/library/database/DatabaseWrapper.java → database/src/main/java/com/georgev22/library/database/DatabaseWrapper.java

@@ -8,7 +8,6 @@
 import com.georgev22.library.exceptions.DatabaseException;
 import com.georgev22.library.maps.ObjectMap;
 import com.mongodb.BasicDBObject;
-import com.mongodb.Block;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
@@ -23,6 +22,7 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.*;
+import java.util.function.Consumer;
 
 import static com.georgev22.library.utilities.Utils.Assertions.notNull;
 
@@ -103,7 +103,7 @@ public DatabaseWrapper connect() {
     public boolean isConnected() {
         if (!type.equals(DatabaseType.MONGO))
             try {
-                return connection != null & !connection.isClosed();
+                return connection != null & !Objects.requireNonNull(connection).isClosed();
             } catch (SQLException ignored) {
                 return false;
             }
@@ -246,7 +246,7 @@ private ResultSet resultSet(String query) {
      * @return an {@link ObjectMap.PairDocument} with the retrieved data.
      */
     public ObjectMap.PairDocument selectData(ObjectMap.Pair<String, ObjectMap.Pair<String, Object>> select) {
-        List<ObjectMap.Pair> pairList = new ArrayList<>();
+        List<ObjectMap.Pair<String, Object>> pairList = new ArrayList<>();
         if (!type.equals(DatabaseType.MONGO)) {
             try {
                 if (!select.value().value().getClass().equals(String.class))
@@ -263,7 +263,7 @@ public ObjectMap.PairDocument selectData(ObjectMap.Pair<String, ObjectMap.Pair<S
             }
         } else {
             Document document = getDocument(select);
-            for (Map.Entry<String, Object> entry : document.entrySet()) {
+            for (Map.Entry<String, Object> entry : Objects.requireNonNull(document).entrySet()) {
                 pairList.add(ObjectMap.Pair.create(entry.getKey(), entry.getValue()));
             }
         }
@@ -297,7 +297,7 @@ public List<ObjectMap.PairDocument> selectAllData(ObjectMap.Pair<String, ObjectM
         } else {
             FindIterable<Document> findIterable = getAllDocuments(select);
             List<ObjectMap.Pair<String, Object>> pairList = new ArrayList<>();
-            findIterable.forEach((Block<? super Document>) document -> {
+            findIterable.forEach((Consumer<? super Document>) document -> {
                 for (Map.Entry<String, Object> entry : document.entrySet()) {
                     pairList.add(ObjectMap.Pair.create(entry.getKey(), entry.getValue()));
                 }
@@ -352,6 +352,6 @@ public Database getSQLDatabase() {
      * @see com.mongodb.MongoNamespace#checkCollectionNameValidity(String)
      */
     public MongoCollection<Document> getCollection(String collectionName) {
-        return mongoDatabase.getCollection(collectionName);
+        return Objects.requireNonNull(mongoDatabase).getCollection(collectionName);
     }
 }

src/main/java/com/georgev22/library/database/sql/mysql/MySQL.java → database/src/main/java/com/georgev22/library/database/sql/mysql/MySQL.java

@@ -30,7 +30,7 @@ public MySQL(String hostname, int port, String username, String password) {
     public MySQL(String hostname, int port, String username, String password, @NotNull Optional<String> database) {
         this.hostname = hostname;
         this.port = port;
-        this.database = database.isEmpty() ? null : database.get();
+        this.database = database.orElse(null);
         this.user = username;
         this.password = password;
     }

src/main/java/com/georgev22/library/database/sql/postgresql/PostgreSQL.java → database/src/main/java/com/georgev22/library/database/sql/postgresql/PostgreSQL.java

@@ -30,7 +30,7 @@ public PostgreSQL(String hostname, int port, String username, String password) {
     public PostgreSQL(String hostname, int port, String username, String password, @NotNull Optional<String> database) {
         this.hostname = hostname;
         this.port = port;
-        this.database = database.isEmpty() ? null : database.get();
+        this.database = database.orElse(null);
         this.user = username;
         this.password = password;
     }

extensions/build.gradle

@@ -0,0 +1,12 @@
+apply from: "$rootDir/gradle/publish.gradle"
+
+group 'com.georgev22.library'
+
+dependencies {
+    compileOnly project(path: ':utilities')
+    compileOnly project(path: ':maps')
+    compileOnly project(path: ':yaml')
+}
+
+tasks.build.dependsOn(shadowJar)
+tasks.publish.dependsOn(shadowJar)

src/main/java/com/georgev22/library/extensions/SimpleExtensionManager.java → extensions/src/main/java/com/georgev22/library/extensions/SimpleExtensionManager.java

@@ -115,7 +115,7 @@ public Extension[] loadExtensions(@NotNull File directory) {
         Map<String, Collection<String>> softDependencies = new HashMap<>();
 
         // This is where it figures out all possible extensions
-        for (File file : directory.listFiles()) {
+        for (File file : Objects.requireNonNull(directory.listFiles())) {
             ExtensionLoader loader = null;
             for (Pattern filter : filters) {
                 Matcher match = filter.matcher(file.getName());

src/main/java/com/georgev22/library/extensions/java/JavaExtension.java → extensions/src/main/java/com/georgev22/library/extensions/java/JavaExtension.java

@@ -1,10 +1,7 @@
 package com.georgev22.library.extensions.java;
 
 import com.georgev22.library.exceptions.InvalidExtensionException;
-import com.georgev22.library.extensions.ExtensionBase;
-import com.georgev22.library.extensions.ExtensionDescriptionFile;
-import com.georgev22.library.extensions.ExtensionLoader;
-import com.georgev22.library.extensions.ExtensionsImpl;
+import com.georgev22.library.extensions.*;
 import com.georgev22.library.maps.HashObjectMap;
 import com.georgev22.library.maps.ObjectMap;
 import com.georgev22.library.maps.UnmodifiableObjectMap;

src/main/java/com/georgev22/library/extensions/scheduler/AsyncTask.java → extensions/src/main/java/com/georgev22/library/extensions/scheduler/AsyncTask.java

@@ -28,7 +28,7 @@ public boolean isSync() {
     public void run() {
         final Thread thread = Thread.currentThread();
         synchronized (workers) {
-            if (getPeriod() == Task.CANCEL) {
+            if (getPeriod() == CANCEL) {
                 // Never continue running after cancelled.
                 // Checking this with the lock is important!
                 return;
@@ -104,7 +104,7 @@ LinkedList<ExtensionWorker> getWorkers() {
     boolean cancel0() {
         synchronized (workers) {
             // Synchronizing here prevents race condition for a completing task
-            setPeriod(Task.CANCEL);
+            setPeriod(CANCEL);
             if (workers.isEmpty()) {
                 runners.remove(getTaskId());
             }

gradle/publish.gradle

@@ -32,8 +32,8 @@ publishing {
     publications {
         shadow(MavenPublication) { publication ->
             project.shadow.component(publication)
+            group = ((String) project.getGroup()).toLowerCase()
             artifactId = project.getName().toLowerCase()
-            groupId = ((String) project.getGroup()).toLowerCase()
             artifact sourcesJar
             artifact javadocJar
         }

maps/build.gradle

@@ -0,0 +1,4 @@
+apply from: "$rootDir/gradle/publish.gradle"
+group 'com.georgev22.library'
+tasks.build.dependsOn(shadowJar)
+tasks.publish.dependsOn(shadowJar)

src/main/java/com/georgev22/library/maps/ConcurrentObjectMap.java → maps/src/main/java/com/georgev22/library/maps/ConcurrentObjectMap.java

@@ -1,6 +1,5 @@
 package com.georgev22.library.maps;
 
-import com.georgev22.library.utilities.Utils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Date;
@@ -351,7 +350,6 @@ public <T> List<T> getList(Object key, Class<T> clazz) {
      * @throws ClassCastException if the value of the given key is not of type T
      */
     public <T> List<T> getList(final Object key, final Class<T> clazz, final List<T> defaultValue) {
-        Utils.Assertions.notNull("clazz", clazz);
         List<T> value = get(key, List.class);
         if (value == null) {
             return defaultValue;
@@ -377,7 +375,6 @@ public <T> List<T> getList(final Object key, final Class<T> clazz, final List<T>
      * @throws ClassCastException if the value of the given key is not of type T
      */
     public <T> T get(final Object key, final Class<T> clazz) {
-        Utils.Assertions.notNull("clazz", clazz);
         return clazz.cast(get(key));
     }
 
@@ -392,7 +389,6 @@ public <T> T get(final Object key, final Class<T> clazz) {
      * @throws ClassCastException if the value of the given key is not of type T
      */
     public <T> T get(final Object key, final T defaultValue) {
-        Utils.Assertions.notNull("defaultValue", defaultValue);
         Object value = get(key);
         return value == null ? defaultValue : (T) value;
     }

src/main/java/com/georgev22/library/maps/HashObjectMap.java → maps/src/main/java/com/georgev22/library/maps/HashObjectMap.java

@@ -1,6 +1,5 @@
 package com.georgev22.library.maps;
 
-import com.georgev22.library.utilities.Utils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.Serializable;
@@ -352,7 +351,6 @@ public <T> List<T> getList(Object key, Class<T> clazz) {
      * @throws ClassCastException if the value of the given key is not of type T
      */
     public <T> List<T> getList(final Object key, final Class<T> clazz, final List<T> defaultValue) {
-        Utils.Assertions.notNull("clazz", clazz);
         List<T> value = get(key, List.class);
         if (value == null) {
             return defaultValue;
@@ -378,7 +376,6 @@ public <T> List<T> getList(final Object key, final Class<T> clazz, final List<T>
      * @throws ClassCastException if the value of the given key is not of type T
      */
     public <T> T get(final Object key, final Class<T> clazz) {
-        Utils.Assertions.notNull("clazz", clazz);
         return clazz.cast(get(key));
     }
 
@@ -393,7 +390,6 @@ public <T> T get(final Object key, final Class<T> clazz) {
      * @throws ClassCastException if the value of the given key is not of type T
      */
     public <T> T get(final Object key, final T defaultValue) {
-        Utils.Assertions.notNull("defaultValue", defaultValue);
         Object value = get(key);
         return value == null ? defaultValue : (T) value;
     }