From a777ae362e3f0709de9643dff873d79b028dab17 Mon Sep 17 00:00:00 2001 From: Graham Date: Wed, 4 Mar 2020 22:22:29 +0000 Subject: [PATCH] Add underscore separator to field names This allows us to distinguish between aClass1_23 and aClass12_3, for example. --- deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt b/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt index 5e4e1025..d4906c54 100644 --- a/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt +++ b/deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt @@ -86,7 +86,8 @@ class TypedRemapper private constructor( } private fun generateName(prefixes: MutableMap, prefix: String): String { - return prefix + prefixes.merge(prefix, 1, Integer::sum) + val separator = if (prefix.last().isDigit()) { "_" } else { "" } + return prefix + separator + prefixes.merge(prefix, 1, Integer::sum) } private fun createClassMapping(classes: List): Map {