diff --git a/common.gradle b/common.gradle index 990809c8..6750e20f 100644 --- a/common.gradle +++ b/common.gradle @@ -29,18 +29,17 @@ repositories { } // list of (dependencyNotation -> should use modImplementation) -def jitpack = mcVersion >= 12006 def mod_dependencies = [ - [(jitpack ? 'com.github.sakura-ryoko:malilib:' : 'fi.dy.masa.malilib:' ) + "${project.malilib_version}" , true], - [(jitpack ? 'com.github.sakura-ryoko:tweakeroo:' : 'curse.maven:tweakeroo-297344:' ) + "${project.tweakeroo_file_id}" , true], - [(jitpack ? 'com.github.sakura-ryoko:itemscroller:' : 'curse.maven:item-scroller-242064:' ) + "${project.itemscroller_file_id}", true], - [(jitpack ? 'com.github.sakura-ryoko:minihud:' : 'curse.maven:minihud-244260:' ) + "${project.minihud_file_id}" , true], + [(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], // - 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 [ - (jitpack ? 'com.github.sakura-ryoko:litematica:': 'curse.maven:litematica-308892:') + "${project.litematica_file_id}", + (mcVersion >= 12006 ? 'com.github.sakura-ryoko:litematica:': 'curse.maven:litematica-308892:') + "${project.litematica_file_id}", mcVersion < 11500 || 11700 <= mcVersion ], diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties index 6f404de9..a7bccfc6 100644 --- a/versions/1.20.6/gradle.properties +++ b/versions/1.20.6/gradle.properties @@ -16,23 +16,23 @@ # https://masa.dy.fi/maven/fi/dy/masa/malilib/ # https://jitpack.io/#sakura-ryoko/malilib - malilib_version = 395feee803 + 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 = c0cfe0df81 + tweakeroo_file_id = 1.20.6-0.20.0 # https://legacy.curseforge.com/minecraft/mc-mods/item-scroller/files # https://jitpack.io/#sakura-ryoko/itemscroller - itemscroller_file_id = bc048ed5c4 + itemscroller_file_id = 0796b7fed5 # https://legacy.curseforge.com/minecraft/mc-mods/litematica/files # https://jitpack.io/#sakura-ryoko/litematica - litematica_file_id = bd8b69ab97 + litematica_file_id = 1.20.6-0.18.0 # https://legacy.curseforge.com/minecraft/mc-mods/minihud/files # https://jitpack.io/#sakura-ryoko/minihud - minihud_file_id = 8001cd14d0 + minihud_file_id = 1.20.6-031.0 # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/ mod_menu_version = 10.0.0-beta.1 diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties index a3c3215e..08dce0e7 100644 --- a/versions/1.21/gradle.properties +++ b/versions/1.21/gradle.properties @@ -16,11 +16,11 @@ # https://masa.dy.fi/maven/fi/dy/masa/malilib/ # https://jitpack.io/#sakura-ryoko/malilib - malilib_version = 1.21-sakura.1 + malilib_version = 1.21-sakura.2 # https://legacy.curseforge.com/minecraft/mc-mods/tweakeroo/files # https://jitpack.io/#sakura-ryoko/tweakeroo - tweakeroo_file_id = 1.21-sakura.2 + tweakeroo_file_id = 1.21-sakura.3 # https://legacy.curseforge.com/minecraft/mc-mods/item-scroller/files # https://jitpack.io/#sakura-ryoko/itemscroller @@ -28,11 +28,11 @@ # https://legacy.curseforge.com/minecraft/mc-mods/litematica/files # https://jitpack.io/#sakura-ryoko/litematica - litematica_file_id = 1.21-sakura.2 + litematica_file_id = 1.21-sakura.4 # https://legacy.curseforge.com/minecraft/mc-mods/minihud/files # https://jitpack.io/#sakura-ryoko/minihud - minihud_file_id = 1.21-sakura.1 + minihud_file_id = 1.21-sakura.3 # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/ mod_menu_version = 11.0.0-beta.1