update to patch h

aesefficio · Sep 4, 2024 · 696acb3 · 696acb3
1 parent fd81286
commit 696acb3
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 19 deletions.
diff --git 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,7 +61,7 @@ subprojects {
 
 	setupRepositories()
 
-	val capitalizedName = project.name.capitalized()
+	val capitalizedName = project.name.replaceFirstChar(Char::uppercase)
 
 	val loom = project.extensions.getByType<LoomGradleExtensionAPI>()
 	loom.silentMojangMappingsLicense()
@@ -268,7 +267,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/e2778987850117b7cc788cc2ae98d0c4537669cf b/common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf
@@ -1,10 +1,10 @@
-// 1.20.1	2024-09-01T23:34:34.484888	Create: Interiors/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.20.1	2024-09-03T20:28:23.511362	Create: Interiors/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)]
 14aff3c9d61a7542b08a2b7a37385a5aaca94952 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/black_floor_chair.json
 4f547294cbced34ab6930f8c959efde9183a97ac data/interiors/advancements/recipes/building_blocks/crafting/chair/magenta_chair_from_floor_chair.json
 f1c40fb2d701527a66f4e026c7f95239681e2352 data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair.json
 e6be31072b5af08a78994380b69ca3b753805fd3 data/interiors/advancements/recipes/building_blocks/crafting/chair/blue_chair_from_floor_chair.json
-d4f0830fbe4e1027517569b504d8281ed9e4be11 assets/interiors/models/block/floor_chair/purple_floor_chair_left_cropped.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
 3924688b68ba8bb5e9b8cb7ed18e2ad9e5c9a16f assets/interiors/models/item/brown_floor_chair.json
 b02ce47e2dd2a387f9e37f15f893708fed843045 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/lime_floor_chair_from_seat.json
 81c74611f9421259786f3adffa0a2c52ce1b8068 assets/interiors/models/block/chair/magenta_chair_none_cropped.json
@@ -20,8 +20,8 @@ f77ac104d52173fc8ba260f5ee7719138c249894 data/interiors/recipes/crafting/floor_c
 e5e13b678a049b3455cacf9013177a347fbd920f data/interiors/advancements/recipes/building_blocks/crafting/chair/light_blue_chair_from_other_chair.json
 a6b1b8d4416aba2a8b1bbbb285ed1663e8b1cbd3 assets/interiors/models/block/chair/light_blue_chair_none.json
 c07c54cc70db571d50cae6e804c00e840d7edc9f data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_floor_chair.json
-44b6d1ce8c68f8ee7a3cca7668551d4a93e95f1f data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair.json
 8f827d2b2f8904010aef4fa146b8a8d1693d8376 data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json
+44b6d1ce8c68f8ee7a3cca7668551d4a93e95f1f data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair.json
 a584c10d9c0ec40fe6bfd818fa44a7e04932f94e assets/interiors/models/block/chair/green_chair_right_cropped.json
 1fe8148160ae6a9a7ef19eb31682a69959a313f2 assets/interiors/models/block/chair/gray_chair_none.json
 64e8f84ca1926e140d74e22eb4f33b76309328ca data/interiors/recipes/crafting/floor_chair/yellow_floor_chair.json
@@ -113,8 +113,8 @@ bbe13c2a55081ab78d4b207fc4fe3695bf4db99c assets/interiors/models/block/floor_cha
 c74a64580f5c109cc6a422100d63da50f90f8acf data/interiors/loot_tables/blocks/lime_chair.json
 2b4d2506d7e2a312a1a2f402f283f4aea5844bfb assets/interiors/models/item/pink_chair.json
 acc640bf6ff9fda1747f2f8bec7174c3dfa62288 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/cyan_floor_chair.json
-7951e098c2509c5e5aa3dd76bf99b1093f630cef data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_seat.json
 fe151ff7f72d46d74e99703baebb6f26adc67185 data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json
+7951e098c2509c5e5aa3dd76bf99b1093f630cef data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_seat.json
 5d8a5fb0b5104c895fa897ce3e05bf050baf742e data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_seat.json
 14ee62e5724f489ccf2e95154d882a388d30c334 data/interiors/recipes/crafting/floor_chair/green_floor_chair.json
 fa5768ba206c65705888460414ff379347998aa4 assets/interiors/models/block/floor_chair/light_gray_floor_chair_right.json
@@ -202,8 +202,8 @@ cbe648951eff6770fd529ed2affa0f638314e95b data/interiors/advancements/recipes/bui
 b2988d2492306495e9966503e51b37a4ce7dda7e data/interiors/recipes/crafting/floor_chair/white_floor_chair.json
 33ca50a314a7e994abc35bf1b06e4dbc731788de assets/interiors/models/block/chair/black_chair_both.json
 047916f611e089555cc6bd7883a05ae2df32581a assets/interiors/models/block/chair/kelp_chair_none.json
-bc6287cfc798ca9e177fe7761f8626d0e775ab62 data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json
 12f2bcf648860f442b279d82455ec94f717be978 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/magenta_floor_chair_from_seat.json
+bc6287cfc798ca9e177fe7761f8626d0e775ab62 data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json
 14b167a8a1a2c9575ba3a84353566ddd2867c0f3 data/interiors/loot_tables/blocks/gray_chair.json
 8e938ad151ff4c0f4c5d3524923c4d28d198ed88 assets/interiors/models/block/floor_chair/gray_floor_chair_none_cropped.json
 ac105974315090e84a43f5384179f791ae37a655 assets/interiors/models/block/chair/kelp_chair_both_cropped.json
@@ -351,8 +351,8 @@ dac4dc6c457ea01bd692bf04a477e10b86e9d1fd assets/interiors/blockstates/black_chai
 59daf1b84c55f35fb4548af06d37318af63e9183 assets/interiors/models/block/chair/light_gray_chair_right_cropped.json
 9e05272acf05d08cf53594a30c103d86f6f2e85c assets/interiors/models/block/chair/lime_chair_right.json
 d5805f3656a060b6366999e4bde885fd27959b9d data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair_from_floor_chair.json
-d1629b144f7bb21fdac6d84982720c8195f77b8e data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json
 a3d1e4c30bf30d1f9c7b26c6c043efe5a05502b1 data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair.json
+d1629b144f7bb21fdac6d84982720c8195f77b8e data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json
 fa0fa535b7190d9963a822cf79e3fe5086ed7cff data/interiors/recipes/crafting/floor_chair/blue_floor_chair.json
 4a34c30999dd6653e1081c30fa7fdbba1dfbe6a6 assets/interiors/models/block/chair/gray_chair_both.json
 54524072bcc8a277a004147eee971c0ee06c3bad data/interiors/recipes/crafting/chair/green_chair_from_floor_chair.json

diff --git 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
@@ -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
@@ -24,20 +24,20 @@ qm_version = 23
 parchment_version = 2023.09.03
 
 # Fabric - https://fabricmc.net/develop/
-fabric_loader_version = 0.15.3
+fabric_loader_version = 0.16.3
 fabric_api_version = 0.87.0
 
 # Forge - https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.html
 forge_version = 47.1.3
 
 ## Create
 # https://mvn.devos.one/#/snapshots/com/simibubi/create/create-fabric-1.20.1
-create_fabric_version = 0.5.1-f-build.1287
+create_fabric_version = 0.5.1-h-build.1516
 # https://github.com/Creators-of-Create/Create/wiki/Depending-on-Create
-create_forge_version = 0.5.1.f-26
+create_forge_version = 0.5.1.h-48
 registrate_forge_version = MC1.20-1.3.3
 flywheel_forge_minecraft_version = 1.20.1
-flywheel_forge_version = 0.6.10-8
+flywheel_forge_version = 0.6.11-13
 
 ## Fabric Mods
 # https://modrinth.com/mod/lazydfu/versions

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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
@@ -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
@@ -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 ##########################################################################