Skip to content

Commit 696acb3

Browse files
rhysdh540rhysdh540
committed
update to patch h
1 parent fd81286 commit 696acb3

9 files changed

+21
-19
lines changed

‎build.gradle.kts

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import groovy.json.JsonOutput
44
import groovy.json.JsonSlurper
55
import net.fabricmc.loom.api.LoomGradleExtensionAPI
66
import net.fabricmc.loom.task.RemapJarTask
7-
import org.gradle.configurationcache.extensions.capitalized
87
import java.io.ByteArrayOutputStream
98
import java.util.jar.JarEntry
109
import java.util.jar.JarFile
@@ -14,7 +13,7 @@ import java.util.zip.Deflater
1413
plugins {
1514
java
1615
id("architectury-plugin") version "3.4.155" apply false
17-
id("dev.architectury.loom") version "1.4.380" apply false
16+
id("dev.architectury.loom") version "1.7.412" apply false
1817
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
1918
}
2019

@@ -62,7 +61,7 @@ subprojects {
6261

6362
setupRepositories()
6463

65-
val capitalizedName = project.name.capitalized()
64+
val capitalizedName = project.name.replaceFirstChar(Char::uppercase)
6665

6766
val loom = project.extensions.getByType<LoomGradleExtensionAPI>()
6867
loom.silentMojangMappingsLicense()
@@ -268,7 +267,7 @@ fun hasUnstaged(): Boolean {
268267
commandLine("git", "status", "--porcelain")
269268
standardOutput = stdout
270269
}
271-
val result = stdout.toString().replace("M gradlew", "").trimEnd()
270+
val result = stdout.toString().replace(Regex("M gradlew(\\.bat)?"), "").trimEnd()
272271
if (result.isNotEmpty())
273272
println("Found stageable results:\n${result}\n")
274273
return result.isNotEmpty()

‎common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// 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+
// 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)]
22
14aff3c9d61a7542b08a2b7a37385a5aaca94952 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/black_floor_chair.json
33
4f547294cbced34ab6930f8c959efde9183a97ac data/interiors/advancements/recipes/building_blocks/crafting/chair/magenta_chair_from_floor_chair.json
44
f1c40fb2d701527a66f4e026c7f95239681e2352 data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair.json
55
e6be31072b5af08a78994380b69ca3b753805fd3 data/interiors/advancements/recipes/building_blocks/crafting/chair/blue_chair_from_floor_chair.json
6-
d4f0830fbe4e1027517569b504d8281ed9e4be11 assets/interiors/models/block/floor_chair/purple_floor_chair_left_cropped.json
76
c019ad63d14d017d5226a88cfbf6124c8b1d99c1 assets/interiors/models/block/floor_chair/green_floor_chair_right.json
7+
d4f0830fbe4e1027517569b504d8281ed9e4be11 assets/interiors/models/block/floor_chair/purple_floor_chair_left_cropped.json
88
3924688b68ba8bb5e9b8cb7ed18e2ad9e5c9a16f assets/interiors/models/item/brown_floor_chair.json
99
b02ce47e2dd2a387f9e37f15f893708fed843045 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/lime_floor_chair_from_seat.json
1010
81c74611f9421259786f3adffa0a2c52ce1b8068 assets/interiors/models/block/chair/magenta_chair_none_cropped.json
@@ -20,8 +20,8 @@ f77ac104d52173fc8ba260f5ee7719138c249894 data/interiors/recipes/crafting/floor_c
2020
e5e13b678a049b3455cacf9013177a347fbd920f data/interiors/advancements/recipes/building_blocks/crafting/chair/light_blue_chair_from_other_chair.json
2121
a6b1b8d4416aba2a8b1bbbb285ed1663e8b1cbd3 assets/interiors/models/block/chair/light_blue_chair_none.json
2222
c07c54cc70db571d50cae6e804c00e840d7edc9f data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_floor_chair.json
23-
44b6d1ce8c68f8ee7a3cca7668551d4a93e95f1f data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair.json
2423
8f827d2b2f8904010aef4fa146b8a8d1693d8376 data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json
24+
44b6d1ce8c68f8ee7a3cca7668551d4a93e95f1f data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair.json
2525
a584c10d9c0ec40fe6bfd818fa44a7e04932f94e assets/interiors/models/block/chair/green_chair_right_cropped.json
2626
1fe8148160ae6a9a7ef19eb31682a69959a313f2 assets/interiors/models/block/chair/gray_chair_none.json
2727
64e8f84ca1926e140d74e22eb4f33b76309328ca data/interiors/recipes/crafting/floor_chair/yellow_floor_chair.json
@@ -113,8 +113,8 @@ bbe13c2a55081ab78d4b207fc4fe3695bf4db99c assets/interiors/models/block/floor_cha
113113
c74a64580f5c109cc6a422100d63da50f90f8acf data/interiors/loot_tables/blocks/lime_chair.json
114114
2b4d2506d7e2a312a1a2f402f283f4aea5844bfb assets/interiors/models/item/pink_chair.json
115115
acc640bf6ff9fda1747f2f8bec7174c3dfa62288 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/cyan_floor_chair.json
116-
7951e098c2509c5e5aa3dd76bf99b1093f630cef data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_seat.json
117116
fe151ff7f72d46d74e99703baebb6f26adc67185 data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json
117+
7951e098c2509c5e5aa3dd76bf99b1093f630cef data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_seat.json
118118
5d8a5fb0b5104c895fa897ce3e05bf050baf742e data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_seat.json
119119
14ee62e5724f489ccf2e95154d882a388d30c334 data/interiors/recipes/crafting/floor_chair/green_floor_chair.json
120120
fa5768ba206c65705888460414ff379347998aa4 assets/interiors/models/block/floor_chair/light_gray_floor_chair_right.json
@@ -202,8 +202,8 @@ cbe648951eff6770fd529ed2affa0f638314e95b data/interiors/advancements/recipes/bui
202202
b2988d2492306495e9966503e51b37a4ce7dda7e data/interiors/recipes/crafting/floor_chair/white_floor_chair.json
203203
33ca50a314a7e994abc35bf1b06e4dbc731788de assets/interiors/models/block/chair/black_chair_both.json
204204
047916f611e089555cc6bd7883a05ae2df32581a assets/interiors/models/block/chair/kelp_chair_none.json
205-
bc6287cfc798ca9e177fe7761f8626d0e775ab62 data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json
206205
12f2bcf648860f442b279d82455ec94f717be978 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/magenta_floor_chair_from_seat.json
206+
bc6287cfc798ca9e177fe7761f8626d0e775ab62 data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json
207207
14b167a8a1a2c9575ba3a84353566ddd2867c0f3 data/interiors/loot_tables/blocks/gray_chair.json
208208
8e938ad151ff4c0f4c5d3524923c4d28d198ed88 assets/interiors/models/block/floor_chair/gray_floor_chair_none_cropped.json
209209
ac105974315090e84a43f5384179f791ae37a655 assets/interiors/models/block/chair/kelp_chair_both_cropped.json
@@ -351,8 +351,8 @@ dac4dc6c457ea01bd692bf04a477e10b86e9d1fd assets/interiors/blockstates/black_chai
351351
59daf1b84c55f35fb4548af06d37318af63e9183 assets/interiors/models/block/chair/light_gray_chair_right_cropped.json
352352
9e05272acf05d08cf53594a30c103d86f6f2e85c assets/interiors/models/block/chair/lime_chair_right.json
353353
d5805f3656a060b6366999e4bde885fd27959b9d data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair_from_floor_chair.json
354-
d1629b144f7bb21fdac6d84982720c8195f77b8e data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json
355354
a3d1e4c30bf30d1f9c7b26c6c043efe5a05502b1 data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair.json
355+
d1629b144f7bb21fdac6d84982720c8195f77b8e data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json
356356
fa0fa535b7190d9963a822cf79e3fe5086ed7cff data/interiors/recipes/crafting/floor_chair/blue_floor_chair.json
357357
4a34c30999dd6653e1081c30fa7fdbba1dfbe6a6 assets/interiors/models/block/chair/gray_chair_both.json
358358
54524072bcc8a277a004147eee971c0ee06c3bad data/interiors/recipes/crafting/chair/green_chair_from_floor_chair.json

‎fabric/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ loom {
44
val common = project(":common")
55
accessWidenerPath = common.loom.accessWidenerPath
66

7-
silentMojangMappingsLicense()
87
runs.configureEach {
98
vmArg("-Dmixin.debug.export=true")
109
vmArg("-Dmixin.env.remapRefMap=true")

‎forge/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
architectury.forge()
22

33
loom {
4-
silentMojangMappingsLicense()
54
runs.configureEach {
65
vmArg("-Dmixin.debug.export=true")
76
vmArg("-Dmixin.env.remapRefMap=true")

‎gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ qm_version = 23
2424
parchment_version = 2023.09.03
2525

2626
# Fabric - https://fabricmc.net/develop/
27-
fabric_loader_version = 0.15.3
27+
fabric_loader_version = 0.16.3
2828
fabric_api_version = 0.87.0
2929

3030
# Forge - https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.html
3131
forge_version = 47.1.3
3232

3333
## Create
3434
# https://mvn.devos.one/#/snapshots/com/simibubi/create/create-fabric-1.20.1
35-
create_fabric_version = 0.5.1-f-build.1287
35+
create_fabric_version = 0.5.1-h-build.1516
3636
# https://github.com/Creators-of-Create/Create/wiki/Depending-on-Create
37-
create_forge_version = 0.5.1.f-26
37+
create_forge_version = 0.5.1.h-48
3838
registrate_forge_version = MC1.20-1.3.3
3939
flywheel_forge_minecraft_version = 1.20.1
40-
flywheel_forge_version = 0.6.10-8
40+
flywheel_forge_version = 0.6.11-13
4141

4242
## Fabric Mods
4343
# https://modrinth.com/mod/lazydfu/versions

‎gradle/wrapper/gradle-wrapper.jar

42 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

0 commit comments

Comments
 (0)