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

Update FG3 and Forge from git version to first official snapshots

Browse Source
This commit is contained in:
Jonas Herzig
2019-02-28 17:27:51 +01:00
parent 1e584769af
commit b6a4206816
4 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jGui

Submodule jGui updated: 48b3d75950...73a6d9f774

4
settings.gradle
View File

@@ -6,7 +6,7 @@ include ':jGui'
//'1.8.9', FIXME //'1.8.9', FIXME
//'1.9.4', //'1.9.4',
//'1.12', //'1.12',
'1.13' '1.13.2'
].each { version -> ].each { version ->
include ":jGui:$version" include ":jGui:$version"
project(":jGui:$version").with { project(":jGui:$version").with {
@@ -27,7 +27,7 @@ def versions = [
//'1.12', //'1.12',
//'1.12.1', //'1.12.1',
//'1.12.2', //'1.12.2',
'1.13' '1.13.2'
] ]
versions.each { version -> versions.each { version ->
include ":$version" include ":$version"

0
versions/1.13/.gitkeep → versions/1.13.2/.gitkeep
View File

54
versions/common.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
mcVersion = "${major}${minor.padLeft(2, '0')}${(patch ?: '').padLeft(2, '0')}" as int mcVersion = "${major}${minor.padLeft(2, '0')}${(patch ?: '').padLeft(2, '0')}" as int
} else { } else {
def f = file('mcVersion') def f = file('mcVersion')
mcVersion = f.exists() ? f.readLines().first() as int : 11300 mcVersion = f.exists() ? f.readLines().first() as int : 11302
} }
project.ext.mcVersion = mcVersion project.ext.mcVersion = mcVersion
@@ -77,13 +77,17 @@ archivesBaseName = "replaymod"
minecraft { minecraft {
if (FG3) { if (FG3) {
runConfig { runs {
name = 'Minecraft Client' client {
main = 'net.minecraftforge.userdev.UserdevLauncher' workingDirectory project.file('eclipse')
ideaModuleName = '${project.name}_main' property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
workingDirectory = project.file('eclipse').canonicalPath property 'forge.logging.console.level', 'debug'
environment 'target', 'fmldevclient' mods {
environment 'assetDirectory', downloadAssets.output.absolutePath replaymod {
source sourceSets.main
}
}
}
} }
} else { } else {
if (mcVersion >= 10800) { if (mcVersion >= 10800) {
@@ -92,20 +96,22 @@ minecraft {
runDir = "../../eclipse" runDir = "../../eclipse"
} }
version = [ if (!FG3) {
11202: '1.12.2-14.23.0.2486', version = [
11201: '1.12.1-14.22.0.2444', 11202: '1.12.2-14.23.0.2486',
11200: '1.12-14.21.1.2387', 11201: '1.12.1-14.22.0.2444',
11102: '1.11.2-13.20.0.2216', 11200: '1.12-14.21.1.2387',
11100: '1.11-13.19.1.2188', 11102: '1.11.2-13.20.0.2216',
11002: '1.10.2-12.18.2.2099', 11100: '1.11-13.19.1.2188',
10904: '1.9.4-12.17.0.1976', 11002: '1.10.2-12.18.2.2099',
10809: '1.8.9-11.15.1.1722', 10904: '1.9.4-12.17.0.1976',
10800: '1.8-11.14.4.1563', 10809: '1.8.9-11.15.1.1722',
10710: '1.7.10-10.13.4.1558-1.7.10', 10800: '1.8-11.14.4.1563',
][mcVersion] 10710: '1.7.10-10.13.4.1558-1.7.10',
][mcVersion]
}
mappings = [ mappings = [
11300: "snapshot_20180921-1.13", 11302: "snapshot_20180921-1.13",
11202: "snapshot_20170615", 11202: "snapshot_20170615",
11201: "snapshot_20170615", 11201: "snapshot_20170615",
11200: "snapshot_20170615", 11200: "snapshot_20170615",
@@ -149,8 +155,8 @@ configurations {
dependencies { dependencies {
if (FG3) { if (FG3) {
minecraft 'net.minecraftforge.test:forge:' + [ minecraft 'net.minecraftforge:forge:' + [
11300: '1.13-24.0.33-1.13-pre', 11302: '1.13.2-25.0.63',
][mcVersion] ][mcVersion]
} }
@@ -174,7 +180,7 @@ dependencies {
def studioVersion = mcVersionStr def studioVersion = mcVersionStr
if (studioVersion == '1.8.9') studioVersion = '1.8' if (studioVersion == '1.8.9') studioVersion = '1.8'
shade("com.replaymod.replaystudio:$studioVersion:2d8d41d"){ // FIXME shade("com.replaymod.replaystudio:$studioVersion:98ab667"){ // FIXME
exclude group: 'com.google.guava', module: 'guava' // provided by MC exclude group: 'com.google.guava', module: 'guava' // provided by MC
exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
} }