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

Merge branch 'stable' into develop-1.7.10

Browse Source
This commit is contained in:
Jonas Herzig
2018-03-16 13:03:22 +01:00
parent e32dab8749 0a26f59c9c
commit 031582957f
10 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
versions/common.gradle
View File

@@ -115,6 +115,8 @@ repositories {
configurations {
shade
compile.extendsFrom shade
shade.exclude group: 'com.google.code.gson', module: 'gson' // provided by MC
}
dependencies {
@@ -133,7 +135,7 @@ dependencies {
def studioVersion = "${(int)(mcVersion/10000)}.${(int)(mcVersion/100)%100}" + (mcVersion%100==0 ? '' : ".${mcVersion%100}")
if (studioVersion == '1.8.9') studioVersion = '1.8'
shade("com.github.ReplayMod.ReplayStudio:$studioVersion:24a6ad9"){
shade("com.github.ReplayMod.ReplayStudio:$studioVersion:464e18a"){
exclude group: 'com.google.guava', module: 'guava' // provided by MC
exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
}

5
versions/preprocessor.gradle
View File

@@ -65,7 +65,10 @@ static def convertSource(Map<String, String> kws, Map<String, Integer> vars, Lis
}
}
} else if (trimmed.startsWith(kws.ifdef)) {
ifStack.push(null)
def result = vars.containsKey(trimmed.substring(kws.ifdef.length()))
ifStack.push(result)
indentStack.push(getIndent(line))
active &= result
} else if (trimmed.startsWith(kws.endif)) {
if (ifStack.isEmpty()) {
throw new ParserException("Unexpected endif in line $n of $fileName")