Skip to content

Commit

Permalink
Merge branch 'refs/heads/multi' into architectury-test
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
#	settings.json
  • Loading branch information
Fallen-Breath committed Jun 19, 2024
2 parents 4aeb3b9 + bce1b18 commit c4158a5
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 16 deletions.
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'maven-publish'
id 'com.github.hierynomus.license' version '0.16.1' apply false
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
id 'dev.architectury.loom' version '1.6-SNAPSHOT' apply false

// https://github.com/ReplayMod/preprocessor
// https://github.com/Fallen-Breath/preprocessor
Expand All @@ -19,27 +19,31 @@ preprocess {
def mc118_fabric = createNode('1.18.2-fabric', 1_18_02, '')
def mc119_fabric = createNode('1.19.4-fabric', 1_19_04, '')
def mc120_fabric = createNode('1.20.6-fabric', 1_20_06, '')
def mc121_fabric = createNode('1.21-fabric' , 1_21_00, '')

def mc115_forge = createNode('1.15.2-forge' , 1_15_02, '')
def mc116_forge = createNode('1.16.5-forge' , 1_16_05, '')
def mc117_forge = createNode('1.17.1-forge' , 1_17_01, '')
def mc118_forge = createNode('1.18.2-forge' , 1_18_02, '')
def mc119_forge = createNode('1.19.4-forge' , 1_19_04, '')
def mc120_forge = createNode('1.20.6-forge' , 1_20_06, '')
def mc121_forge = createNode('1.21-forge' , 1_21_00, '')

mc114_fabric.link(mc115_fabric, null)
mc115_fabric.link(mc116_fabric, null)
mc116_fabric.link(mc117_fabric, null)
mc117_fabric.link(mc118_fabric, null)
mc118_fabric.link(mc119_fabric, null)
mc119_fabric.link(mc120_fabric, null)
mc120_fabric.link(mc121_fabric, null)

mc115_fabric.link(mc115_forge, null)
mc116_fabric.link(mc116_forge, null)
mc117_fabric.link(mc117_forge, null)
mc118_fabric.link(mc118_forge, null)
mc119_fabric.link(mc119_forge, null)
mc120_fabric.link(mc120_forge, null)
mc121_fabric.link(mc121_forge, null)
}

tasks.register('buildAndGather') {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# conditionalmixin_version=0.6.2

# https://github.com/LlamaLad7/MixinExtras
# mixinextras_version=0.3.5
# mixinextras_version=0.3.6
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
4 changes: 3 additions & 1 deletion settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
"1.18.2-fabric",
"1.19.4-fabric",
"1.20.6-fabric",
"1.21-fabric",

"1.15.2-forge",
"1.16.5-forge",
"1.17.1-forge",
"1.18.2-forge",
"1.19.4-forge",
"1.20.6-forge"
"1.20.6-forge",
"1.21-forge"
]
}
2 changes: 1 addition & 1 deletion versions/1.20.6-forge/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Mod Metadata
# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.6.html
forge_version=50.0.31
forge_version=50.1.6
minecraft_dependency=[1.20.6]

# Build Information
Expand Down
17 changes: 17 additions & 0 deletions versions/1.21-fabric/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Loom Properties
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21
minecraft_version=1.21
yarn_mappings=1.21+build.2
loom.platform=fabric

# Mod Metadata
# https://fabricmc.net/versions.html
fabric_loader_version=0.15.10
minecraft_dependency=1.21

# Build Information
# The target mc versions for the mod during mod publishing, separated with \n
game_versions=1.21

# Dependencies
# fabric_api_version=0.100.1+1.21
14 changes: 14 additions & 0 deletions versions/1.21-forge/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Loom Properties
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21
minecraft_version=1.21
yarn_mappings=1.21+build.2
loom.platform=forge

# Mod Metadata
# https://files.minecraftforge.net/net/minecraftforge/forge/index_1.21.html
forge_version=51.0.13
minecraft_dependency=[1.21]

# Build Information
# The target mc versions for the mod during mod publishing, separated with \n
game_versions=1.21

0 comments on commit c4158a5

Please sign in to comment.