Anvilcraft/modpacktools
4
0
Fork 0
mirror of https://github.com/Anvilcraft/modpacktools synced 2024-11-17 23:41:55 +01:00
Code Issues Releases Wiki Activity

Switched from string link to FileOrLink

Browse source
This commit is contained in:
Timo Ley 2020-07-27 23:16:49 +02:00
parent c4635528cf
commit 363468e0f9
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -22,7 +22,7 @@ dependencies {
compile 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.3.8' compile 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.3.8'
//Other //Other
compile 'com.github.Anvilcraft:addonscript-java:123e1f49cb' compile 'com.github.Anvilcraft:addonscript-java:30c7ee114a'
compile 'com.squareup.okhttp3:okhttp:4.8.0' compile 'com.squareup.okhttp3:okhttp:4.8.0'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6'

4
src/main/kotlin/ley/anvil/modpacktools/util/ASConverter.kt
View file

@ -48,7 +48,7 @@ fun convertAStoManifest(addonscript: ASWrapper): ManifestLinksPair {
manifest.files.add(f); manifest.files.add(f);
} }
} else if (rel.options.contains("required")) { } else if (rel.options.contains("required")) {
ml.links.put(file.link, file.file.installer) ml.links.put(file.get(), file.file.installer)
} }
} }
} }
@ -67,7 +67,7 @@ fun convertAStoManifest(addonscript: ASWrapper): ManifestLinksPair {
manifest.files.add(f); manifest.files.add(f);
} }
} else { } else {
ml.links.put(file.link, file.file.installer) ml.links.put(file.get(), file.file.installer)
} }
} }
ml.manifest = manifest ml.manifest = manifest

3
src/main/kotlin/ley/anvil/modpacktools/util/ManifestLinksPair.kt
View file

@ -1,10 +1,11 @@
package ley.anvil.modpacktools.util package ley.anvil.modpacktools.util
import ley.anvil.addonscript.curse.ManifestJSON import ley.anvil.addonscript.curse.ManifestJSON
import ley.anvil.addonscript.wrapper.FileOrLink
class ManifestLinksPair { class ManifestLinksPair {
var manifest: ManifestJSON? = null var manifest: ManifestJSON? = null
var links: MutableMap<String, String> = HashMap() var links: MutableMap<FileOrLink, String> = HashMap()
} }