0.5.1 - Merge pull request #42 from TechnicallyCoded/dev

Release 0.5.1

Author: TechnicallyCoded

README.md

@@ -39,13 +39,13 @@ plugins {
 
 repositories {
     maven {
-        name = "jitpack"
-        url = "https://jitpack.io"
+        name = "tcoded-releases"
+        url = "https://repo.tcoded.com/releases"
     }
 }
 
 dependencies {
-    implementation("com.github.technicallycoded:FoliaLib:main-SNAPSHOT")
+    implementation("com.tcoded:FoliaLib:SET_VERSION_HERE")
 }
 
 shadowJar {
@@ -55,7 +55,7 @@ shadowJar {
     // Optional: If you use minimize, make sure you exclude FoliaLib
     // Do not uncomment this if you don't know what you are doing
     // minimize {
-    //     exclude dependency("com.github.technicallycoded:FoliaLib:.*")
+    //     exclude dependency("com.tcoded:FoliaLib:.*")
     // }
 }
 ```
@@ -68,16 +68,16 @@ shadowJar {
 ```xml
 <repositories>
     <repository>
-        <id>jitpack</id>
-        <url>https://jitpack.io</url>
+        <id>tcoded-releases</id>
+        <url>https://repo.tcoded.com/releases</url>
     </repository>
 </repositories>
 
 <dependencies>
     <dependency>
-        <groupId>com.github.technicallycoded</groupId>
+        <groupId>com.tcoded</groupId>
         <artifactId>FoliaLib</artifactId>
-        <version>main-SNAPSHOT</version>
+        <version>SET_VERSION_HERE</version>
         <scope>compile</scope>
     </dependency>
 </dependencies>

build.gradle

@@ -0,0 +1,119 @@
+plugins {
+    id("maven-publish")
+    id("java")
+}
+
+group = "com.tcoded"
+
+allprojects {
+    apply(plugin = "java")
+
+    version = "0.5.1"
+
+    repositories {
+        mavenCentral()
+
+        maven {
+            url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+        }
+
+        maven {
+            url = uri("https://hub.spigotmc.org/nexus/content/repositories/public/")
+        }
+
+        maven {
+            url = uri("https://repo.papermc.io/repository/maven-public/")
+        }
+
+        maven {
+            url = uri("https://nexuslite.gcnt.net/repos/paper/")
+        }
+    }
+
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    dependencies {
+        implementation("org.jetbrains:annotations:23.0.0")
+
+        testImplementation(platform("org.junit:junit-bom:5.9.1"))
+        testImplementation("org.junit.jupiter:junit-jupiter")
+    }
+
+    tasks.test {
+        useJUnitPlatform()
+    }
+
+    tasks.compileJava {
+        dependsOn(tasks.clean)
+    }
+}
+
+subprojects.forEach { subproject ->
+    evaluationDependsOn(subproject.path)
+}
+
+tasks.register<Jar>("allJar") {
+    dependsOn(tasks.clean)
+    dependsOn(subprojects.map { it.tasks.clean })
+    dependsOn(tasks.compileJava)
+    dependsOn(tasks.jar)
+    dependsOn(subprojects.map { it.tasks.build })
+
+    subprojects.forEach { subproject ->
+        from(subproject.tasks.jar.get().outputs.files.map {
+            zipTree(it)
+        })
+    }
+}
+
+val allJar: Task = tasks.named("allJar").get();
+
+artifacts {
+    add("archives", allJar)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenJavaLocal") {
+            artifact(allJar.outputs.files.singleFile)
+        }
+    }
+}
+
+tasks.named("generateMetadataFileForMavenJavaLocalPublication") {
+    dependsOn(allJar)
+}
+
+val enablePublishing: Boolean = project.findProperty("enableUploadPublish")?.toString()?.toBoolean() == true
+
+if (enablePublishing) {
+    publishing {
+        repositories {
+            maven {
+                name = "reposilite"
+                url = uri("https://repo.tcoded.com/releases")
+
+                credentials {
+                    username = project.findProperty("REPOSILITE_USER")?.toString()
+                        ?: System.getenv("REPOSILITE_USER")
+                        ?: error("REPOSILITE_USER property or environment variable is not set")
+                    password = project.findProperty("REPOSILITE_PASS")?.toString()
+                        ?: System.getenv("REPOSILITE_PASS")
+                        ?: error("REPOSILITE_PASS property or environment variable is not set")
+                }
+
+                authentication {
+                    register<BasicAuthentication>("basic")
+                }
+            }
+        }
+    }
+
+    tasks.named("publishMavenJavaLocalPublicationToReposiliteRepository") {
+        dependsOn(tasks.jar)
+        dependsOn(allJar)
+    }
+}

build.gradle.kts

@@ -0,0 +1,7 @@
+group = "com.tcoded.folialib"
+
+dependencies {
+    compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
+
+    implementation(project(":platform:common"))
+}

common/build.gradle

@@ -2,6 +2,7 @@
 
 import com.tcoded.folialib.enums.ImplementationType;
 import com.tcoded.folialib.impl.PlatformScheduler;
+import com.tcoded.folialib.util.FoliaLibOptions;
 import com.tcoded.folialib.util.InvalidTickDelayNotifier;
 import org.bukkit.plugin.Plugin;
 
@@ -14,10 +15,22 @@ public class FoliaLib {
 
     private final ImplementationType implementationType;
     private final PlatformScheduler scheduler;
+    private FoliaLibOptions options;
+    private InvalidTickDelayNotifier invalidTickDelayNotifier;
 
     public FoliaLib(Plugin plugin) {
+        this(plugin, new FoliaLibOptions());
+    }
+
+    public FoliaLib(Plugin plugin, FoliaLibOptions customOptions) {
         this.plugin = plugin;
 
+        // Initialize options
+        this.options = customOptions;
+
+        // Initialize the invalid tick delay notifier
+        this.invalidTickDelayNotifier = new InvalidTickDelayNotifier(plugin.getLogger(), this.options);
+
         // Find the implementation type based on the class names
         ImplementationType foundType = ImplementationType.UNKNOWN;
 
@@ -48,7 +61,7 @@ public FoliaLib(Plugin plugin) {
         if (this.getClass().getName().startsWith(originalLocation)) {
             Logger logger = this.plugin.getLogger();
             logger.severe("****************************************************************");
-            logger.severe("FoliaLib is not be relocated correctly! This will cause conflicts");
+            logger.severe("FoliaLib is not relocated correctly! This will cause conflicts");
             logger.severe("with other plugins using FoliaLib. Please contact the developers");
             logger.severe(String.format("of '%s' and inform them of this issue immediately!", this.plugin.getDescription().getName()));
             logger.severe("****************************************************************");
@@ -101,18 +114,40 @@ public Plugin getPlugin() {
 
     // Public Options
 
+    /**
+     * Use {@link FoliaLib#getOptions()} instead.
+     */
     @SuppressWarnings("unused")
+    @Deprecated
     public void disableInvalidTickValueWarning() {
-        InvalidTickDelayNotifier.disableNotifications = true;
+        getOptions().disableNotifications();
     }
 
+    /**
+     * Use {@link FoliaLib#getOptions()} instead.
+     */
     @SuppressWarnings("unused")
+    @Deprecated
     public void enableInvalidTickValueDebug() {
-        InvalidTickDelayNotifier.debugMode = true;
+        getOptions().enableInvalidTickDebugMode();
+    }
+
+    public FoliaLibOptions getOptions() {
+        return this.options;
     }
 
     // Internal Utils
 
+    /**
+     * This is an internal tool, do NOT use!
+     * You're probably looking for {@link FoliaLib#getOptions()} instead.
+     * **/
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    public InvalidTickDelayNotifier getInvalidTickDelayNotifier() {
+        return this.invalidTickDelayNotifier;
+    }
+
     private PlatformScheduler createServerImpl(String implName) {
         String basePackage = this.getClass().getPackage().getName() + ".impl.";
 

common/build.gradle.kts

@@ -0,0 +1,43 @@
+package com.tcoded.folialib.util;
+
+public class FoliaLibOptions {
+
+    // InvalidTickDelayNotifier
+    private boolean disableNotifications = false;
+    private boolean invalidTickDebugMode = false;
+    
+    // isValid
+    private boolean useIsValidOnNonFolia = false;
+    
+    public boolean isDisableNotifications() {
+        return disableNotifications;
+    }
+    
+    public void disableNotifications() {
+        disableNotifications = true;
+    }
+    
+    public boolean isInvalidTickDebugMode() {
+        return invalidTickDebugMode;
+    }
+    
+    public void enableInvalidTickDebugMode() {
+        invalidTickDebugMode = true;
+    }
+    
+    public void disableInvalidTickDebugMode() {
+        invalidTickDebugMode = false;
+    }
+
+    public boolean useIsValidOnNonFolia() {
+        return useIsValidOnNonFolia;
+    }
+
+    /**
+     * Warning: This will prevent entity based timers from ever automatically stopping.
+     */
+    public void disableIsValidOnNonFolia() {
+        useIsValidOnNonFolia = false;
+    }
+    
+}