DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 1.16.1

Browse Source
This commit is contained in:
Jonas Herzig
2020-06-28 21:57:45 +02:00
parent dc9fcb11cd
commit 7118d55d62
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -2,7 +2,7 @@ import groovy.json.JsonOutput
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
plugins { plugins {
id("fabric-loom") version "0.2.7-SNAPSHOT" apply false id("fabric-loom") version "0.4-SNAPSHOT" apply false
id("com.replaymod.preprocess") version "3c46acb" id("com.replaymod.preprocess") version "3c46acb"
id("com.github.hierynomus.license") version "0.15.0" id("com.github.hierynomus.license") version "0.15.0"
} }
@@ -178,7 +178,7 @@ val doRelease by tasks.registering {
defaultTasks("shadowJar") defaultTasks("shadowJar")
preprocess { preprocess {
"1.16"(11600, "yarn") { "1.16.1"(11601, "yarn") {
"1.15.2"(11502, "yarn") { "1.15.2"(11502, "yarn") {
"1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.2-1.14.4.txt")) { "1.14.4"(11404, "yarn", file("versions/mapping-fabric-1.15.2-1.14.4.txt")) {
"1.14.4-forge"(11404, "srg", file("versions/mapping-1.14.4-fabric-forge.txt")) { "1.14.4-forge"(11404, "srg", file("versions/mapping-1.14.4-fabric-forge.txt")) {

2
jGui

Submodule jGui updated: 7ec30f59b5...4898b6dbc7

4
settings.gradle.kts
View File

@@ -28,7 +28,7 @@ val jGuiVersions = listOf(
"1.14.4-forge", "1.14.4-forge",
"1.14.4", "1.14.4",
"1.15.2", "1.15.2",
"1.16" "1.16.1"
) )
val replayModVersions = listOf( val replayModVersions = listOf(
"1.7.10", "1.7.10",
@@ -44,7 +44,7 @@ val replayModVersions = listOf(
"1.14.4-forge", "1.14.4-forge",
"1.14.4", "1.14.4",
"1.15.2", "1.15.2",
"1.16" "1.16.1"
) )
include(":jGui") include(":jGui")

12
versions/common.gradle
View File

@@ -32,7 +32,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2' classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
if (fabric) { if (fabric) {
classpath 'fabric-loom:fabric-loom.gradle.plugin:0.2.7-SNAPSHOT' classpath 'fabric-loom:fabric-loom.gradle.plugin:0.4-SNAPSHOT'
} else if (mcVersion >= 11400) { } else if (mcVersion >= 11400) {
classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){ classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){
exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one
@@ -224,22 +224,22 @@ dependencies {
minecraft 'com.mojang:minecraft:' + [ minecraft 'com.mojang:minecraft:' + [
11404: '1.14.4', 11404: '1.14.4',
11502: '1.15.2', 11502: '1.15.2',
11600: '1.16-rc1', 11601: '1.16.1',
][mcVersion] ][mcVersion]
mappings 'net.fabricmc:yarn:' + [ mappings 'net.fabricmc:yarn:' + [
11404: '1.14.4+build.16', 11404: '1.14.4+build.16',
11502: '1.15.2+build.14', 11502: '1.15.2+build.14',
11600: '1.16-rc1+build.8:v2', 11601: '1.16.1+build.17:v2',
][mcVersion] ][mcVersion]
modCompile 'net.fabricmc:fabric-loader:' + [ modCompile 'net.fabricmc:fabric-loader:' + [
11404: '0.7.8+build.189', 11404: '0.7.8+build.189',
11502: '0.7.8+build.189', 11502: '0.7.8+build.189',
11600: '0.8.8+build.202', 11601: '0.8.8+build.202',
][mcVersion] ][mcVersion]
modCompile 'net.fabricmc.fabric-api:fabric-api:' + [ modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
11404: '0.4.3+build.247-1.14', 11404: '0.4.3+build.247-1.14',
11502: '0.5.1+build.294-1.15', 11502: '0.5.1+build.294-1.15',
11600: '0.12.5+build.367-1.16', 11601: '0.14.0+build.371-1.16',
][mcVersion] ][mcVersion]
} }
@@ -278,7 +278,7 @@ dependencies {
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
shadow "com.github.ReplayMod:ReplayStudio:7cc1d0d", shadeExclusions shadow "com.github.ReplayMod:ReplayStudio:fc8a66d", shadeExclusions
compileOnly(jGui){ compileOnly(jGui){
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those