Skip to content

Commit

Permalink
update to patch h
Browse files Browse the repository at this point in the history
  • Loading branch information
rhysdh540 committed Sep 4, 2024
1 parent f9c6a07 commit ef1a6dc
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 14 deletions.
7 changes: 3 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion forge/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
architectury.forge()

loom {
silentMojangMappingsLicense()
runs.configureEach {
vmArg("-Dmixin.debug.export=true")
vmArg("-Dmixin.env.remapRefMap=true")
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ qm_version = 26
parchment_version = 2022.11.06

# Fabric - https://fabricmc.net/develop/
fabric_loader_version = 0.15.6
fabric_loader_version = 0.16.0
fabric_api_version = 0.76.0

# Forge - https://files.minecraftforge.net/net/minecraftforge/forge/index_1.18.html
forge_version = 40.2.10

## Create
# https://mvn.devos.one/#/snapshots/com/simibubi/create/create-fabric-1.18.2
create_fabric_version = 0.5.1-f-build.1285
create_fabric_version = 0.5.1-h-build.1514
# https://github.com/Creators-of-Create/Create/wiki/Depending-on-Create
create_forge_version = 0.5.1.f-332
registrate_forge_version = MC1.18.2-1.1.1
create_forge_version = 0.5.1.h-427
registrate_forge_version = MC1.18.2-1.1.3
flywheel_forge_minecraft_version = 1.18.2
flywheel_forge_version = 0.6.10-105
flywheel_forge_version = 0.6.11-107

## Fabric Mods
# https://modrinth.com/mod/lazydfu/versions
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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/.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down

0 comments on commit ef1a6dc

Please sign in to comment.