Feat: Remotely 2.3.0.

Author: RedxAx

RemotelyMod/build-logic/build.gradle.kts

@@ -29,6 +29,6 @@ gradlePlugin {
 
 dependencies {
     compileOnly("com.github.johnrengelman:shadow:8.1.1")
-    compileOnly("com.hypherionmc.modutils:modpublisher:2.1.8")
+    implementation("com.hypherionmc.modutils:modpublisher:2.1.8")
     implementation("net.neoforged:moddev-gradle:2.0.141")
 }

RemotelyMod/build-logic/src/main/kotlin/redxax/remotelymod/buildlogic/RemotelyModBuildLogic.kt

@@ -363,18 +363,12 @@ private fun Project.configureResources() {
 private fun Project.configurePublishingGuard() {
     val requestedTasks = gradle.startParameter.taskNames.map { it.lowercase() }
     val publishingRequested = requestedTasks.any {
-        val taskName = it.lowercase()
-        taskName.contains("publish") || taskName.contains("modrinth") || taskName.contains("curse") || taskName.contains("github") || taskName.contains("nightbloom")
+        val taskName = it.substringAfterLast(":")
+        taskName.startsWith("publish") || taskName.contains("modrinth") || taskName.contains("curse") || taskName.contains("github") || taskName.contains("nightbloom")
     }
     if (!publishingRequested) {
         return
     }
-    val publishingAllowed = rootProject.findProperty("remotely.allowPublish")?.toString()?.toBooleanStrictOrNull()
-        ?: findProperty("remotely.allowPublish")?.toString()?.toBooleanStrictOrNull()
-        ?: false
-    if (!publishingAllowed) {
-        throw GradleException("Publishing is disabled. Re-run with -Premotely.allowPublish=true to enable publishing tasks.")
-    }
     pluginManager.apply("com.hypherionmc.modutils.modpublisher")
     pluginManager.withPlugin("com.hypherionmc.modutils.modpublisher") {
         extensions.configure(ModPublisherGradleExtension::class.java, action<ModPublisherGradleExtension> { publisher ->
@@ -425,14 +419,12 @@ private fun Project.publishingProperties(): Properties {
     }
 }
 
-private fun Project.publishingArtifact() = tasks.named(publishingArtifactTaskName(), AbstractArchiveTask::class.java)
-    .flatMap { task -> task.archiveFile }
-
-private fun Project.publishingArtifactTaskName(): String {
-    return when {
-        loader() == "fabric" && isDropVersion() -> "jar"
-        loader() == "neoforge" -> "jar"
-        else -> "remapJar"
+private fun Project.publishingArtifact() = rootProject.layout.buildDirectory.file("versions/Remotely-${modVersion()}+$name.jar").also { artifact ->
+    gradle.taskGraph.whenReady {
+        val file = artifact.get().asFile
+        if (!file.isFile) {
+            throw GradleException("Publishing artifact is missing: ${file.absolutePath}. Run buildAllVersions before publishing.")
+        }
     }
 }
 
@@ -512,6 +504,7 @@ private fun Project.configureNeoForgeModDev() {
         task.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         task.into(layout.buildDirectory.dir("classes/java/main"))
         task.exclude("META-INF/MANIFEST.MF", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA")
+        task.exclude("com/pty4j/**", "com/jediterm/**", "org/jetbrains/jediterm/**")
     })
 
     extensions.configure(NeoForgeExtension::class.java, action<NeoForgeExtension> { extension ->
@@ -886,16 +879,37 @@ private fun shouldCoalesceNeoForgeClass(jar: File, name: String, outerPackages:
         return false
     }
     val classPackage = classPackage(name) ?: return false
+    if (jar.name == "Remotely-App.jar") {
+        return true
+    }
     return classPackage in outerPackages
 }
 
 private fun shouldDropNestedJarEntry(jar: File, name: String): Boolean {
+    if (jar.name == "Rebase-1.0-SNAPSHOT.jar" && isRebaseEmbeddedTerminalLibrary(name)) {
+        return true
+    }
+    if (jar.name == "jediterm-pty-2.69.jar" && isJeditermCorePackage(name)) {
+        return true
+    }
     if (jar.name == "ReScreen-1.0.jar" && isReScreenConflictingResource(name)) {
         return true
     }
     return jar.name == "Remotely-App.jar" && isRemotelyMonoAsset(name)
 }
 
+private fun isRebaseEmbeddedTerminalLibrary(name: String): Boolean {
+    return name.startsWith("com/pty4j/")
+            || name.startsWith("com/jediterm/")
+            || name.startsWith("org/jetbrains/jediterm/")
+}
+
+private fun isJeditermCorePackage(name: String): Boolean {
+    return name.startsWith("com/jediterm/terminal/")
+            && !name.startsWith("com/jediterm/terminal/debug/")
+            && !name.startsWith("com/jediterm/terminal/ui/")
+}
+
 private fun isReScreenConflictingResource(name: String): Boolean {
     return name.startsWith("assets/minecraft/")
             || name.startsWith("assets/twemoji/")

RemotelyMod/gradle.properties

@@ -1,39 +1,31 @@
-### Mod Properties ###
-# The name used to produce your mod's JAR file, also appearing in Bloom processed files and the mod's metadata.
 mod.name=Remotely
-# Your mod's ID, which is used in the mod's metadata and for identifying the mod in the game. Must be unique from other mods.
 mod.id=remotely
-# The version of your mod, which is used in the mod's metadata and for version checks.
-mod.version=2.2.1
-# The Maven group ID for your mod, which is used in the mod's metadata and for dependency management.
 mod.group=redxax.oxy.remotely
-######################
+remotely.publish.changelog=### Remotely Changes:\n\
+- Feat: Node Families Exposes Modes In Node Search.\n\
+- Fix: Various Stuff.\n\
+- Feat: Flow Editor UI/UX Improvements.\n\
+- Feat: Custom Plan Configuration.\n\
+- Fix: ESC Key Handling.\n\
+- Feat: ReProxy.\n\
+- Feat(RemotelyMod): Floating Windows, Some Fixes.\n\
+- Fix: Rewrite Gradle Structure Again.\n\
+### Rebase Changes:\n\
+- Fix: ESC Key Handling.\n\
+- Feat: ReProxy.\n\
+- Feat(RemotelyMod): Floating Windows, Some Fixes.\n\
+- Feat: Disable Animations Option.\n\
+- Feat(Relaunched): Import-Launcher, Java JRE Polishments, And More.\n\
+- Fix: Relaunched Minecraft Account Persistence.\n\
+### ReScreen Changes:\n\
+- Feat(RemotelyMod): Floating Windows, Some Fixes.\n\
+- Feat: Disable Animations Option.\n\
+- Fix: Edge-Cases Where Desktop Animations Break.
 
-### DGT Configuration ###
-# Switches the mappings for all our versions to use MCP and mojmap.
 dgt.loom.mappings=official-like
-# Sets the DGT automatic Minecraft dependency list to revision 3. Update this to latest if you want to use the latest recommended versions of libraries.
 dgt.minecraft.revision=3
-#########################
 
-#####################################################################################
-### DO NOT EDIT THE PROPERTIES BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING ###
-#####################################################################################
-
-### Gradle Configuration ###
-# Sets JVM arguments for Gradle to improve performance and stability.
-# Adjust memory settings as needed based on your system's capabilities.
-# If you're supporting the template's full version range, do not reduce these values any further, they're already quite low.
 org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
-#org.gradle.workers.max=1
 org.gradle.configureondemand=true
-############################
 
-### Loom Configuration ###
-# Allows us to use dependencies built with newer Loom by ignoring that it was built against a differing Loom version.
-# This is absolutely necessary because we use an older fork of Loom to enable Legacy Forge support.
-# As far as can be seen, there are absolutely no negative side effects to doing this. If you encounter any,
-# feel free to report them to the template's issue tracker and comment this line out to see if it resolves them.
-# You won't be able to use any dependencies built by newer Loom without this line, however.
 loom.ignoreDependencyLoomVersionValidation=true
-##########################

RemotelyMod/root.gradle.kts

@@ -33,26 +33,23 @@ fun registerBuildAggregate(name: String, descriptionText: String, loader: String
 }
 
 fun registerPublishAggregate(name: String, descriptionText: String, taskName: String, loader: String? = null) {
+    val projects = versionProjects(loader)
     tasks.register(name) {
         group = "publishing"
         description = descriptionText
-        dependsOn(versionProjects(loader).mapNotNull { project ->
-            project.tasks.findByName(taskName)?.let { project.tasks.named(taskName) }
-        })
+        dependsOn(projects.map { project -> "${project.path}:$taskName" })
     }
 }
 
 registerBuildAggregate("buildAllVersions", "Builds every enabled RemotelyMod version.")
 registerBuildAggregate("buildAllFabric", "Builds every enabled Fabric RemotelyMod version.", "fabric")
 registerBuildAggregate("buildAllNeoForge", "Builds every enabled NeoForge RemotelyMod version.", "neoforge")
 
-gradle.projectsEvaluated {
-    registerPublishAggregate("publishAllVersions", "Publishes every enabled RemotelyMod version.", "publishMod")
-    registerPublishAggregate("publishAllFabric", "Publishes every enabled Fabric RemotelyMod version.", "publishMod", "fabric")
-    registerPublishAggregate("publishAllNeoForge", "Publishes every enabled NeoForge RemotelyMod version.", "publishMod", "neoforge")
-    registerPublishAggregate("publishAllVersionsToModrinth", "Publishes every enabled RemotelyMod version to Modrinth.", "publishModrinth")
-    registerPublishAggregate("publishAllVersionsToCurseForge", "Publishes every enabled RemotelyMod version to CurseForge.", "publishCurseforge")
-}
+registerPublishAggregate("publishAllVersions", "Publishes every enabled RemotelyMod version.", "publishMod")
+registerPublishAggregate("publishAllFabric", "Publishes every enabled Fabric RemotelyMod version.", "publishMod", "fabric")
+registerPublishAggregate("publishAllNeoForge", "Publishes every enabled NeoForge RemotelyMod version.", "publishMod", "neoforge")
+registerPublishAggregate("publishAllVersionsToModrinth", "Publishes every enabled RemotelyMod version to Modrinth.", "publishModrinth")
+registerPublishAggregate("publishAllVersionsToCurseForge", "Publishes every enabled RemotelyMod version to CurseForge.", "publishCurseforge")
 
 preprocess {
     strictExtraMappings.set(true)

RemotelyMod/settings.gradle.kts

@@ -1,4 +1,5 @@
 import groovy.lang.MissingPropertyException
+import java.util.Properties
 
 pluginManagement {
     includeBuild("build-logic")
@@ -36,8 +37,16 @@ plugins {
 }
 
 val dropFabricProjectPattern = Regex("""^\d{2,}\.\d+(?:\.\d+)?(?:-(?:snapshot|pre|rc)-\d+)?-fabric$""")
+val remotelyAppProperties = Properties().apply {
+    file("../gradle.properties").inputStream().use(::load)
+}
+val remotelyVersion = remotelyAppProperties.getProperty("remotely.version")
+    ?: throw MissingPropertyException("remotely.version has not been set.")
 
 gradle.beforeProject {
+    extensions.extraProperties["remotely.version"] = remotelyVersion
+    extensions.extraProperties["mod.version"] = remotelyVersion
+
     if (dropFabricProjectPattern.matches(name)) {
         extensions.extraProperties["fabric.loom.disableObfuscation"] = "true"
         extensions.extraProperties["dgt.loom.mappings.use"] = "false"

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "redxax.oxy"
-version = "2.2.1"
+version = property("remotely.version").toString()
 
 application {
     mainClass.set("redxax.oxy.remotely.RemotelyInit")

gradle.properties

@@ -1,40 +1,6 @@
-### Mod Properties ###
-# The name used to produce your mod's JAR file, also appearing in Bloom processed files and the mod's metadata.
-mod.name=Remotely
-# Your mod's ID, which is used in the mod's metadata and for identifying the mod in the game. Must be unique from other mods.
-mod.id=remotely
-# The version of your mod, which is used in the mod's metadata and for version checks.
-mod.version=2.2.1
-# The Maven group ID for your mod, which is used in the mod's metadata and for dependency management.
-mod.group=redxax.oxy.remotely
-######################
+remotely.version=2.3.0
 
-### DGT Configuration ###
-# Switches the mappings for all our versions to use MCP and mojmap.
-dgt.loom.mappings=official-like
-# Sets the DGT automatic Minecraft dependency list to revision 3. Update this to latest if you want to use the latest recommended versions of libraries.
-dgt.minecraft.revision=3
-#########################
-
-#####################################################################################
-### DO NOT EDIT THE PROPERTIES BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING ###
-#####################################################################################
-
-### Gradle Configuration ###
-# Sets JVM arguments for Gradle to improve performance and stability.
-# Adjust memory settings as needed based on your system's capabilities.
-# If you're supporting the template's full version range, do not reduce these values any further, they're already quite low.
 org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.workers.max=6
 org.gradle.configureondemand=true
-############################
-
-### Loom Configuration ###
-# Allows us to use dependencies built with newer Loom by ignoring that it was built against a differing Loom version.
-# This is absolutely necessary because we use an older fork of Loom to enable Legacy Forge support.
-# As far as can be seen, there are absolutely no negative side effects to doing this. If you encounter any,
-# feel free to report them to the template's issue tracker and comment this line out to see if it resolves them.
-# You won't be able to use any dependencies built by newer Loom without this line, however.
-loom.ignoreDependencyLoomVersionValidation=true
-##########################