CruzAPI · CruzAPI · Sep 10, 2024 · Sep 17, 2024 · Sep 18, 2024 · Oct 13, 2024
diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-//    compileOnly("net.md-5:bungeecord-api:1.20-R0.1-SNAPSHOT")
+    compileOnly("net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT")
     compileOnly("org.projectlombok:lombok:1.18.30")
     annotationProcessor("org.projectlombok:lombok:1.18.30")
     implementation("org.mindrot:jbcrypt:0.4")

diff --git a/authenticator/src/main/java/com/eul4/authenticator/util/MessageUtil.java b/authenticator/src/main/java/com/eul4/authenticator/util/MessageUtil.java
@@ -11,7 +11,7 @@ public class MessageUtil
 {
 	private static final String UNEXPECTED_ERROR = """
 			Ocorreu um erro inesperado!
-			Reporte isto para algum ADM no discord!""";
+			Reporte isto para algum admin no discord!""";
 
 	public static void sendUnexpectedErrorMessage(CommandSender sender)
 	{

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,336 +21,16 @@ tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
 
-val bashPath = project.property("bash.path") as String
-val user = project.property("remote.user") as String
-val hostname = project.property("remote.hostname") as String
-val resetTown: Boolean = project.findProperty("resetTowns")?.toString()?.toBoolean() ?: false
-val containerName = project.findProperty("containerName")?.toString()
-val pluginDirectory = project.findProperty("pluginDir")?.toString()
-val buildFileParent = fixPath(buildFile.parent)
-val rootDirPath = fixPath(rootDir.absolutePath)
+tasks.register<Exec>("deployPlugin") {
+    group = "deployment"
+    description = "Executa o script deployPlugin.sh"
 
-
-task("resetTownsLocal")
-{
-    doLast {
-        val process = ProcessBuilder(bashPath, "-c", "${rootDirPath}/reset-towns-local.sh").start()
-        val exitCode = process.waitFor()
-        val errorMessage = process.errorStream.bufferedReader().use { it.readText()
-        }
-
-        if(exitCode != 0)
-        {
-            throw GradleException("Failed to reset towns!\n" +
-                    "$errorMessage\n" +
-                    "(exit code: ${process.exitValue()})")
-        }
-    }
-}
-
-task("resetTownsRemote")
-{
-    doLast {
-        val process = ProcessBuilder(bashPath, "-c", "${rootDirPath}/reset-towns-remote.sh $user $hostname").start()
-        val exitCode = process.waitFor()
-        val errorMessage = process.errorStream.bufferedReader().use { it.readText() }
-
-        if(exitCode != 0)
-        {
-            throw GradleException("Failed to reset towns!\n" +
-                    "$errorMessage\n" +
-                    "(exit code: ${process.exitValue()})")
-        }
-    }
-}
-
-task("stopLocal")
-{
-    doLast {
-        val process = ProcessBuilder(bashPath, "-c", "${buildFileParent}/stop-local.sh").start()
-        val exitCode = process.waitFor()
-        val errorMessage = process.errorStream.bufferedReader().use { it.readText() }
-
-        if(exitCode == 1)
-        {
-            println("WARN: $errorMessage")
-        }
-        else if(exitCode != 0)
-        {
-            throw GradleException("Failed to stop server!\n" +
-                    "$errorMessage\n" +
-                    "(exit code: ${process.exitValue()})")
-        }
-        else
-        {
-            while(!isLocalContainerStopped())
-            {
-                println("Sleeping 1s... Waiting container to stop.")
-                Thread.sleep(1000L)
-            }
-
-            println("Container stopped!")
-        }
-    }
-}
-
-task("startLocal")
-{
-    doLast {
-        val process = ProcessBuilder(bashPath, "-c", "docker compose up -d").start()
-
-        if(process.waitFor() != 0)
-        {
-            val errorMessage = process.errorStream.bufferedReader().use { it.readText() }
-            throw GradleException("Failed to start server!\n" +
-                    "$errorMessage\n" +
-                    "(exit code: ${process.exitValue()})")
-        }
-    }
-}
-
-task("stopRemote")
-{
-    doLast {
-        val process = ProcessBuilder(bashPath, "-c", "${buildFileParent}/stop-remote.sh $user $hostname $containerName").start()
-        val exitCode = process.waitFor()
-        val errorMessage = process.errorStream.bufferedReader().use { it.readText() }
-
-        if(exitCode == 1)
-        {
-            println("WARN: $errorMessage")
-        }
-        else if(exitCode != 0)
-        {
-            throw GradleException("Failed to stop server!\n" +
-                    "$errorMessage\n" +
-                    "(exit code: ${process.exitValue()})")
-        }
-        else
-        {
-            while(!isRemoteContainerStopped())
-            {
-                println("Sleeping 1s... Waiting container to stop.")
-                Thread.sleep(1000L)
-            }
-
-            println("Container stopped!")
-        }
-    }
-}
-
-task("startRemote")
-{
-    doLast {
-        val process = ProcessBuilder(bashPath, "-c", "${buildFileParent}/start-remote.sh $user $hostname $containerName").start()
-
-        if(process.waitFor() != 0)
-        {
-            val errorMessage = process.errorStream.bufferedReader().use { it.readText() }
-            throw GradleException("Failed to start server!\n" +
-                    "$errorMessage\n" +
-                    "(exit code: ${process.exitValue()})")
-        }
-    }
-}
-
-configure(subprojects.filter { it.name == "plugin" || it.name == "plugin-validator" || it.name == "authenticator" || it.name == "plugin2" }) {
-    this.afterEvaluate {
-        fun getFinalJarAbsolutePath(): String = fixPath(tasks.shadowJar.get().archiveFile.get().asFile.absolutePath)
-
-        task("cpLocal")
-        {
-            doLast {
-                val buildPath = getFinalJarAbsolutePath()
-                val cpProcess = ProcessBuilder(bashPath, "-c", "${rootDirPath}/cp.sh $buildPath ${rootDir.absolutePath}").start()
-
-                if(cpProcess.waitFor() != 0)
-                {
-                    val errorMessage = cpProcess.errorStream.bufferedReader().use { it.readText() }
-                    throw GradleException("Failed to cp ${this@configure.name}!\n" +
-                            "$errorMessage\n" +
-                            "(exit code: ${cpProcess.exitValue()})")
-                }
-            }
-
-        }
-
-        task("scpRemote")
-        {
-            doLast {
-                val scpProcess = ProcessBuilder(bashPath, "-c", "${rootDirPath}/scp.sh ${getFinalJarAbsolutePath()} $user $hostname $pluginDirectory").start()
-
-                println("${rootDirPath}/scp.sh ${getFinalJarAbsolutePath()} $user $hostname $pluginDirectory")
-
-                if (scpProcess.waitFor() != 0)
-                {
-                    val errorMessage = scpProcess.errorStream.bufferedReader().use { it.readText() }
-                    throw GradleException("Failed to scp ${this@configure.name}!\n" +
-                            "$errorMessage\n" +
-                            "(exit code: ${scpProcess.exitValue()})")
-                }
-            }
-        }
-
-        task("deployLocal")
-        {
-            val stopLocalTask = rootProject.tasks.named("stopLocal")
-            val cpLocalTask = tasks.named("cpLocal")
-            val startLocalTask = rootProject.tasks.named("startLocal")
-            val resetTownsLocalTask = rootProject.tasks.named("resetTownsLocal")
-
-            dependsOn(tasks.clean, tasks.build, stopLocalTask, cpLocalTask, startLocalTask)
-
-            if(resetTown)
-            {
-                dependsOn(resetTownsLocalTask)
-            }
-
-            tasks.build {
-                mustRunAfter(tasks.clean)
-            }
-
-            stopLocalTask {
-                mustRunAfter(tasks.build)
-            }
-
-            if(resetTown)
-            {
-                resetTownsLocalTask {
-                    mustRunAfter(stopLocalTask)
-                }
-
-                cpLocalTask {
-                    mustRunAfter(resetTownsLocalTask)
-                }
-            }
-            else
-            {
-                cpLocalTask {
-                    mustRunAfter(stopLocalTask)
-                }
-            }
-
-            startLocalTask {
-                mustRunAfter(cpLocalTask)
-            }
-        }
-
-        task("deployRemote")
-        {
-            val stopRemoteTask = rootProject.tasks.named("stopRemote")
-            val scpRemoteTask = tasks.named("scpRemote")
-            val startRemoteTask = rootProject.tasks.named("startRemote")
-            val resetTownsRemoteTask = rootProject.tasks.named("resetTownsRemote")
-
-            dependsOn(tasks.clean, tasks.build, stopRemoteTask, scpRemoteTask, startRemoteTask)
-
-            if(resetTown)
-            {
-                dependsOn(resetTownsRemoteTask)
-            }
-
-            tasks.build.configure {
-                mustRunAfter(tasks.clean)
-            }
-
-            stopRemoteTask.configure {
-                mustRunAfter(tasks.build)
-            }
-
-            scpRemoteTask.configure {
-                mustRunAfter(stopRemoteTask)
-            }
-
-            if(resetTown)
-            {
-                resetTownsRemoteTask {
-                    mustRunAfter(stopRemoteTask)
-                }
-
-                scpRemoteTask {
-                    mustRunAfter(resetTownsRemoteTask)
-                }
-            }
-            else
-            {
-                scpRemoteTask {
-                    mustRunAfter(stopRemoteTask)
-                }
-            }
-
-            startRemoteTask.configure {
-                mustRunAfter(scpRemoteTask)
-            }
-        }
-    }
-}
-
-fun isRemoteContainerStopped(): Boolean
-{
-    val bashPath = project.property("bash.path") as String
-    val process = ProcessBuilder(bashPath, "-c", "${rootDirPath}/check-remote-container.sh $user $hostname $containerName").start()
-
-    return process.waitFor() != 0
+    commandLine("C:/Program Files/Git/bin/bash.exe", "./deployPlugin.sh")
 }
 
-fun isLocalContainerStopped(): Boolean
-{
-    val bashPath = project.property("bash.path") as String
-    val process = ProcessBuilder(bashPath, "-c", "${rootDirPath}/check-container.sh").start()
+tasks.register<Exec>("deployAuth") {
+    group = "deployment"
+    description = "Executa o script deployAuth.sh"
 
-    return process.waitFor() != 0
+    commandLine("C:/Program Files/Git/bin/bash.exe", "./deployAuth.sh")
 }
-
-task("deployAllLocal")
-{
-    val plugin = project("plugin")
-    val pluginValidator = project("plugin-validator")
-
-    val stopLocalTask = tasks.named("stopLocal")
-    val startLocalTask = tasks.named("startLocal")
-
-    dependsOn(tasks.clean, tasks.build, stopLocalTask, startLocalTask)
-
-    tasks.build.configure {
-        mustRunAfter(tasks.clean)
-    }
-
-    stopLocalTask.configure {
-        mustRunAfter(tasks.build)
-    }
-
-    plugin.afterEvaluate {
-        val cpPluginTask = plugin.tasks.named("cpLocal")
-        this@task.dependsOn(cpPluginTask)
-
-        pluginValidator.afterEvaluate {
-            val cpPluginValidatorTask = pluginValidator.tasks.named("cpLocal")
-            this@task.dependsOn(cpPluginValidatorTask)
-
-            cpPluginTask.configure {
-                mustRunAfter(cpPluginValidatorTask)
-            }
-
-            startLocalTask.configure {
-                mustRunAfter(cpPluginTask)
-            }
-        }
-    }
-}
-
-tasks.build {
-    dependsOn(subprojects.map { it.tasks.build })
-}
-
-fun fixPath(path: String): String
-{
-    if(path.startsWith("C:"))
-    {
-        return path.replace("\\","/").replace("C:","/c")
-    }
-    else
-    {
-        return path;
-    }
-}
diff --git a/check-container.sh b/check-container.sh
diff --git a/check-remote-container.sh b/check-remote-container.sh
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -17,7 +17,6 @@ repositories {
 
 dependencies {
     paperweight.devBundle("com.eul4", "1.21.1-R0.1-SNAPSHOT")
-    compileOnlyApi("io.papermc.paper:paper-bundler:1.21.1-R0.1-SNAPSHOT-mojmap")
     compileOnlyApi("com.comphenix.protocol:ProtocolLib:5.1.0")
     compileOnly("org.projectlombok:lombok:1.18.30")
     annotationProcessor("org.projectlombok:lombok:1.18.30")