twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update mapping-io (#9975)

Browse Source
This commit is contained in:
Jason Penilla
2023-11-28 14:18:21 -08:00
parent a60f62506f
commit 94c1e68205
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
View File

@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
implementation("commons-lang:commons-lang:2.6") implementation("commons-lang:commons-lang:2.6")
+ implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation + implementation("net.fabricmc:mapping-io:0.5.0") // Paper - needed to read mappings for stacktrace deobfuscation
runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1") runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
runtimeOnly("com.mysql:mysql-connector-j:8.1.0") runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
@@ -136,6 +136,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import java.util.HashMap; +import java.util.HashMap;
+import java.util.HashSet; +import java.util.HashSet;
+import java.util.Map; +import java.util.Map;
+import java.util.Objects;
+import java.util.Set; +import java.util.Set;
+import java.util.function.Function; +import java.util.function.Function;
+import java.util.stream.Collectors; +import java.util.stream.Collectors;
@@ -222,7 +223,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return null; + return null;
+ } + }
+ final MemoryMappingTree tree = new MemoryMappingTree(); + final MemoryMappingTree tree = new MemoryMappingTree();
+ MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2, tree); + MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2_FILE, tree);
+ final Set<ClassMapping> classes = new HashSet<>(); + final Set<ClassMapping> classes = new HashSet<>();
+ +
+ final StringPool pool = new StringPool(); + final StringPool pool = new StringPool();
@@ -232,16 +233,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ for (final MappingTree.MethodMapping methodMapping : cls.getMethods()) { + for (final MappingTree.MethodMapping methodMapping : cls.getMethods()) {
+ methods.put( + methods.put(
+ pool.string(methodKey( + pool.string(methodKey(
+ methodMapping.getName(SPIGOT_NAMESPACE), + Objects.requireNonNull(methodMapping.getName(SPIGOT_NAMESPACE)),
+ methodMapping.getDesc(SPIGOT_NAMESPACE) + Objects.requireNonNull(methodMapping.getDesc(SPIGOT_NAMESPACE))
+ )), + )),
+ pool.string(methodMapping.getName(MOJANG_PLUS_YARN_NAMESPACE)) + pool.string(Objects.requireNonNull(methodMapping.getName(MOJANG_PLUS_YARN_NAMESPACE)))
+ ); + );
+ } + }
+ +
+ final ClassMapping map = new ClassMapping( + final ClassMapping map = new ClassMapping(
+ cls.getName(SPIGOT_NAMESPACE).replace('/', '.'), + Objects.requireNonNull(cls.getName(SPIGOT_NAMESPACE)).replace('/', '.'),
+ cls.getName(MOJANG_PLUS_YARN_NAMESPACE).replace('/', '.'), + Objects.requireNonNull(cls.getName(MOJANG_PLUS_YARN_NAMESPACE)).replace('/', '.'),
+ Map.copyOf(methods) + Map.copyOf(methods)
+ ); + );
+ classes.add(map); + classes.add(map);