The big refactor stuff

README.md

@@ -10,7 +10,7 @@ link(shield("License", "License", "LGPL-3.0", "blue"), "{{mod_url}}/blob/master/
 "{{mod_description}}".replace("Kotlin", link("Kotlin", "https://kotlinlang.org/")).replace("Ender-Development's mods", link("Ender-Development's mods", "https://www.curseforge.com/members/enderdevelopment/projects"))
 ].join("\n")
 -->
-[![Kotlin](https://img.shields.io/badge/Kotlin-2.2.20-blue.svg)](https://kotlinlang.org/)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.3.0-blue.svg)](https://kotlinlang.org/)
 [![Maven artifact](https://img.shields.io/badge/Maven-org.ender__development%3Acatalyx-blue.svg)](https://maven.ender-development.org/org/ender_development/catalyx/)
 [![Version](https://img.shields.io/badge/Version-0.1.0-blue.svg)](https://github.com/Ender-Development/Catalyx/commits/master)
 [![License](https://img.shields.io/badge/License-LGPL--3.0-blue.svg)](https://github.com/Ender-Development/Catalyx/blob/master/LICENSE)

build.gradle.kts

@@ -22,6 +22,7 @@ plugins {
     id("catalyx.propsync")
     id("catalyx.buildfilesync")
     id("catalyx.referencecreator") apply false
+    id("catalyx.ijscopecreator")
     id("java")
     id("java-library")
     id("maven-publish")
@@ -62,7 +63,14 @@ checkSubPropertiesExist("use_groovyscript", "groovyscript_version")
 checkSubPropertiesExist("use_hei", "hei_version")
 checkSubPropertiesExist("use_top", "top_version")
 
-kotlin { jvmToolchain(8) }
+kotlin {
+    jvmToolchain(8)
+    compilerOptions {
+        freeCompilerArgs.add("-Xexplicit-backing-fields")
+        freeCompilerArgs.add("-Xcontext-sensitive-resolution")
+        extraWarnings.set(true)
+    }
+}
 
 minecraft {
     mcVersion = propertyString("minecraft_version")
@@ -244,8 +252,8 @@ tasks.withType<Jar> {
             if (propertyBoolean("coremod_includes_mod")) {
                 attributeMap["FMLCorePluginContainsFMLMod"] = "true"
                 val currentTask = gradle.startParameter.taskNames
-                val validTasks = listOf("build", "prepareObfModsFolder", "runObfClient")
-                if (currentTask[0] in validTasks) attributeMap["ForceLoadAsMod"] = "true"
+                val validTasks = arrayOf("build", "prepareObfModsFolder", "runObfClient")
+                if (!currentTask.isEmpty() && currentTask[0] in validTasks) attributeMap["ForceLoadAsMod"] = "true"
             }
         }
         if (propertyBoolean("use_access_transformer")) {

buildSrc/CHANGELOG.md

@@ -0,0 +1,87 @@
+# Catalyx Buildscripts Changelog
+
+<!--
+Writing a changelog is a good practice for maintaining a clear history of changes in your project.
+Try to follow the [Common Changelog](https://common-changelog.org/) conventions.
+-->
+
+## [0.5.2] - 2026-02-03
+
+_general maintenance._
+
+- update dependencies
+- add a few more mavens
+
+## [0.5.1] - 2026-01-26
+
+_this is fine._
+
+- update dependencies
+- enable a few experimental kotlin features
+- experimental: sync kotlin version from template
+
+## [0.5.0] - 2026-01-19
+
+_Happy new year._
+
+- extend secrets management
+- fix package name in reference creator
+- add indent guesser for reference creator
+- update dependencies
+- auto create IntelliJ scope file
+- improve sync plugin
+
+## [0.4.1] - 2025-11-26
+
+_that one is on me._
+
+- fix dependency loader
+
+## [0.4.0] - 2025-11-17
+
+_sync scripts_
+
+- implement local plugin updater
+- add .gitattributes
+- fix new tag implementation
+
+## [0.3.0] - 2025-11-08
+
+_spotless flex_
+
+- utilize flexmark
+- update docs
+- replace RFG tag system with a new implementation
+
+## [0.2.0] - 2025-10-29
+
+_Look at this pretty image._
+
+- organization assets
+- update dependencies
+- .editorconfig profiles
+
+## [0.1.0] - 2025-10-18
+
+_You could almost call it usable._
+
+- spotless formatting
+- .editorconfig
+- property sync from template
+- groovyscript jvm argument management
+- proper dependency manager
+
+## [0.0.2] - 2025-10-14
+
+_The second iteration..._
+
+- change license
+- we now use a local plugin structure
+
+## [0.0.1] - 2025-10-13
+
+_The first iteration..._
+
+## [0.0.0] - 2025-10-09
+
+_Initial commit._

buildSrc/build.gradle.kts

@@ -41,5 +41,9 @@ gradlePlugin {
             id = "catalyx.referencecreator"
             implementationClass = "plugins.ReferenceCreator"
         }
+        create("ijScopeCreatorPlugin") {
+            id = "catalyx.ijscopecreator"
+            implementationClass = "plugins.IJScopeCreator"
+        }
     }
 }

buildSrc/src/main/kotlin/Repositories.kt

@@ -4,14 +4,33 @@ import org.gradle.kotlin.dsl.repositories
 fun Project.loadDefaultRepositories() {
     repositories {
         mavenCentral()
+        // RetroFuturaGradle
         maven {
-            name = "CleanroomMC Maven"
-            url = uri("https://maven.cleanroommc.com")
+            name = "GTNH Maven"
+            url = uri("https://nexus.gtnewhorizons.com/repository/public/")
+        }
+        // JitPack is a novel package repository for JVM and Android projects.
+        // It builds Git projects on demand and provides you with ready-to-use artifacts (jar, aar).
+        // Docs: https://docs.jitpack.io/
+        maven {
+            name = "JitPack"
+            url = uri("https://jitpack.io")
         }
         maven {
             name = "SpongePowered Maven"
             url = uri("https://repo.spongepowered.org/maven")
         }
+        // HEI, MixinBooter, GroovyScript, Forgelin Continuous, ...
+        maven {
+            name = "CleanroomMC Maven"
+            url = uri("https://maven.cleanroommc.com")
+        }
+        // Our own maven, meow :3
+        maven {
+            name = "Ender-Development Maven"
+            url = uri("https://maven.ender-development.org/")
+        }
+        // Better implementation of the curseforge maven, which allows adding mods that disable third party downloads
         exclusiveContent {
             forRepository {
                 maven {
@@ -34,25 +53,52 @@ fun Project.loadDefaultRepositories() {
                 includeGroup("maven.modrinth")
             }
         }
+        // CraftTweaker, ContentTweaker, BWM, JEI, ...
         maven {
             name = "BlameJared's Maven"
             url = uri("https://maven.blamejared.com/")
         }
+        // GTCE, GTCEu, AE2uel, EnderIO
         maven {
-            name = "JitPack"
-            url = uri("https://jitpack.io")
+            name = "GTCEu Maven"
+            url = uri("https://maven.gtceu.com")
         }
+        // AE2, Mekanism, ProjectE, ComputerCraft, OpenComputers, ...
         maven {
-            name = "Ender-Development Maven"
-            url = uri("https://maven.ender-development.org/")
+            name = "Thiakil's Maven"
+            url = uri("https://maven.thiakil.com/")
         }
         maven {
-            name = "GTNH Maven"
-            url = uri("https://nexus.gtnewhorizons.com/repository/public/")
+            name = "AppleCore's Maven"
+            url = uri("https://www.ryanliptak.com/maven/")
         }
+        // TiCo, Mantle, HungerOverhaul, Natura, IronChest, ...
         maven {
-            name = "GTCEu Maven"
-            url = uri("https://maven.gtceu.com")
+            name = "Mantle's Maven"
+            url = uri("https://dvs1.progwml6.com/files/maven")
+        }
+        // CTM
+        maven {
+            name = "tterrag's Maven"
+            url = uri("https://maven.tterrag.com/")
+        }
+        // cofh, codechicken, ProjectRed, p455w0rd, brandon3055, ...
+        maven {
+            name = "covers1624's Maven"
+            url = uri("https://maven.covers1624.net/")
+        }
+        maven {
+            name = "modmuss50's Maven"
+            url = uri("https://maven.modmuss50.me/")
+        }
+        maven {
+            name = "BuildCraft's Maven"
+            url = uri("https://mod-buildcraft.com/maven/")
+        }
+        // Large collection of mods from various authors, curseforge maven precursor
+        maven {
+            name = "ModMaven"
+            url = uri("https://modmaven.dev/")
         }
         mavenLocal() // Must be last for caching to work
     }

buildSrc/src/main/kotlin/plugins/IJScopeCreator.kt

@@ -0,0 +1,46 @@
+package plugins
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import propertyString
+import util.OnlineUtils
+import kotlin.io.path.createDirectories
+import kotlin.io.path.createFile
+import kotlin.io.path.div
+import kotlin.io.path.notExists
+import kotlin.io.path.writeText
+
+@Suppress("UNUSED")
+class IJScopeCreator : Plugin<Project> {
+    companion object {
+        const val SCOPE_FILE = "Mod_Source.xml"
+
+        private fun createIJScope(project: Project) {
+            if (OnlineUtils.isTemplateProject()) {
+                return
+            }
+
+            val modName = project.propertyString("mod_name")
+            val filteredModName = modName.filter(Char::isLetterOrDigit)
+            val outputPath = project.rootDir.toPath() / ".idea" / "scopes" / SCOPE_FILE
+
+            val ijScope = buildString {
+                appendLine("<component name=\"DependencyValidationManager\">")
+                appendLine("  <scope name=\"$modName Source\" pattern=\"file[$filteredModName.main]:*/&amp;&amp;!file[$filteredModName.main]:resources//*\" />")
+                appendLine("</component>")
+            }
+
+            if (outputPath.notExists()) {
+                outputPath.parent.createDirectories()
+                outputPath.createFile()
+            }
+            outputPath.writeText(ijScope)
+            Logger.info("IntelliJ scope file created at ${outputPath.normalize()}")
+        }
+    }
+
+    override fun apply(target: Project) {
+        Logger.greet(this)
+        createIJScope(target)
+    }
+}

buildSrc/src/main/kotlin/plugins/PropSync.kt

@@ -12,7 +12,7 @@ import java.nio.file.StandardCopyOption
 import java.util.Properties
 
 class PropSync : Plugin<Project> {
-    data class SyncConfig(val keysToSync: List<String> = emptyList(), val syncAll: Boolean = false)
+    data class SyncConfig(val keysToSync: List<String> = emptyList(), val syncAll: Boolean = false, val path: String = "buildSrc/src/main/resources/")
 
     companion object {
         private var foundUpdate = false
@@ -46,6 +46,11 @@ class PropSync : Plugin<Project> {
             "tags.properties" to SyncConfig(
                 syncAll = true,
             ),
+            // This one is new, still needs to be tested
+            "gradle.properties" to SyncConfig(
+                keysToSync = listOf("kotlin_version"),
+                path = "",
+            ),
         )
 
         fun syncPropertiesFromTemplate() {
@@ -59,12 +64,12 @@ class PropSync : Plugin<Project> {
             Logger.info("Syncing with template repository: ${OnlineUtils.TEMPLATE_REPO}")
             syncConfig.forEach { (file, cfg) ->
                 try {
-                    val templateProperties = fetchTemplateProperties(file)
+                    val templateProperties = fetchTemplateProperties(file, cfg.path)
                     val localProperties = Loader.loadPropertyFromFile(file)
 
                     val mergedProperties = mergeProperties(localProperties, templateProperties, cfg)
                     if (foundUpdate) {
-                        updateLocalPropertiesFile(file, mergedProperties)
+                        updateLocalPropertiesFile(cfg.path, file, mergedProperties)
                         Logger.info("Synchronized properties for '$file'")
                     } else {
                         Logger.info("No changes detected for '$file'")
@@ -75,8 +80,8 @@ class PropSync : Plugin<Project> {
             }
         }
 
-        private fun fetchTemplateProperties(fileName: PropertyFile): Properties {
-            val url = "${OnlineUtils.GITHUB_RAW_URL}/${OnlineUtils.TEMPLATE_REPO}/${OnlineUtils.TEMPLATE_BRANCH}/buildSrc/src/main/resources/$fileName"
+        private fun fetchTemplateProperties(fileName: PropertyFile, path: String): Properties {
+            val url = "${OnlineUtils.GITHUB_RAW_URL}/${OnlineUtils.TEMPLATE_REPO}/${OnlineUtils.TEMPLATE_BRANCH}/$path$fileName"
             val properties = Properties()
             val content = OnlineUtils.fetchFileContent(url) ?: throw Exception("Failed to fetch content from $url")
             properties.load(ByteArrayInputStream(content.toByteArray()))
@@ -110,8 +115,8 @@ class PropSync : Plugin<Project> {
             return merged
         }
 
-        private fun updateLocalPropertiesFile(fileName: PropertyFile, properties: Properties) {
-            val buildSrcDirectory = project.rootProject.file("buildSrc/src/main/resources")
+        private fun updateLocalPropertiesFile(path: String, fileName: PropertyFile, properties: Properties) {
+            val buildSrcDirectory = project.rootProject.file(path.removeSuffix("/"))
             val propertyFile = File(buildSrcDirectory, fileName)
             if (propertyFile.exists().not()) {
                 return Logger.warn("Property file '$fileName' does not exist at ${propertyFile.absolutePath}, skipping update.")
@@ -135,6 +140,7 @@ class PropSync : Plugin<Project> {
                 existingLines.forEach {
                     when {
                         it.startsWith("#") || it.trim().isEmpty() -> lines.add(it)
+
                         it.contains("=") -> {
                             val key = it.substringBefore("=").trim()
                             val newValue = properties.getProperty(key)
@@ -147,6 +153,7 @@ class PropSync : Plugin<Project> {
                                 updatedKeys.add(key)
                             } ?: lines.add(it) // Keep existing line if key not in new properties
                         }
+
                         else -> lines.add(it)
                     }
                 }