Compare commits

...

2 Commits

Author SHA1 Message Date
Jonas Herzig
f2755f6e1f Update to 1.12.2 2017-09-19 10:37:19 +02:00
Jonas Herzig
cfb990ad43 Remove ReplayStudio submodule and depend on it via maven instead 2017-09-19 10:21:07 +02:00
4 changed files with 5 additions and 12 deletions

4
.gitmodules vendored
View File

@@ -2,10 +2,6 @@
path = jGui path = jGui
url = https://github.com/ReplayMod/jGui url = https://github.com/ReplayMod/jGui
[submodule "ReplayStudio"]
path = ReplayStudio
url = https://github.com/ReplayMod/ReplayStudio
[submodule "src/main/resources/assets/replaymod/lang"] [submodule "src/main/resources/assets/replaymod/lang"]
path = src/main/resources/assets/replaymod/lang path = src/main/resources/assets/replaymod/lang
url = https://github.com/ReplayMod/Translations url = https://github.com/ReplayMod/Translations

Submodule ReplayStudio deleted from f1d6fbbf8a

View File

@@ -34,7 +34,7 @@ archivesBaseName = "replaymod"
minecraft { minecraft {
coreMod = 'com.replaymod.core.LoadingPlugin' coreMod = 'com.replaymod.core.LoadingPlugin'
version = '1.12.1-14.22.0.2444' version = '1.12.2-14.23.0.2486'
runDir = "eclipse" runDir = "eclipse"
mappings = "snapshot_20170615" mappings = "snapshot_20170615"
replace '@MOD_VERSION@', project.version replace '@MOD_VERSION@', project.version
@@ -48,6 +48,7 @@ repositories {
name = "SpongePowered Repo" name = "SpongePowered Repo"
url = "http://repo.spongepowered.org/maven/" url = "http://repo.spongepowered.org/maven/"
} }
maven { url 'https://jitpack.io' }
} }
configurations { configurations {
@@ -70,24 +71,20 @@ dependencies {
shade 'org.aspectj:aspectjrt:1.8.2' shade 'org.aspectj:aspectjrt:1.8.2'
compile project(':ReplayStudio') shade 'com.github.ReplayMod:ReplayStudio:ecb6992'
testCompile 'junit:junit:4.11' testCompile 'junit:junit:4.11'
} }
tasks['idea'].dependsOn ':ReplayStudio:preshadowJar'
jar { jar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
dependsOn configurations.compile dependsOn configurations.compile
dependsOn configurations.shade dependsOn configurations.shade
dependsOn ':ReplayStudio:shadowJar'
def shade = {files( def shade = {files(
configurations.compile.findAll {it.name.startsWith 'mixin-'} configurations.compile.findAll {it.name.startsWith 'mixin-'}
+ configurations.shade + configurations.shade
+ getTasks().getByPath(':ReplayStudio:shadowJar').outputs.files
)} )}
def noticeDir = file("$buildDir/NOTICE") def noticeDir = file("$buildDir/NOTICE")

View File

@@ -8,7 +8,8 @@ public enum MinecraftVersion {
MC_1_11("Minecraft 1.11", "1.11"), MC_1_11("Minecraft 1.11", "1.11"),
MC_1_11_2("Minecraft 1.11.2", "1.11.2"), MC_1_11_2("Minecraft 1.11.2", "1.11.2"),
MC_1_12("Minecraft 1.12", "1.12"), MC_1_12("Minecraft 1.12", "1.12"),
MC_1_12_1("Minecraft 1.12.1", "1.12.1"); MC_1_12_1("Minecraft 1.12.1", "1.12.1"),
MC_1_12_2("Minecraft 1.12.2", "1.12.2");
private String niceName, apiName; private String niceName, apiName;