Port to MC 1.18-rc4

This commit is contained in:
Jonas Herzig
2021-11-28 13:57:51 +01:00
parent b6f623efb8
commit ce5886a427
7 changed files with 46 additions and 14 deletions

View File

@@ -108,9 +108,9 @@ preprocess {
def mcVersionStr = "${(int)(mcVersion/10000)}.${(int)(mcVersion/100)%100}" + (mcVersion%100==0 ? '' : ".${mcVersion%100}")
sourceCompatibility = targetCompatibility = mcVersion >= 11700 ? 16 : 1.8
sourceCompatibility = targetCompatibility = mcVersion >= 11800 ? 17 : mcVersion >= 11700 ? 16 : 1.8
tasks.withType(JavaCompile).configureEach {
options.release = mcVersion >= 11700 ? 16 : 8
options.release = mcVersion >= 11800 ? 17 : mcVersion >= 11700 ? 16 : 8
}
if (mcVersion >= 11400) {
@@ -243,7 +243,7 @@ dependencies {
11604: '1.16.4',
11700: '1.17',
11701: '1.17.1',
11800: '1.18-pre1',
11800: '1.18-rc4',
][mcVersion]
mappings 'net.fabricmc:yarn:' + [
11404: '1.14.4+build.16',
@@ -253,7 +253,7 @@ dependencies {
11604: '1.16.4+build.6:v2',
11700: '1.17+build.13:v2',
11701: '1.17.1+build.29:v2',
11800: '1.18-pre1+build.5:v2',
11800: '1.18-rc4+build.1:v2',
][mcVersion]
modImplementation 'net.fabricmc:fabric-loader:0.12.5'
def fabricApiVersion = [
@@ -264,7 +264,7 @@ dependencies {
11604: '0.25.1+build.416-1.16',
11700: '0.36.0+1.17',
11701: '0.37.1+1.17',
11800: '0.42.2+1.18',
11800: '0.43.1+1.18',
][mcVersion]
def fabricApiModules = [
"api-base",
@@ -335,7 +335,7 @@ dependencies {
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
shadow "com.github.ReplayMod:ReplayStudio:a5a92b6", shadeExclusions
shadow "com.github.ReplayMod:ReplayStudio:69b1296", shadeExclusions
implementation(FABRIC ? dependencies.project(path: jGui.path, configuration: "namedElements") : jGui) {
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those