Support for Tiny v2 mappings

Author: Johni0702

build.gradle.kts

@@ -48,5 +48,5 @@ dependencies {
     implementation(gradleApi())
     compile(localGroovy())
     implementation("com.github.replaymod:remap:19874df")
-    implementation("net.fabricmc:tiny-mappings-parser:0.1.1.8")
+    implementation("net.fabricmc:tiny-mappings-parser:0.2.1.13")
 }

src/main/kotlin/com/replaymod/gradle/preprocess/PreprocessPlugin.kt

@@ -1,6 +1,6 @@
 package com.replaymod.gradle.preprocess
 
-import net.fabricmc.mappings.MappingsProvider
+import net.fabricmc.mapping.tree.TinyMappingFactory
 import org.cadixdev.lorenz.io.MappingFormats
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
@@ -162,8 +162,8 @@ private fun Task.bakeNamedToIntermediaryMappings(mappings: Mappings, destination
     outputs.file(destination)
     doLast {
         val mapping = if (mappings.format == "tiny") {
-            val tiny = mappings.file.inputStream().use { MappingsProvider.readTinyMappings(it) }
-            TinyReader(tiny, "named", "intermediary", false).read()
+            val tiny = mappings.file.inputStream().use { TinyMappingFactory.loadWithDetection(it.bufferedReader()) }
+            TinyReader(tiny, "named", "intermediary").read()
         } else {
             MappingFormats.byId(mappings.format).read(mappings.file.toPath())
         }
@@ -179,8 +179,8 @@ private fun Task.bakeNamedToOfficialMappings(mappings: Mappings, namedToIntermed
     outputs.file(destination)
     doLast {
         val mapping = if (mappings.format == "tiny") {
-            val tiny = mappings.file.inputStream().use { MappingsProvider.readTinyMappings(it) }
-            TinyReader(tiny, "named", "official", false).read()
+            val tiny = mappings.file.inputStream().use { TinyMappingFactory.loadWithDetection(it.bufferedReader()) }
+            TinyReader(tiny, "named", "official").read()
         } else {
             val iMappings = namedToIntermediaryMappings!!
             val iMapSet = MappingFormats.byId(iMappings.format).read(iMappings.file.toPath())

src/main/kotlin/com/replaymod/gradle/preprocess/TinyReader.kt

@@ -1,60 +1,24 @@
-/*
- * Copyright (c) 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.replaymod.gradle.preprocess
 
-import net.fabricmc.mappings.Mappings
+import net.fabricmc.mapping.tree.TinyTree
 import org.cadixdev.lorenz.MappingSet
 import org.cadixdev.lorenz.io.MappingsReader
 import java.io.IOException
 
-class TinyReader(private val m: Mappings, private val from: String, private val to: String, private val appendNone: Boolean) : MappingsReader() {
-
-    private fun procClassName(s: String): String {
-        return if (appendNone) {
-            if (s.indexOf('/') < 0) {
-                "none/$s"
-            } else {
-                s
-            }
-        } else {
-            s
-        }
-    }
-
+class TinyReader(private val m: TinyTree, private val from: String, private val to: String) : MappingsReader() {
     override fun read(mappings: MappingSet): MappingSet {
-        for (entry in m.classEntries) {
-            mappings.getOrCreateClassMapping(entry.get(from)).deobfuscatedName = procClassName(entry.get(to))
-        }
+        for (cls in m.classes) {
+            val clsMapping = mappings.getOrCreateClassMapping(cls.getName(from))
+            clsMapping.deobfuscatedName = cls.getName(to)
 
-        for (entry in m.fieldEntries) {
-            val fromEntry = entry.get(from)
-            val toEntry = entry.get(to)
-
-            mappings.getOrCreateClassMapping(fromEntry.owner)
-                    .getOrCreateFieldMapping(fromEntry.name, fromEntry.desc).deobfuscatedName = toEntry.name
-        }
-
-        for (entry in m.methodEntries) {
-            val fromEntry = entry.get(from)
-            val toEntry = entry.get(to)
+            for (field in cls.fields) {
+                clsMapping.getOrCreateFieldMapping(field.getName(from), field.getDescriptor(from)).deobfuscatedName = field.getName(to)
+            }
 
-            mappings.getOrCreateClassMapping(fromEntry.owner)
-                    .getOrCreateMethodMapping(fromEntry.name, fromEntry.desc).deobfuscatedName = toEntry.name
+            for (method in cls.methods) {
+                clsMapping.getOrCreateMethodMapping(method.getName(from), method.getDescriptor(from)).deobfuscatedName = method.getName(to)
+            }
         }
-
         return mappings
     }