Merge pull request #194 from CloudNetService/development

Update v3.2.0-RELEASE

Author: juliarn

.gitignore

@@ -25,6 +25,7 @@ src/test
 
 # various other potential build files
 build/
+out/
 bin/
 dist/
 manifest.mf

.template/extras/CloudNet-Signs/dytanic_config.json

@@ -4,6 +4,8 @@
       {
         "targetGroup": "Lobby",
         "switchToSearchingWhenServiceIsFull": true,
+        "knockbackDistance": 1.0,
+        "knockbackStrength": 0.8,
         "taskLayouts": [],
         "defaultOnlineLayout": {
           "lines": [
@@ -328,9 +330,11 @@
       }
     ],
     "messages": {
+      "server-connecting-message": "&7You will be send to &c%server%&7...",
       "command-cloudsign-remove-success": "&7The target sign will removed! Please wait...",
-      "server-connecting-message": "&7You will send to &c%server%&7...",
-      "command-cloudsign-create-success": "&7The target sign with the target group &6%group% &7is successfully created."
+      "command-cloudsign-create-success": "&7The target sign with the target group &6%group% &7was successfully created.",
+      "command-cloudsign-sign-already-exist": "&7The sign is already set. If you want to remove it, use the /cloudsign remove command",
+      "command-cloudsign-cleanup-success": "&7Non-existing signs were removed successfully"
     }
   }
 }

Jenkinsfile

@@ -51,10 +51,12 @@ pipeline {
         sh 'rm -r temp/';
       }
     }
-    stage('Install') {
+    stage('Maven') {
       steps {
-        echo 'Installing all artifacts to the local maven repo...';
-        sh './gradlew install';
+        echo 'Creating artifacts for the maven repo...';
+        sh './gradlew sourceJar';
+        sh './gradlew deploymentJar';
+        sh './gradlew javadocJar';
       }
     }
     stage('Javadoc') {

README.md

@@ -32,7 +32,7 @@
 - **SSL/TLS support** for security connections between the nodes in cluster or between the services and the node with or none own certificates
 - Multi system support and synchronizing in a network cluster
 - Support for Minecraft **vanilla 1.0+**
-- Application support for [Nukkit Project 1.0+ for Bedrock Edition 1.7](https://github.com/NukkitX/Nukkit)
+- Application support for [Nukkit Project for Bedrock Edition 1.7+](https://github.com/NukkitX/Nukkit)
 - Application support for [Bukkit based Minecraft **1.8.8+** (Spigot, PaperSpigot and more...)](https://github.com/Bukkit/Bukkit)
 - Application support for [Sponge based Minecraft servers with the SpongeAPI **7.0.0+**](https://www.spongepowered.org/)
 - Application support for [BungeeCord proxy server and forks for MC **1.8.8+**](https://github.com/SpigotMC/BungeeCord)

build.gradle

@@ -2,7 +2,7 @@ defaultTasks 'clean', 'build', 'test', 'jar'
 
 allprojects {
 
-    def major = 3, minor = 1, patch = 1, versionType = "RELEASE"
+    def major = 3, minor = 2, patch = 0, versionType = "RELEASE"
 
     group 'de.dytanic.cloudnet'
     version "$major.$minor.$patch-$versionType"
@@ -49,7 +49,7 @@ allprojects {
 
     project.ext {
 
-        cloudNetCodeName = 'Tsunami'
+        cloudNetCodeName = 'Eruption'
 
         //Dependencies
         dependencyLombokVersion = '1.18.6'
@@ -160,6 +160,10 @@ subprojects {
         options.encoding = 'UTF-8'
     }
 
+    javadoc {
+        options.encoding = 'UTF-8'
+    }
+
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
@@ -169,9 +173,7 @@ subprojects {
         annotationProcessor group: 'org.projectlombok', name: 'lombok', version: dependencyLombokVersion
     }
 
-
     task sourceJar(type: Jar, dependsOn: classes) {
-
         classifier = 'sources'
         from sourceSets.main.allSource
     }
@@ -187,6 +189,12 @@ subprojects {
             }.writeTo("$buildDir/libs/${pro.name}-${pro.version}.pom")
         }
     }
+
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc
+    }
+
 }
 
 task allJavadoc(type: Javadoc) {

cloudnet-common/src/main/java/de/dytanic/cloudnet/common/JavaVersion.java

@@ -0,0 +1,62 @@
+package de.dytanic.cloudnet.common;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum JavaVersion {
+    JAVA_8(8, 52D, "Java 8"),
+    JAVA_9(9, 53D, "Java 9"),
+    JAVA_10(10, 54D, "Java 10"),
+    JAVA_11(11, 55D, "Java 11"),
+    JAVA_12(12, 56D, "Java 12"),
+    JAVA_13(13, 57D, "Java 13"),
+    JAVA_14(14, 58D, "Java 14");
+
+    private int version;
+    private double versionId;
+    private String name;
+
+    JavaVersion(int version, double versionId, String name) {
+        this.version = version;
+        this.versionId = versionId;
+        this.name = name;
+    }
+
+    public int getVersion() {
+        return this.version;
+    }
+
+    public double getVersionId() {
+        return this.versionId;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public boolean isSupported(JavaVersion minJavaVersion, JavaVersion maxJavaVersion) {
+        return this.versionId >= minJavaVersion.versionId && this.versionId <= maxJavaVersion.versionId;
+    }
+
+    public boolean isSupportedByMin(JavaVersion minRequiredJavaVersion) {
+        return this.versionId >= minRequiredJavaVersion.versionId;
+    }
+
+    public boolean isSupportedByMax(JavaVersion maxRequiredJavaVersion) {
+        return this.versionId <= maxRequiredJavaVersion.versionId;
+    }
+
+    public static JavaVersion getRuntimeVersion() {
+        double versionId = Double.parseDouble(System.getProperty("java.class.version"));
+        return fromVersionId(versionId).orElseThrow(() -> new IllegalStateException("Running on an unsupported java version " + versionId));
+    }
+
+    public static Optional<JavaVersion> fromVersionId(double versionId) {
+        return Arrays.stream(values()).filter(javaVersion -> javaVersion.versionId == versionId).findFirst();
+    }
+
+    public static Optional<JavaVersion> fromVersion(int version) {
+        return Arrays.stream(values()).filter(javaVersion -> javaVersion.version == version).findFirst();
+    }
+
+}

cloudnet-common/src/main/java/de/dytanic/cloudnet/common/collection/Iterables.java

@@ -128,7 +128,7 @@ public static void forEach(Properties properties, Consumer<String> consumer) {
     }
 
     /**
-     * Iterates all keys in a Enumeration<T> class instance.
+     * Iterates all keys in a Enumeration class instance.
      *
      * @param enumeration the items which should iterate
      * @param consumer    the handler which handle the following keys
@@ -158,7 +158,7 @@ public static <T> void forEach(List<T> list, Consumer<T> consumer) {
     }
 
     /**
-     * Iterates all keys in a Enumeration<T> class instance.
+     * Iterates all keys in a Enumeration class instance.
      *
      * @param enumeration       the items which should iterate
      * @param consumer          the handler which handle the following keys
@@ -190,7 +190,7 @@ public static <T> void forEach(Iterator<T> iterator, Consumer<T> consumer) {
     }
 
     /**
-     * Iterates all keys in a Iterator<T> class instance.
+     * Iterates all keys in a Iterator class instance.
      *
      * @param iterator          the items which should iterate
      * @param consumer          the handler which handle the following keys
@@ -227,9 +227,6 @@ public static <T> T first(Iterable<T> iterable, Predicate<T> predicate) {
         return null;
     }
 
-    /**
-     *
-     */
     public static <T> T first(T[] iterable, Predicate<T> predicate) {
         if (iterable == null || predicate == null) {
             return null;

cloudnet-common/src/main/java/de/dytanic/cloudnet/common/concurrent/ITaskListener.java

@@ -3,7 +3,7 @@
 /**
  * A listener for all tasks, that should handle the process
  *
- * @param <T> the type of the listener, which should accept if the operation from the ITask<V> instance is complete
+ * @param <T> the type of the listener, which should accept if the operation from the ITask instance is complete
  * @see ITask
  */
 public interface ITaskListener<T> {

cloudnet-common/src/main/java/de/dytanic/cloudnet/common/document/IPersistable.java

@@ -1,6 +1,7 @@
 package de.dytanic.cloudnet.common.document;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -15,6 +16,14 @@ public interface IPersistable {
 
 
     default IPersistable write(Path path) {
+        Path parent = path.getParent();
+        if (parent != null && !Files.exists(parent)) {
+            try {
+                Files.createDirectories(parent);
+            } catch (IOException exception) {
+                exception.printStackTrace();
+            }
+        }
         try (OutputStream outputStream = new FileOutputStream(path.toFile())) {
             this.write(outputStream);
         } catch (IOException exception) {

cloudnet-common/src/main/java/de/dytanic/cloudnet/common/document/gson/JsonDocument.java

@@ -29,6 +29,10 @@ public class JsonDocument implements IDocument<JsonDocument> {
 
     protected final JsonObject jsonObject;
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be made private in a future release
+     */
+    @Deprecated
     public JsonDocument(JsonObject jsonObject) {
         this.jsonObject = jsonObject;
     }
@@ -41,6 +45,10 @@ public JsonDocument(Object toObjectMirror) {
         this(GSON.toJsonTree(toObjectMirror));
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be made private in a future release
+     */
+    @Deprecated
     public JsonDocument(JsonElement jsonElement) {
         this(jsonElement.isJsonObject() ? jsonElement.getAsJsonObject() : new JsonObject());
     }
@@ -90,6 +98,10 @@ public static JsonDocument newDocument() {
         return new JsonDocument();
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be removed in a future release
+     */
+    @Deprecated
     public static JsonDocument newDocument(JsonObject jsonObject) {
         return new JsonDocument(jsonObject);
     }
@@ -257,6 +269,10 @@ public JsonDocument append(JsonDocument document) {
         }
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be made private in a future release
+     */
+    @Deprecated
     public JsonDocument append(JsonObject jsonObject) {
         if (jsonObject == null) {
             return this;
@@ -336,7 +352,7 @@ public JsonDocument getDocument(String key) {
         JsonElement jsonElement = this.jsonObject.get(key);
 
         if (jsonElement.isJsonObject()) {
-            return new JsonDocument(jsonElement.getAsJsonObject());
+            return new JsonDocument(jsonElement);
         } else {
             return null;
         }
@@ -507,6 +523,10 @@ public BigInteger getBigInteger(String key) {
         }
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be removed in a future release
+     */
+    @Deprecated
     public JsonArray getJsonArray(String key) {
         if (!contains(key)) {
             return null;
@@ -521,6 +541,10 @@ public JsonArray getJsonArray(String key) {
         }
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be removed in a future release
+     */
+    @Deprecated
     public JsonObject getJsonObject(String key) {
         if (!contains(key)) {
             return null;
@@ -546,6 +570,10 @@ public Properties getProperties(String key) {
         return properties;
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be removed in a future release
+     */
+    @Deprecated
     public JsonElement get(String key) {
         if (!contains(key)) {
             return null;
@@ -666,6 +694,10 @@ public JsonDocument getDocument(String key, JsonDocument def) {
         return this.getDocument(key);
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be removed in a future release
+     */
+    @Deprecated
     public JsonArray getJsonArray(String key, JsonArray def) {
         if (!this.contains(key)) {
             this.append(key, def);
@@ -674,6 +706,10 @@ public JsonArray getJsonArray(String key, JsonArray def) {
         return this.getJsonArray(key);
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be removed in a future release
+     */
+    @Deprecated
     public JsonObject getJsonObject(String key, JsonObject def) {
         if (!this.contains(key)) {
             this.append(key, def);
@@ -819,6 +855,10 @@ public JsonDocument getProperties() {
         return this;
     }
 
+    /**
+     * @deprecated causes issues because of the relocated Gson, will be removed in a future release
+     */
+    @Deprecated
     public JsonObject toJsonObject() {
         return jsonObject;
     }
@@ -840,9 +880,9 @@ public String toString() {
         return toJson();
     }
 
-
     @Override
     public Iterator<String> iterator() {
         return this.jsonObject.keySet().iterator();
     }
+
 }