diff --git a/build.gradle.kts b/build.gradle.kts index 6deeee8..5adcd1b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,6 @@ import groovy.json.JsonOutput import groovy.json.JsonSlurper import net.fabricmc.loom.api.LoomGradleExtensionAPI import net.fabricmc.loom.task.RemapJarTask -import org.gradle.configurationcache.extensions.capitalized import java.io.ByteArrayOutputStream import java.util.jar.JarEntry import java.util.jar.JarFile @@ -14,7 +13,7 @@ import java.util.zip.Deflater plugins { java id("architectury-plugin") version "3.4.155" apply false - id("dev.architectury.loom") version "1.4.380" apply false + id("dev.architectury.loom") version "1.7.412" apply false id("com.github.johnrengelman.shadow") version "8.1.1" apply false } @@ -62,9 +61,9 @@ subprojects { setupRepositories() - val capitalizedName = project.name.capitalized() + val capitalizedName = project.name.replaceFirstChar(Char::uppercase) - val loom = project.extensions.getByType() + val loom = project.the() loom.silentMojangMappingsLicense() configurations.configureEach { @@ -265,7 +264,7 @@ fun hasUnstaged(): Boolean { commandLine("git", "status", "--porcelain") standardOutput = stdout } - val result = stdout.toString().replace("M gradlew", "").trimEnd() + val result = stdout.toString().replace(Regex("M gradlew(\\.bat)?"), "").trimEnd() if (result.isNotEmpty()) println("Found stageable results:\n${result}\n") return result.isNotEmpty() diff --git a/common/src/generated/resources/.cache/60a03fe496bf6ea7de10fb84452b89234f6f6b84 b/common/src/generated/resources/.cache/60a03fe496bf6ea7de10fb84452b89234f6f6b84 index e7ab5ab..52f2272 100644 --- a/common/src/generated/resources/.cache/60a03fe496bf6ea7de10fb84452b89234f6f6b84 +++ b/common/src/generated/resources/.cache/60a03fe496bf6ea7de10fb84452b89234f6f6b84 @@ -1,4 +1,4 @@ -// 1.19.2 2024-09-01T23:48:54.284685 Registrate Provider for interiors [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2024-09-03T20:07:54.348313 Registrate Provider for interiors [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] c25c83c809240257d0c27919672142d9ff2268f2 data/interiors/advancements/recipes/interiors/crafting/floor_chair/cyan_floor_chair_from_seat.json c019ad63d14d017d5226a88cfbf6124c8b1d99c1 assets/interiors/models/block/floor_chair/green_floor_chair_right.json d4f0830fbe4e1027517569b504d8281ed9e4be11 assets/interiors/models/block/floor_chair/purple_floor_chair_left_cropped.json diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 64fc238..8ae7a28 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -4,7 +4,6 @@ loom { val common = project(":common") accessWidenerPath = common.loom.accessWidenerPath - silentMojangMappingsLicense() runs.configureEach { vmArg("-Dmixin.debug.export=true") vmArg("-Dmixin.env.remapRefMap=true") diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index 7741c10..6bcc216 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -1,7 +1,6 @@ architectury.forge() loom { - silentMojangMappingsLicense() runs.configureEach { vmArg("-Dmixin.debug.export=true") vmArg("-Dmixin.env.remapRefMap=true") diff --git a/gradle.properties b/gradle.properties index d6fcf22..f3db5e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ qm_version = 22 parchment_version = 2022.11.27 # Fabric - https://fabricmc.net/develop/ -fabric_loader_version = 0.15.3 +fabric_loader_version = 0.16.0 fabric_api_version = 0.77.0 # Forge - https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.html @@ -32,12 +32,12 @@ forge_version = 43.3.0 ## Create # https://mvn.devos.one/#/snapshots/com/simibubi/create/create-fabric-1.20.1 -create_fabric_version = 0.5.1-f-build.1286 +create_fabric_version = 0.5.1-h-build.1515 # https://github.com/Creators-of-Create/Create/wiki/Depending-on-Create -create_forge_version = 0.5.1.f-46 +create_forge_version = 0.5.1.h-58 registrate_forge_version = MC1.19-1.1.5 flywheel_forge_minecraft_version = 1.19.2 -flywheel_forge_version = 0.6.10-20 +flywheel_forge_version = 0.6.11-22 ## Fabric Mods # https://modrinth.com/mod/lazydfu/versions diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..2c35211 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/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 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# 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/. @@ -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 diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/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 ##########################################################################