cleanup, fix filling unmappedNs's

unimined · Jul 31, 2024 · fc5c91b · fc5c91b
1 parent 3fb5d3c
commit fc5c91b
Show file tree

Hide file tree

Showing 78 changed files with 143 additions and 348 deletions.
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/FormatRegistry.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/FormatRegistry.kt
@@ -4,9 +4,9 @@ import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.EnvType
 import xyz.wagyourtail.unimined.mapping.formats.csrg.CsrgReader
 import xyz.wagyourtail.unimined.mapping.formats.feather.ExceptionReader
+import xyz.wagyourtail.unimined.mapping.formats.feather.NestReader
+import xyz.wagyourtail.unimined.mapping.formats.feather.SignatureReader
 import xyz.wagyourtail.unimined.mapping.formats.mcp.MCPExceptionReader
-import xyz.wagyourtail.unimined.mapping.formats.tsrg.TsrgV1Reader
-import xyz.wagyourtail.unimined.mapping.formats.tsrg.TsrgV2Reader
 import xyz.wagyourtail.unimined.mapping.formats.mcp.v1.MCPv1FieldReader
 import xyz.wagyourtail.unimined.mapping.formats.mcp.v1.MCPv1MethodReader
 import xyz.wagyourtail.unimined.mapping.formats.mcp.v3.MCPv3ClassesReader
@@ -17,8 +17,6 @@ import xyz.wagyourtail.unimined.mapping.formats.mcpconfig.MCPConfigAccessReader
 import xyz.wagyourtail.unimined.mapping.formats.mcpconfig.MCPConfigConstructorReader
 import xyz.wagyourtail.unimined.mapping.formats.mcpconfig.MCPConfigExceptionsReader
 import xyz.wagyourtail.unimined.mapping.formats.mcpconfig.MCPConfigStaticMethodsReader
-import xyz.wagyourtail.unimined.mapping.formats.feather.NestReader
-import xyz.wagyourtail.unimined.mapping.formats.feather.SignatureReader
 import xyz.wagyourtail.unimined.mapping.formats.parchment.ParchmentReader
 import xyz.wagyourtail.unimined.mapping.formats.proguard.ProguardReader
 import xyz.wagyourtail.unimined.mapping.formats.rgs.RetroguardReader
@@ -28,6 +26,8 @@ import xyz.wagyourtail.unimined.mapping.formats.srg.SrgWriter
 import xyz.wagyourtail.unimined.mapping.formats.tiny.v1.TinyV1Reader
 import xyz.wagyourtail.unimined.mapping.formats.tiny.v2.TinyV2Reader
 import xyz.wagyourtail.unimined.mapping.formats.tiny.v2.TinyV2Writer
+import xyz.wagyourtail.unimined.mapping.formats.tsrg.TsrgV1Reader
+import xyz.wagyourtail.unimined.mapping.formats.tsrg.TsrgV2Reader
 import xyz.wagyourtail.unimined.mapping.formats.umf.UMFReader
 import xyz.wagyourtail.unimined.mapping.formats.umf.UMFWriter
 import xyz.wagyourtail.unimined.mapping.formats.unpick.UnpickReader

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1FieldReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1FieldReader.kt
@@ -9,7 +9,10 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.FieldDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.InternalName
 import xyz.wagyourtail.unimined.mapping.tree.AbstractMappingTree
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.visitor.*
+import xyz.wagyourtail.unimined.mapping.visitor.ClassVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.FieldVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.JavadocVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.MappingVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.NullDelegator
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.delegator
 

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1MethodReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1MethodReader.kt
@@ -9,8 +9,12 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.three.three.MethodDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.InternalName
 import xyz.wagyourtail.unimined.mapping.tree.AbstractMappingTree
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.visitor.*
-import xyz.wagyourtail.unimined.mapping.visitor.delegate.*
+import xyz.wagyourtail.unimined.mapping.visitor.ClassVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.JavadocVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.MappingVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.MethodVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.delegate.NullDelegator
+import xyz.wagyourtail.unimined.mapping.visitor.delegate.delegator
 
 /**
  * this reads the MCP 1-2.12 method csv files

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldReader.kt
@@ -9,8 +9,8 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.InternalName
 import xyz.wagyourtail.unimined.mapping.tree.AbstractMappingTree
 import xyz.wagyourtail.unimined.mapping.util.CharReader
 import xyz.wagyourtail.unimined.mapping.visitor.ClassVisitor
-import xyz.wagyourtail.unimined.mapping.visitor.JavadocVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.FieldVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.JavadocVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.MappingVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.NullDelegator
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.delegator

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodReader.kt
@@ -8,7 +8,10 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.three.three.MethodDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.InternalName
 import xyz.wagyourtail.unimined.mapping.tree.AbstractMappingTree
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.visitor.*
+import xyz.wagyourtail.unimined.mapping.visitor.ClassVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.JavadocVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.MappingVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.MethodVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.NullDelegator
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.delegator
 

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Writer.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Writer.kt
@@ -12,9 +12,9 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.three.three.MethodDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.FieldDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.InternalName
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.PackageName
-import xyz.wagyourtail.unimined.mapping.tree.node._constant.ConstantGroupNode
 import xyz.wagyourtail.unimined.mapping.tree.node._class.InnerClassNode
 import xyz.wagyourtail.unimined.mapping.tree.node._class.member.WildcardNode
+import xyz.wagyourtail.unimined.mapping.tree.node._constant.ConstantGroupNode
 import xyz.wagyourtail.unimined.mapping.visitor.*
 
 @Suppress("UNUSED_PARAMETER")

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFReader.kt
@@ -13,10 +13,12 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.AccessFlag
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.InternalName
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.PackageName
 import xyz.wagyourtail.unimined.mapping.tree.AbstractMappingTree
-import xyz.wagyourtail.unimined.mapping.tree.node._constant.ConstantGroupNode
 import xyz.wagyourtail.unimined.mapping.tree.node._class.InnerClassNode
 import xyz.wagyourtail.unimined.mapping.tree.node._class.member.WildcardNode
-import xyz.wagyourtail.unimined.mapping.util.*
+import xyz.wagyourtail.unimined.mapping.tree.node._constant.ConstantGroupNode
+import xyz.wagyourtail.unimined.mapping.util.CharReader
+import xyz.wagyourtail.unimined.mapping.util.TokenType
+import xyz.wagyourtail.unimined.mapping.util.filterNotNullValues
 import xyz.wagyourtail.unimined.mapping.visitor.*
 
 /**

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/unpick/UnpickReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/unpick/UnpickReader.kt
@@ -14,8 +14,8 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.two.two.UnqualifiedName
 import xyz.wagyourtail.unimined.mapping.tree.AbstractMappingTree
 import xyz.wagyourtail.unimined.mapping.tree.node._constant.ConstantGroupNode
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.visitor.MappingVisitor
 import xyz.wagyourtail.unimined.mapping.util.defaultedMapOf
+import xyz.wagyourtail.unimined.mapping.visitor.MappingVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.use
 
 /**

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/FieldOrMethodDescriptor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/FieldOrMethodDescriptor.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.three.MethodDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.FieldDescriptor

diff --git a/...mmonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/AnnotationElement.kt b/...mmonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/AnnotationElement.kt
@@ -1,11 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext.annotation
 
-import okio.Buffer
-import okio.BufferedSource
-import okio.use
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...Main/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/AnnotationElementName.kt b/...Main/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/AnnotationElementName.kt
@@ -1,8 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext.annotation
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
-import xyz.wagyourtail.unimined.mapping.util.*
+import xyz.wagyourtail.unimined.mapping.util.CharReader
+import xyz.wagyourtail.unimined.mapping.util.translateEscapes
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...ain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/AnnotationElementValue.kt b/...ain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/AnnotationElementValue.kt
@@ -1,8 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext.annotation
 
-import okio.Buffer
-import okio.BufferedSource
-import okio.use
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
 import kotlin.jvm.JvmInline

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/ArrayConstant.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/ArrayConstant.kt
@@ -1,11 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext.annotation
 
-import okio.Buffer
-import okio.BufferedSource
-import okio.use
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/ArrayElements.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/ArrayElements.kt
@@ -1,11 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext.annotation
 
-import okio.Buffer
-import okio.BufferedSource
-import okio.use
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/ClassConstant.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/ClassConstant.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext.annotation
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.ObjectType
 import xyz.wagyourtail.unimined.mapping.util.CharReader

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/Constant.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/annotation/Constant.kt
@@ -1,8 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.ext.annotation
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
-import xyz.wagyourtail.unimined.mapping.util.*
+import xyz.wagyourtail.unimined.mapping.util.CharReader
+import xyz.wagyourtail.unimined.mapping.util.translateEscapes
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...ain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/JavaTypeSignature.kt b/...ain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/JavaTypeSignature.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.ReferenceTypeSignature
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.BaseType

diff --git a/...Main/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/ClassBound.kt b/...Main/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/ClassBound.kt
@@ -1,10 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.`class`
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.ReferenceTypeSignature
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/.../kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/InterfaceBound.kt b/.../kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/InterfaceBound.kt
@@ -1,10 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.`class`
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.ReferenceTypeSignature
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...in/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/SuperclassSignature.kt b/...in/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/SuperclassSignature.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.`class`
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.ClassTypeSignature
 import xyz.wagyourtail.unimined.mapping.util.CharReader

diff --git a/...yz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/SuperinterfaceSignature.kt b/...yz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/class/SuperinterfaceSignature.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.`class`
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.ClassTypeSignature
 import xyz.wagyourtail.unimined.mapping.util.CharReader

diff --git a/.../kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/field/FieldSignature.kt b/.../kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/field/FieldSignature.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.field
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.ReferenceTypeSignature
 import xyz.wagyourtail.unimined.mapping.util.CharReader

diff --git a/...monMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/method/Result.kt b/...monMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/method/Result.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.method
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.JavaTypeSignature
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.three.VoidDescriptor

diff --git a/...otlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/method/ThrowsSignature.kt b/...otlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/method/ThrowsSignature.kt
@@ -1,11 +1,9 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.method
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.ClassTypeSignature
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference.TypeVariableSignature
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/ArrayTypeSignature.kt b/...xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/ArrayTypeSignature.kt
@@ -1,10 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.JavaTypeSignature
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...gyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/ClassTypeSignatureSuffix.kt b/...gyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/ClassTypeSignatureSuffix.kt
@@ -1,9 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...n/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/PackageSpecifier.kt b/...n/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/PackageSpecifier.kt
@@ -1,12 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.JVMS
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.appendCodePoint
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
-import xyz.wagyourtail.unimined.mapping.util.takeUTF8Until
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/ReferenceTypeSignature.kt b/...wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/ReferenceTypeSignature.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
 import kotlin.jvm.JvmInline

diff --git a/...gyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/SimpleClassTypeSignature.kt b/...gyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/SimpleClassTypeSignature.kt
@@ -1,11 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.JVMS
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
-import xyz.wagyourtail.unimined.mapping.util.takeUTF8Until
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...otlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/TypeArgument.kt b/...otlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/TypeArgument.kt
@@ -1,11 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.Buffer
-import okio.BufferedSource
-import okio.use
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...tlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/TypeArguments.kt b/...tlin/xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/TypeArguments.kt
@@ -1,11 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.Buffer
-import okio.BufferedSource
-import okio.use
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/.../wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/TypeVariableSignature.kt b/.../wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/TypeVariableSignature.kt
@@ -1,11 +1,8 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.JVMS
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
-import xyz.wagyourtail.unimined.mapping.util.takeUTF8Until
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/.../xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/WildcardIndicator.kt b/.../xyz/wagyourtail/unimined/mapping/jvms/four/seven/nine/one/reference/WildcardIndicator.kt
@@ -1,9 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.seven.nine.one.reference
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/...Main/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/three/ParameterDescriptor.kt b/...Main/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/three/ParameterDescriptor.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.three.three
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.FieldType
 import xyz.wagyourtail.unimined.mapping.util.CharReader

diff --git a/...monMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/three/ReturnDescriptor.kt b/...monMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/three/ReturnDescriptor.kt
@@ -1,6 +1,5 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.three.three
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.FieldType
 import xyz.wagyourtail.unimined.mapping.util.CharReader

diff --git a/...ommonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/three/VoidDescriptor.kt b/...ommonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/three/VoidDescriptor.kt
@@ -4,11 +4,8 @@
  */
 package xyz.wagyourtail.unimined.mapping.jvms.four.three.three
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
-import xyz.wagyourtail.unimined.mapping.util.toUnicode
 import kotlin.jvm.JvmInline
 
 /**

diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/two/ArrayType.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/three/two/ArrayType.kt
@@ -1,9 +1,7 @@
 package xyz.wagyourtail.unimined.mapping.jvms.four.three.two
 
-import okio.BufferedSource
 import xyz.wagyourtail.unimined.mapping.jvms.TypeCompanion
 import xyz.wagyourtail.unimined.mapping.util.CharReader
-import xyz.wagyourtail.unimined.mapping.util.checkedToChar
 import kotlin.jvm.JvmInline
 
 /**