Skip to content

Commit 47038e9

Browse files
Fallen-BreathFallen-Breath
committed
Merge branch 'master' into architectury-test
# Conflicts: # build.gradle # common.gradle # versions/1.14.4-fabric/gradle.properties # versions/1.15.2-fabric/gradle.properties # versions/1.16.5-fabric/gradle.properties # versions/1.17.1-fabric/gradle.properties # versions/1.18.2-fabric/gradle.properties # versions/1.19.4-fabric/gradle.properties # versions/1.20.4-fabric/gradle.properties # versions/1.20.6-fabric/gradle.properties # versions/1.21.1-fabric/gradle.properties # versions/1.21.10-fabric/gradle.properties # versions/1.21.3-fabric/gradle.properties # versions/1.21.4-fabric/gradle.properties # versions/1.21.5-fabric/gradle.properties # versions/1.21.8-fabric/gradle.properties
2 parents 8b9186b + a0c227c commit 47038e9

File tree

40 files changed

+11
-69
lines changed

40 files changed

+11
-69
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import groovy.json.JsonSlurper
44
plugins {
55
id 'maven-publish'
66
id 'com.github.hierynomus.license' version '0.16.1' apply false
7-
id 'dev.architectury.loom' version '1.11-SNAPSHOT' apply false
7+
id 'dev.architectury.loom' version '1.13-SNAPSHOT' apply false
88

99
// https://github.com/ReplayMod/preprocessor
1010
// https://github.com/Fallen-Breath/preprocessor

‎common.gradle‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,7 @@ configurations {
3737
dependencies {
3838
// loom
3939
minecraft "com.mojang:minecraft:${project.minecraft_version}"
40-
mappings loom.layered {
41-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
42-
43-
// https://github.com/architectury/architectury-loom/issues/214
44-
// https://github.com/architectury/architectury-loom/issues/300
45-
if (project.hasProperty('yarn_mappings_patch')) {
46-
def module = mod_brand == 'neoforge' ? 'yarn-mappings-patch-neoforge' : 'yarn-mappings-patch-forge'
47-
it.mappings("dev.architectury:${module}:${project.yarn_mappings_patch}")
48-
}
49-
}
40+
mappings loom.officialMojangMappings()
5041

5142
if (mod_brand == 'fabric') {
5243
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"

‎gradle/wrapper/gradle-wrapper.jar‎

181 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
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.14.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.
212212

213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

‎gradlew.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

‎src/main/java/me/fallenbreath/template_mod/mixins/MinecraftServerMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public abstract class MinecraftServerMixin
3232
{
3333
@Inject(
34-
//#if MC >= 11600
34+
//#if MC >= 1.16.0
3535
//$$ method = "runServer",
3636
//#else
3737
method = "run",
@@ -40,9 +40,9 @@ public abstract class MinecraftServerMixin
4040
)
4141
private void onRun(CallbackInfo ci)
4242
{
43-
//#if MC >= 11500
43+
//#if MC >= 1.15.0
4444
System.err.println("Hello world from mc11500 branch");
45-
//#elseif MC >= 11400
45+
//#elseif MC >= 1.14.0
4646
//$$ System.err.println("Hello world from mc11400 branch");
4747
//#endif
4848

‎versions/1.14.4-fabric/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Loom Properties
22
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.14.4
33
minecraft_version=1.14.4
4-
yarn_mappings=1.14.4+build.18
54
loom.platform=fabric
65

76
# Mod Metadata

‎versions/1.15.2-fabric/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Loom Properties
22
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.15.2
33
minecraft_version=1.15.2
4-
yarn_mappings=1.15.2+build.17
54
loom.platform=fabric
65

76
# Mod Metadata

‎versions/1.16.5-fabric/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Loom Properties
22
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.16.5
33
minecraft_version=1.16.5
4-
yarn_mappings=1.16.5+build.10
54
loom.platform=fabric
65

76
# Mod Metadata

0 commit comments

Comments
 (0)