Merge pull request #25 from TechnicallyCoded/dev

Merge Dev For 0.4.3

Author: TechnicallyCoded

.gitignore

@@ -43,7 +43,4 @@ bin/
 
 # Custom
 /.idea/
-/gradle/
-gradlew
-gradlew.bat
 /target/

build.gradle

@@ -1,13 +1,13 @@
-buildscript {
-    ext {
-        revision = '0.2.4'
-    }
+plugins {
+    id 'maven-publish'
 }
 
+group 'com.tcoded'
+
 allprojects {
     apply plugin: 'java'
 
-    version = '0.3.4'
+    version = '0.4.3'
 
     repositories {
 
@@ -47,16 +47,15 @@ allprojects {
     }
 }
 
-group 'com.tcoded'
-
-def baseName
+tasks.assemble {
+    dependsOn clean
+}
 
-subprojects.each { subproject -> evaluationDependsOn(subproject.path)}
+subprojects.each { subproject -> evaluationDependsOn(subproject.path) }
 tasks.register('allJar', Jar) {
     dependsOn 'compileJava'
     dependsOn 'jar'
     dependsOn subprojects.tasks['build']
-    baseName = 'allJar'
     subprojects.each { subproject ->
         from subproject.configurations.archives.allArtifacts.files.collect {
             zipTree(it)
@@ -66,4 +65,16 @@ tasks.register('allJar', Jar) {
 
 artifacts {
     archives allJar
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
+}
+
+generateMetadataFileForMavenJavaPublication {
+    dependsOn allJar
 }

common/src/main/java/com/tcoded/folialib/FoliaLib.java

@@ -1,7 +1,7 @@
 package com.tcoded.folialib;
 
 import com.tcoded.folialib.enums.ImplementationType;
-import com.tcoded.folialib.impl.ServerImplementation;
+import com.tcoded.folialib.impl.PlatformScheduler;
 import com.tcoded.folialib.util.InvalidTickDelayNotifier;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -13,7 +13,7 @@ public class FoliaLib {
     private final JavaPlugin plugin;
 
     private final ImplementationType implementationType;
-    private final ServerImplementation implementation;
+    private final PlatformScheduler scheduler;
 
     public FoliaLib(JavaPlugin plugin) {
         this.plugin = plugin;
@@ -31,10 +31,10 @@ public FoliaLib(JavaPlugin plugin) {
 
         // Apply the implementation based on the type
         this.implementationType = foundType;
-        this.implementation = this.createServerImpl(this.implementationType.getImplementationClassName());
+        this.scheduler = this.createServerImpl(this.implementationType.getImplementationClassName());
 
         // Check for valid implementation
-        if (this.implementation == null) {
+        if (this.scheduler == null) {
             throw new IllegalStateException(
                     "Failed to create server implementation. Please report this to the FoliaLib GitHub issues page. " +
                             "Forks of server software may not all be supported. If you are using an unofficial fork, " +
@@ -62,9 +62,17 @@ public ImplementationType getImplType() {
         return implementationType;
     }
 
+    /**
+     * @deprecated Use {@link #getImplType()} instead. (forRemoval = true, since = "0.3.5")
+     */
+    @Deprecated
     @SuppressWarnings("unused")
-    public ServerImplementation getImpl() {
-        return implementation;
+    public PlatformScheduler getImpl() {
+        return getScheduler();
+    }
+
+    public PlatformScheduler getScheduler() {
+        return scheduler;
     }
 
     @SuppressWarnings("unused")
@@ -105,11 +113,11 @@ public void enableInvalidTickValueDebug() {
 
     // Internal Utils
 
-    private ServerImplementation createServerImpl(String implName) {
+    private PlatformScheduler createServerImpl(String implName) {
         String basePackage = this.getClass().getPackage().getName() + ".impl.";
 
         try {
-            return (ServerImplementation) Class.forName(basePackage + implName)
+            return (PlatformScheduler) Class.forName(basePackage + implName)
                     .getConstructor(this.getClass())
                     .newInstance(this);
         } catch (InstantiationException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException |

common/src/main/java/com/tcoded/folialib/enums/ImplementationType.java

@@ -1,6 +1,6 @@
 package com.tcoded.folialib.enums;
 
-import com.tcoded.folialib.impl.ServerImplementation;
+import com.tcoded.folialib.impl.PlatformScheduler;
 import com.tcoded.folialib.util.ImplementationTestsUtil;
 
 import java.util.function.Consumer;
@@ -13,7 +13,7 @@
  * <p>
  * A server is considered 'legacy' if it does not support task consumers. This feature was added in 1.13.2.
  * This means that even 1.13.1 servers are considered legacy servers as they do not support highly important
- * features that developers may want to use. Refer to {@link ServerImplementation#runLater(Consumer, long)}
+ * features that developers may want to use. Refer to {@link PlatformScheduler#runLater(Consumer, long)}
  * for more information on the behavior of task consumer-enabled methods on servers which do not support this feature.
  */
 @SuppressWarnings("SpellCheckingInspection")

common/src/main/java/com/tcoded/folialib/util/ImplementationTestsUtil.java

@@ -1,5 +1,8 @@
 package com.tcoded.folialib.util;
 
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.scheduler.BukkitTask;
@@ -10,6 +13,7 @@ public class ImplementationTestsUtil {
 
     private static final boolean IS_CANCELLED_SUPPORTED;
     private static final boolean IS_TASK_CONSUMERS_SUPPORTED;
+    private static final boolean IS_ASYNC_TELEPORT_SUPPORTED;
 
 
     static {
@@ -36,6 +40,19 @@ public class ImplementationTestsUtil {
         }
         // Set class-wide
         IS_TASK_CONSUMERS_SUPPORTED = taskConsumersSupported;
+
+
+        boolean isAsyncTeleportSupported = false;
+        try {
+            Class<Entity> entityClass = Entity.class;
+            // noinspection JavaReflectionMemberAccess
+            entityClass.getDeclaredMethod("teleportAsync", Location.class, PlayerTeleportEvent.TeleportCause.class);
+            isAsyncTeleportSupported = true;
+        } catch (NoSuchMethodException e) {
+            // ignore
+        }
+        // Set class-wide
+        IS_ASYNC_TELEPORT_SUPPORTED = isAsyncTeleportSupported;
     }
 
     public static boolean isCancelledSupported() {
@@ -46,4 +63,8 @@ public static boolean isTaskConsumersSupported() {
         return IS_TASK_CONSUMERS_SUPPORTED;
     }
 
+    public static boolean isAsyncTeleportSupported() {
+        return IS_ASYNC_TELEPORT_SUPPORTED;
+    }
+
 }

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists