Skip to content

Commit

Permalink
mc1.21.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Fallen-Breath committed Sep 21, 2024
1 parent 9761f6f commit f3b5ccd
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 32 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ preprocess {
def mc1202 = createNode('1.20.2', 1_20_02, '')
def mc1204 = createNode('1.20.4', 1_20_04, '')
def mc1206 = createNode('1.20.6', 1_20_06, '')
def mc121 = createNode('1.21' , 1_21_00, '')
def mc121 = createNode('1.21.1', 1_21_01, '')

mc115.link(mc114, file('versions/mapping-1.15-1.14.txt'))
mc115.link(mc116, file('versions/mapping-1.15-1.16.txt'))
Expand Down
17 changes: 9 additions & 8 deletions common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,21 @@ repositories {
}
}

static String curseForgeOrOther(version, curseForge, other) {
return ((version as String).isNumber() ? curseForge : other) + ':' + version
}

// list of (dependencyNotation -> should use modImplementation)
def mod_dependencies = [
[(mcVersion >= 12100 ? 'com.github.sakura-ryoko:malilib:' : 'fi.dy.masa.malilib:' ) + "${project.malilib_version}" , true],
[(mcVersion >= 12006 ? 'com.github.sakura-ryoko:tweakeroo:' : 'curse.maven:tweakeroo-297344:' ) + "${project.tweakeroo_file_id}" , true],
[(mcVersion >= 12006 ? 'com.github.sakura-ryoko:itemscroller:' : 'curse.maven:item-scroller-242064:' ) + "${project.itemscroller_file_id}", true],
[(mcVersion >= 12006 ? 'com.github.sakura-ryoko:minihud:' : 'curse.maven:minihud-244260:' ) + "${project.minihud_file_id}" , true],
["fi.dy.masa.malilib:${project.malilib_version}", true],
[curseForgeOrOther(project.tweakeroo_file_id , 'curse.maven:tweakeroo-297344' , 'com.github.sakura-ryoko:tweakeroo' ), true],
[curseForgeOrOther(project.itemscroller_file_id, 'curse.maven:item-scroller-242064', 'com.github.sakura-ryoko:itemscroller'), true],
[curseForgeOrOther(project.minihud_file_id , 'curse.maven:minihud-244260' , 'com.github.sakura-ryoko:minihud' ), true],

// - loom doesn't remap base class method (method_10263) call of fi.dy.masa.malilib.util.SubChunkPos in
// fi.dy.masa.litematica.render.schematic.WorldRendererSchematic.setupTerrain, resulting in a crash in dev env
// so we have to disable litematica in [1.15, 1.17) at runtime
[
(mcVersion >= 12006 ? 'com.github.sakura-ryoko:litematica:': 'curse.maven:litematica-308892:') + "${project.litematica_file_id}",
mcVersion < 11500 || 11700 <= mcVersion
],
[curseForgeOrOther(project.litematica_file_id, 'curse.maven:litematica-308892', 'com.github.sakura-ryoko:litematica'), mcVersion < 11500 || 11700 <= mcVersion],

// we're using modmenu for mc 1.15.2 for 1.14.4, so we use modCompileOnly
["com.terraformersmc:modmenu:${project.mod_menu_version}" , mcVersion >= 11500],
Expand Down
2 changes: 1 addition & 1 deletion settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"1.20.2",
"1.20.4",
"1.20.6",
"1.21"
"1.21.1"
]
}
16 changes: 8 additions & 8 deletions versions/1.20.6/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
malilib_version = malilib-fabric-1.20.6:0.19.0

# https://legacy.curseforge.com/minecraft/mc-mods/tweakeroo/files
# https://jitpack.io/#sakura-ryoko/tweakeroo
tweakeroo_file_id = 1.20.6-0.20.0
# tweakeroo-fabric-1.20.6-0.20.0.jar
tweakeroo_file_id = 5450185

# https://legacy.curseforge.com/minecraft/mc-mods/item-scroller/files
# https://jitpack.io/#sakura-ryoko/itemscroller
itemscroller_file_id = 0796b7fed5
# itemscroller-fabric-1.20.6-0.23.0.jar
itemscroller_file_id = 5450180

# https://legacy.curseforge.com/minecraft/mc-mods/litematica/files
# https://jitpack.io/#sakura-ryoko/litematica
litematica_file_id = 1.20.6-0.18.0
# litematica-fabric-1.20.6-0.18.1.jar
litematica_file_id = 5523424

# https://legacy.curseforge.com/minecraft/mc-mods/minihud/files
# https://jitpack.io/#sakura-ryoko/minihud
minihud_file_id = 1.20.6-031.0
# minihud-fabric-1.20.6-0.31.0.jar
minihud_file_id = 5450183

# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
mod_menu_version = 10.0.0-beta.1
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# Fabric Properties
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21
minecraft_version=1.21
yarn_mappings=1.21+build.7
# check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21.1
minecraft_version=1.21.1
yarn_mappings=1.21.1+build.3

# Fabric Mod Metadata
minecraft_dependency = 1.21.x
malilib_dependency = >=0.18.0

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

# Dependencies
fabric_api_version = 0.100.4+1.21
fabric_api_version = 0.102.1+1.21.1

# https://masa.dy.fi/maven/fi/dy/masa/malilib/
# https://jitpack.io/#sakura-ryoko/malilib
malilib_version = 1.21-sakura.8
malilib_version = malilib-fabric-1.21.1:0.21.0

# https://legacy.curseforge.com/minecraft/mc-mods/tweakeroo/files
# https://jitpack.io/#sakura-ryoko/tweakeroo
tweakeroo_file_id = 1.21-sakura.18
# tweakeroo-fabric-1.21.1-0.21.50.jar
tweakeroo_file_id = 5647797

# https://legacy.curseforge.com/minecraft/mc-mods/item-scroller/files
# https://jitpack.io/#sakura-ryoko/itemscroller
itemscroller_file_id = 1.21-sakura.4
# itemscroller-fabric-1.21.1-0.24.50.jar
itemscroller_file_id = 5647786

# https://legacy.curseforge.com/minecraft/mc-mods/litematica/files
# https://jitpack.io/#sakura-ryoko/litematica
litematica_file_id = 1.21-sakura.23
# litematica-fabric-1.21.1-0.19.50.jar
litematica_file_id = 5647809

# https://legacy.curseforge.com/minecraft/mc-mods/minihud/files
# https://jitpack.io/#sakura-ryoko/minihud
minihud_file_id = 1.21-sakura.9
# minihud-fabric-1.21.1-0.32.50.jar
minihud_file_id = 5647790

# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
mod_menu_version = 11.0.1
File renamed without changes.

0 comments on commit f3b5ccd

Please sign in to comment.