build: use composite builds instead of buildSrc

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
             -   uses: ./.github/composite/gradle
             -   name: Build with gradle
                 run: |
-                    ./gradlew remapJar --scan
+                    ./gradlew assemble --scan
             -   name: Move build artifact around and print check sum
                 run: |
                     rm -f build/libs/*sources*.jar

.gitignore

@@ -6,8 +6,8 @@
 .properties
 /.gradle
 /build/
-/buildSrc/.gradle
-/buildSrc/build/
+/build-logic/.gradle
+/build-logic/build/
 /*/build
 .kotlin
 

build-logic/build.gradle.kts

@@ -3,11 +3,12 @@
 // SPDX-License-Identifier: CC0-1.0
 
 plugins {
-	kotlin("jvm") version "2.1.0"
 	`kotlin-dsl`
+	kotlin("jvm") version "2.0.21"
 }
 repositories {
 	mavenCentral()
+	gradlePluginPortal()
 	maven {
 		name = "jitpack"
 		url = uri("https://jitpack.io")
@@ -19,11 +20,3 @@ dependencies {
 	implementation("net.fabricmc:access-widener:2.1.0")
 	implementation("com.google.code.gson:gson:2.10.1")
 }
-
-sourceSets {
-	main {
-		kotlin {
-			srcDir(file("src"))
-		}
-	}
-}

build-logic/gradle/wrapper/gradle-wrapper.properties

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

build-logic/gradlew

@@ -0,0 +1,251 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

build-logic/gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

build-logic/settings.gradle.kts

@@ -0,0 +1,8 @@
+dependencyResolutionManagement {
+	versionCatalogs {
+		create("libs") {
+			from(files("../gradle/libs.versions.toml"))
+		}
+	}
+}
+rootProject.name = "firm-build-logic"

build-logic/src/main/kotlin/firmament.base.gradle.kts

@@ -0,0 +1 @@
+group = "moe.nea.firmament"

build-logic/src/main/kotlin/firmament.common.gradle.kts

@@ -0,0 +1,2 @@
+apply(plugin = "firmament.base")
+apply(plugin = "firmament.repositories")

build-logic/src/main/kotlin/firmament.license-management.gradle.kts

@@ -0,0 +1,5 @@
+apply(plugin = "moe.nea.licenseextractificator")
+
+configure<moe.nea.licenseextractificator.LicenseExtension> {
+	addExtraLicenseMatchers()
+}

build-logic/src/main/kotlin/firmament.repositories.gradle.kts

@@ -0,0 +1,46 @@
+repositories {
+	mavenCentral()
+	maven("https://maven.terraformersmc.com/releases/")
+	maven("https://maven.shedaniel.me")
+	maven("https://maven.fabricmc.net")
+	maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
+	maven("https://api.modrinth.com/maven") {
+		content {
+			includeGroup("maven.modrinth")
+		}
+	}
+	maven("https://repo.sleeping.town") {
+		content {
+			includeGroup("com.unascribed")
+		}
+	}
+	ivy("https://github.com/HotswapProjects/HotswapAgent/releases/download") {
+		patternLayout {
+			artifact("[revision]/[artifact]-[revision].[ext]")
+		}
+		content {
+			includeGroup("virtual.github.hotswapagent")
+		}
+		metadataSources {
+			artifact()
+		}
+	}
+	maven("https://server.bbkr.space/artifactory/libs-release")
+	maven("https://repo.nea.moe/releases")
+	maven("https://maven.notenoughupdates.org/releases")
+	maven("https://repo.nea.moe/mirror")
+	maven("https://jitpack.io/") {
+		content {
+			includeGroupByRegex("(com|io)\\.github\\..+")
+			excludeModule("io.github.cottonmc", "LibGui")
+		}
+	}
+	maven("https://repo.hypixel.net/repository/Hypixel/")
+	maven("https://maven.azureaaron.net/snapshots")
+	maven("https://maven.azureaaron.net/releases")
+	maven("https://www.cursemaven.com")
+	maven("https://maven.isxander.dev/releases") {
+		name = "Xander Maven"
+	}
+	mavenLocal()
+}

build.gradle.kts

@@ -28,14 +28,15 @@ plugins {
 	alias(libs.plugins.kotlin.plugin.powerassert)
 	alias(libs.plugins.kotlin.plugin.ksp)
 	//	alias(libs.plugins.loom)
+	alias(libs.plugins.shadow) apply false
 	// TODO: use arch loom once they update to 1.8
 	id("fabric-loom") version "1.10.1"
-	id("moe.nea.licenseextractificator")
+	id("firmament.common")
+	id("firmament.license-management")
 	alias(libs.plugins.mcAutoTranslations)
 }
 
 version = getGitTagInfo(libs.versions.minecraft.get())
-group = rootProject.property("maven_group").toString()
 
 java {
 	withSourcesJar()
@@ -43,6 +44,7 @@ java {
 		languageVersion.set(JavaLanguageVersion.of(21))
 	}
 }
+
 loom {
 	mixin.useLegacyMixinAp.set(false)
 }
@@ -53,54 +55,6 @@ tasks.withType(KotlinCompile::class) {
 	}
 }
 
-allprojects {
-	repositories {
-		mavenCentral()
-		maven("https://maven.terraformersmc.com/releases/")
-		maven("https://maven.shedaniel.me")
-		maven("https://maven.fabricmc.net")
-		maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
-		maven("https://api.modrinth.com/maven") {
-			content {
-				includeGroup("maven.modrinth")
-			}
-		}
-		maven("https://repo.sleeping.town") {
-			content {
-				includeGroup("com.unascribed")
-			}
-		}
-		ivy("https://github.com/HotswapProjects/HotswapAgent/releases/download") {
-			patternLayout {
-				artifact("[revision]/[artifact]-[revision].[ext]")
-			}
-			content {
-				includeGroup("virtual.github.hotswapagent")
-			}
-			metadataSources {
-				artifact()
-			}
-		}
-		maven("https://server.bbkr.space/artifactory/libs-release")
-		maven("https://repo.nea.moe/releases")
-		maven("https://maven.notenoughupdates.org/releases")
-		maven("https://repo.nea.moe/mirror")
-		maven("https://jitpack.io/") {
-			content {
-				includeGroupByRegex("(com|io)\\.github\\..+")
-				excludeModule("io.github.cottonmc", "LibGui")
-			}
-		}
-		maven("https://repo.hypixel.net/repository/Hypixel/")
-		maven("https://maven.azureaaron.net/snapshots")
-		maven("https://maven.azureaaron.net/releases")
-		maven("https://www.cursemaven.com")
-		maven("https://maven.isxander.dev/releases") {
-			name = "Xander Maven"
-		}
-		mavenLocal()
-	}
-}
 kotlin {
 	sourceSets.all {
 		languageSettings {
@@ -565,5 +519,3 @@ tasks.withType<AbstractArchiveTask>().configureEach {
 	isPreserveFileTimestamps = false
 	isReproducibleFileOrder = true
 }
-
-licensing.addExtraLicenseMatchers()

gradle/libs.versions.toml

@@ -163,5 +163,6 @@ kotlin_jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin_plugin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin_plugin_powerassert = { id = "org.jetbrains.kotlin.plugin.power-assert", version.ref = "kotlin" }
 kotlin_plugin_ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin_ksp" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 loom = { id = "dev.architectury.loom", version.ref = "loom" }
 mcAutoTranslations = { id = "moe.nea.mc-auto-translations", version.ref = "mcAutoTranslations" }

settings.gradle.kts

@@ -39,3 +39,4 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 include("symbols")
 include("javaplugin")
 include("testagent")
+includeBuild("build-logic")

src/texturePacks/java/moe/nea/firmament/mixins/custommodels/LoadExtraBlockStates.java

@@ -0,0 +1,4 @@
+package moe.nea.firmament.mixins.custommodels;
+
+public class LoadExtraBlockStates {
+}