1.3.0: World of (coherent) Color

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v3
       - uses: actions/setup-java@v4
         with:
           java-version: '21'

README.md

@@ -1,28 +1,29 @@
-<br/>
-
-<div align="center">
-
-<a href="https://github.com/CallMeEchoCodes/Hollow"><img src="src/main/resources/assets/hollow/icon.png" alt="Logo" height="250"></a>
-
-### Hollow
+# Hollow
 
 A mod about hollow logs and hollow promises
 
 <img alt="fabric" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/fabric_vector.svg">
+<img alt="quilt" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/quilt_vector.svg">
 <img alt="forge" height="40" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/unsupported/forge_vector.svg">
-<img alt="spirit" height="40" src="https://raw.githubusercontent.com/SpiritGameStudios/.github/main/assets/brand/badge/compact.svg">
-</div>
+<img alt="Made by Spirit Studios" src="https://raw.githubusercontent.com/SpiritGameStudios/.github/main/assets/brand/badge/compact.svg">
 
 ## 📖 About
+*DISCLAIMER: Do not use the existence of this mod as an excuse to harass Mojang. The name is a joke, Mojang promised nothing.*
+
 Have you ever seen that one birch forest concept and thought, "Wow, I wish that was actually in the game"? Well then this mod is for you.
 
-Hollow adds in as many missing features as it can, fulfilling Mojang's hollow promises.
+Hollow adds in as many missing features as it can, fulfilling Mojang's "hollow" promises.
 
 ## ❓ FAQ
 * Forge? <br/>
-No. Do not ask me for forge or you will be blocked instantly.
+  No. Do not ask us for forge or neoforge support. It isn't happening.
+
+* Can I use this mod in a Mod Pack? <br/>
+  Yes! Go ahead! Just make sure we are credited somewhere and don't reupload our .jar file. If you make a pack with one of our mods, we would love to know! Join our discord and tell us!
+
 * Do you plan to add `X`? <br/>
-If it's in one of the concept art images, probably. Some features take longer than others.
-If you want to suggest something, join the [discord](https://discord.gg/TTmx7d2axf).
+  If it's in one of the concept art images, probably. Some features take longer than others. If you want to suggest something, join the [discord](https://discord.gg/TTmx7d2axf).
+
 * Can you port/backport to `X` version? <br/>
-Updating is a maybe. Seeing as I'm making this for fun, it comes down to whatever version I'm playing on at the time. For backports, probably not. I might do `1.19.2` as I play that a lot but other than that, no.
+  Updates to new versions will probably happen at some point. Porting is hard and takes time so don't expect it instantly.
+  Backports won't happen. Multiversion modding is hard, annoying, and not worth the effort.

build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     java
-    id("fabric-loom") version "1.7-SNAPSHOT"
+    alias(libs.plugins.fabric.loom)
+    alias(libs.plugins.minotaur)
 }
 
 class ModInfo {
@@ -9,17 +10,19 @@ class ModInfo {
     val version = property("mod.version").toString()
 }
 
-class Dependencies {
-    val minecraft = property("deps.minecraft").toString()
-    val loader = property("deps.loader").toString()
-    val yarn = property("deps.yarn").toString()
+val mod = ModInfo()
 
-    val fabricApi = property("deps.fabricapi").toString()
-    val specter = property("deps.specter").toString()
-}
+version = mod.version
+group = mod.group
 
-val mod = ModInfo()
-val deps = Dependencies()
+base.archivesName = "${mod.id}-${mod.version}"
+
+
+fabricApi {
+    configureDataGeneration {
+        client = true
+    }
+}
 
 loom {
     splitEnvironmentSourceSets()
@@ -31,56 +34,42 @@ loom {
     }
 }
 
-fabricApi {
-    configureDataGeneration()
-}
-
 repositories {
-    maven("https://maven.callmeecho.dev/releases/")
+    mavenCentral()
+    maven("https://maven.spiritstudios.dev/releases/")
     maven("https://maven.terraformersmc.com/releases/")
-    maven("https://api.modrinth.com/maven/")
+    maven("https://maven.gegy.dev/")
+
+    exclusiveContent {
+        forRepository { maven("https://api.modrinth.com/maven/") }
+        filter { includeGroup("maven.modrinth") }
+    }
 }
 
 dependencies {
-    minecraft("com.mojang:minecraft:${deps.minecraft}")
-    mappings("net.fabricmc:yarn:${deps.yarn}:v2")
-    modImplementation("net.fabricmc:fabric-loader:${deps.loader}")
+    minecraft(libs.minecraft)
+    mappings(variantOf(libs.yarn) { classifier("v2") })
+    modImplementation(libs.fabric.loader)
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:${deps.fabricApi}")
-
-    fun specterModule(name: String) {
-        include("dev.spiritstudios.specter:specter-$name:${deps.specter}")
-        modImplementation("dev.spiritstudios.specter:specter-$name:${deps.specter}")
-    }
+    modImplementation(libs.fabric.api)
 
-    specterModule("api")
-    specterModule("block")
-    specterModule("config")
-    specterModule("core")
-    specterModule("entity")
-    specterModule("item")
-    specterModule("registry")
-    specterModule("render")
+    include(libs.bundles.specter)
+    modImplementation(libs.bundles.specter)
 
-    modRuntimeOnly("dev.spiritstudios.specter:specter-debug:${deps.specter}")
+    modRuntimeOnly(libs.specter.debug)
 
-    // will be switched back to lambdynamiclights once it's updated
-    modCompileOnly("maven.modrinth:ryoamiclights:0.2.9+mc1.21-fabric")
+    modImplementation(libs.lambdynamiclights)
 }
 
 tasks.processResources {
-    inputs.property("id", mod.id)
-    inputs.property("version", mod.version)
-    inputs.property("loader_version", deps.loader)
-    inputs.property("minecraft_version", deps.minecraft)
-
     val map = mapOf(
-        "id" to mod.id,
-        "version" to mod.version,
-        "loader_version" to deps.loader,
-        "minecraft_version" to deps.minecraft
+        "mod_id" to mod.id,
+        "mod_version" to mod.version,
+        "fabric_loader_version" to libs.versions.fabric.loader.get(),
+        "minecraft_version" to libs.versions.minecraft.get()
     )
 
+    inputs.properties(map)
     filesMatching("fabric.mod.json") { expand(map) }
 }
 
@@ -91,9 +80,23 @@ java {
     targetCompatibility = JavaVersion.VERSION_21
 }
 
-
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
     options.release = 21
 }
 
+tasks.jar { from("LICENSE") { rename { "${it}_${base.archivesName}" } } }
+
+modrinth {
+    token.set(System.getenv("MODRINTH_TOKEN"))
+    projectId.set(mod.id)
+    versionNumber.set(mod.version)
+    uploadFile.set(tasks.remapJar)
+    gameVersions.addAll(libs.versions.minecraft.get(), "1.21.1")
+    loaders.addAll("fabric", "quilt")
+    syncBodyFrom.set(rootProject.file("README.md").readText())
+    dependencies {
+        required.version("fabric-api", libs.versions.fabric.api.get())
+        optional.version("lambdynamiclights", libs.versions.lambdynamiclights.get())
+    }
+}

gradle.properties

@@ -1,13 +1,6 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-mod.version = 1.2.5
+mod.version = 1.3.0
 mod.group = dev.spiritstudios
-mod.id = hollow
-
-deps.minecraft=1.21
-deps.loader=0.15.11
-deps.yarn=1.21+build.9
-
-deps.fabricapi=0.103.0+1.21.1
-deps.specter=1.0.2
+mod.id = hollow

gradle/libs.versions.toml

@@ -0,0 +1,49 @@
+[versions]
+fabric_loom = "1.9-SNAPSHOT"
+minotaur = "2.+"
+
+minecraft = "1.21"
+yarn = "1.21+build.9"
+
+fabric_loader = "0.16.5"
+fabric_api = "0.109.0+1.21.1"
+
+specter = "1.1.1"
+
+lambdynamiclights = "3.1.2+1.21.1"
+
+[plugins]
+fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
+minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
+
+[libraries]
+minecraft = { group = "mojang", name = "minecraft", version.ref = "minecraft" }
+yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
+
+fabric_loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric_loader" }
+fabric_api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric_api" }
+
+specter_api = { group = "dev.spiritstudios.specter", name = "specter-api", version.ref = "specter" }
+specter_block = { group = "dev.spiritstudios.specter", name = "specter-block", version.ref = "specter" }
+specter_config = { group = "dev.spiritstudios.specter", name = "specter-config", version.ref = "specter" }
+specter_core = { group = "dev.spiritstudios.specter", name = "specter-core", version.ref = "specter" }
+specter_serialization = { group = "dev.spiritstudios.specter", name = "specter-serialization", version.ref = "specter" }
+specter_entity = { group = "dev.spiritstudios.specter", name = "specter-entity", version.ref = "specter" }
+specter_item = { group = "dev.spiritstudios.specter", name = "specter-item", version.ref = "specter" }
+specter_registry = { group = "dev.spiritstudios.specter", name = "specter-registry", version.ref = "specter" }
+specter_render = { group = "dev.spiritstudios.specter", name = "specter-render", version.ref = "specter" }
+specter_debug = { group = "dev.spiritstudios.specter", name = "specter-debug", version.ref = "specter" }
+
+lambdynamiclights = { group = "dev.lambdaurora.lambdynamiclights", name = "lambdynamiclights-runtime", version.ref = "lambdynamiclights" }
+
+[bundles]
+specter = [
+    "specter_block",
+    "specter_config",
+    "specter_core",
+    "specter_entity",
+    "specter_item",
+    "specter_registry",
+    "specter_render",
+    "specter_serialization"
+]

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @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 ##########################################################################

settings.gradle.kts

@@ -1,7 +1,6 @@
 pluginManagement {
     repositories {
         maven("https://maven.fabricmc.net/")
-        mavenCentral()
         gradlePluginPortal()
     }
 }