Skip to content

Commit

Permalink
Update to 1.14.4
Browse files Browse the repository at this point in the history
Signed-off-by: Jadon Fowler <[email protected]>
  • Loading branch information
phase committed Jul 29, 2019
1 parent 5508d0f commit e0978bf
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion MCPConfig
Submodule MCPConfig updated 1326 files
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Supported versions:

| | Spigot | MCP | Searge | Yarn | Intermediary |
|--------|----------|----------|----------|----------|--------------|
| 1.14.4 | &#x2713; | &#x2713; | &#x2713; | &#x2713; | &#x2713; |
| 1.14.3 | &#x2713; | &#x2713; | &#x2713; | &#x2713; | &#x2713; |
| 1.14.2 | &#x2713; | &#x2713; | &#x2713; | &#x2713; | &#x2713; |
| 1.14.1 | &#x2713; | &#x2713; | &#x2713; | &#x2713; | &#x2713; |
| 1.14 | &#x2713; | &#x2713; | &#x2713; | &#x2713; | &#x2713; |
| 1.13.2 | &#x2713; | &#x2713; | &#x2713; | | |
| 1.13.1 | &#x2713; | &#x2713; | &#x2713; | | |
Expand Down
13 changes: 7 additions & 6 deletions src/main/kotlin/main.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ val GLOBAL_FOLDER = File("mappings")
fun main() {
val time = System.currentTimeMillis()
GLOBAL_FOLDER.mkdirs()
MinecraftVersion.values().map {
GlobalScope.launch {
println("Starting ${it.mcVersion}")
it.write(GLOBAL_FOLDER)
}
}.forEach { runBlocking { it.join() } }
// MinecraftVersion.values().map {
// GlobalScope.launch {
// println("Starting ${it.mcVersion}")
// it.write(GLOBAL_FOLDER)
// }
// }.forEach { runBlocking { it.join() } }
MinecraftVersion.V1_14_1.write(GLOBAL_FOLDER)
val elapsed = (System.currentTimeMillis() - time) / 1000.0
println("Done. Took ${elapsed / 60}m (${elapsed}s)")
}
4 changes: 2 additions & 2 deletions src/main/kotlin/tiny/tiny.kt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Mappings(
}

fun toStrings(): List<String> {
val entryMappings = mutableListOf("v1\t${namespaces.joinToString("\t")}")
val entryMappings = mutableListOf("v1\tofficial\t${namespaces.joinToString("\t")}")
entryMappings.addAll(classes.map { it.toString(namespaces) })
entryMappings.addAll(fields.map { it.toString(namespaces) })
entryMappings.addAll(methods.map { it.toString(namespaces) })
Expand Down Expand Up @@ -139,7 +139,7 @@ interface EntryMapping {
is MethodMapping -> "METHOD"
else -> "UNKNOWN"
}
return "$kind\t${toString()}\t$line"
return "$kind\t${toString()}\t$line".replace('.', '/')
}
}

Expand Down
14 changes: 9 additions & 5 deletions src/main/kotlin/version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ enum class MinecraftVersion(
val spigot: Boolean = false,
val yarn: Boolean = false
) {
V1_14("1.14", "snapshot_nodoc_20190430", true, true, true),
V1_13_2("1.13.2", "snapshot_nodoc_20190430", true, true, false),
V1_13_1("1.13.1", "stable_nodoc_45", true, true, false),
V1_13("1.13", "stable_nodoc_43", true, true, false),
V1_14_4("1.14.4", "snapshot_nodoc_20190729", true, true, true),
V1_14_3("1.14.3", "snapshot_nodoc_20190729", true, true, true),
V1_14_2("1.14.2", "stable_nodoc_53", false, true, true),
V1_14_1("1.14.1", "stable_nodoc_51", false, true, true),
V1_14("1.14", "stable_nodoc_49", false, true, true),
V1_13_2("1.13.2", "stable_nodoc_47", false, true, false),
V1_13_1("1.13.1", "stable_nodoc_45", false, true, false),
V1_13("1.13", "stable_nodoc_43", false, true, false),
V1_12_2("1.12.2", "snapshot_nodoc_20180129", false, true, false),
V1_12("1.12", "snapshot_nodoc_20180814", false, true, false),
V1_11("1.11", "snapshot_nodoc_20170612", false, true, false),
Expand Down Expand Up @@ -91,7 +95,7 @@ enum class MinecraftVersion(
}
}

println("$mcVersion: writing mappings to $fileName.crg")
println("$mcVersion: writing mappings to $fileName.csrg")
val csrgLines = MappingsFormat.COMPACT_SEARGE_FORMAT.toLines(strippedMappings)
csrgLines.sort()
File(outputFolder, "$fileName.csrg").bufferedWriter().use {
Expand Down
2 changes: 1 addition & 1 deletion yarn
Submodule yarn updated 3466 files

0 comments on commit e0978bf

Please sign in to comment.