diff --git a/build.gradle.kts b/build.gradle.kts index 6b949d6..5b1c7bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "com.urielsalis" -version = "2.0.3" +version = "2.0.4" val arrowVersion = "0.10.4" diff --git a/src/main/kotlin/com/urielsalis/mccrashlib/deobfuscator/Deobfuscator.kt b/src/main/kotlin/com/urielsalis/mccrashlib/deobfuscator/Deobfuscator.kt index 6a259da..ee048bf 100644 --- a/src/main/kotlin/com/urielsalis/mccrashlib/deobfuscator/Deobfuscator.kt +++ b/src/main/kotlin/com/urielsalis/mccrashlib/deobfuscator/Deobfuscator.kt @@ -79,7 +79,9 @@ fun getDeobfuscation( } // Matches at(modulename)//(className).(method)((sourcefile):(line)) val java16Regex = "(?:.*?\\bat\\s+[a-zA-Z]*\\//)%c\\.%m\\(%s:%l\\)" - val regex = ReTrace.REGULAR_EXPRESSION + "|(?:" + java16Regex + ")" + // Matches at(optional module name//)(className)$$Lambda$(anything).(method)(sourcefile) + val lambdaRegex = "(?:.*?\\bat\\s+(?:[a-zA-Z]*\\/\\/)?)%c\\\$\\\$Lambda\\\$\\d*\\/(.*)\\.%m\\((.*)\\)" + val regex = ReTrace.REGULAR_EXPRESSION + "|(?:" + java16Regex + ")|(?:" + lambdaRegex + ")" val retrace = ReTrace(regex, false, true, mappingFile) val stringWriter = StringWriter() val printWriter = PrintWriter(stringWriter) diff --git a/src/test/resources/crashes/deobfuscator/client-deobf.txt b/src/test/resources/crashes/deobfuscator/client-deobf.txt index b0599a8..c37b30d 100644 --- a/src/test/resources/crashes/deobfuscator/client-deobf.txt +++ b/src/test/resources/crashes/deobfuscator/client-deobf.txt @@ -29,7 +29,7 @@ java.lang.OutOfMemoryError: Java heap space at net.minecraft.nbt.NbtIo.net.minecraft.nbt.CompoundTag readCompressed(java.io.InputStream)(NbtIo.java:32) at net.minecraft.nbt.NbtIo.net.minecraft.nbt.CompoundTag readCompressed(java.io.File)(NbtIo.java:26) at net.minecraft.world.level.storage.LevelStorageSource.net.minecraft.world.level.storage.LevelSummary lambda$levelSummaryReader$5(java.io.File,boolean,java.io.File,com.mojang.datafixers.DataFixer)(LevelStorageSource.java:229) - at cyg$$Lambda$2987/857564250.apply(Unknown Source) + at net.minecraft.world.level.storage.LevelStorageSource$$Lambda$2987/null 857564250(null).apply(Unknown Source) at net.minecraft.world.level.storage.LevelStorageSource.java.lang.Object readLevelData(java.io.File,java.util.function.BiFunction)(LevelStorageSource.java:178) at net.minecraft.world.level.storage.LevelStorageSource.java.util.List getLevelList()(LevelStorageSource.java:157) at net.minecraft.client.gui.screens.worldselection.WorldSelectionList.void refreshList(java.util.function.Supplier,boolean)(WorldSelectionList.java:91) @@ -38,7 +38,7 @@ java.lang.OutOfMemoryError: Java heap space at net.minecraft.client.gui.screens.Screen.void init(net.minecraft.client.Minecraft,int,int)(Screen.java:325) at net.minecraft.client.Minecraft.void setScreen(net.minecraft.client.gui.screens.Screen)(Minecraft.java:922) at net.minecraft.client.gui.screens.TitleScreen.void lambda$createNormalMenuOptions$4(net.minecraft.client.gui.components.Button)(TitleScreen.java:141) - at doy$$Lambda$2670/1502984812.onPress(Unknown Source) + at net.minecraft.client.gui.screens.TitleScreen$$Lambda$2670/null 1502984812(null).onPress(Unknown Source) at net.minecraft.client.gui.components.Button.void onPress()(Button.java:33) @@ -77,10 +77,10 @@ Stacktrace: at net.minecraft.client.gui.screens.Screen.void wrapScreenError(java.lang.Runnable,java.lang.String,java.lang.String)(Screen.java:438) at net.minecraft.client.MouseHandler.void onPress(long,int,int,int)(MouseHandler.java:92) at net.minecraft.client.MouseHandler.void lambda$null$4(long,int,int,int)(MouseHandler.java:162) - at dka$$Lambda$2975/534027987.run(Unknown Source) + at net.minecraft.client.MouseHandler$$Lambda$2975/null 534027987(null).run(Unknown Source) at net.minecraft.util.thread.BlockableEventLoop.void execute(java.lang.Runnable)(BlockableEventLoop.java:94) at net.minecraft.client.MouseHandler.void lambda$setup$5(long,int,int,int)(MouseHandler.java:162) - at dka$$Lambda$2334/656802017.invoke(Unknown Source) + at net.minecraft.client.MouseHandler$$Lambda$2334/null 656802017(null).invoke(Unknown Source) at org.lwjgl.glfw.GLFWMouseButtonCallbackI.null callback(null)(GLFWMouseButtonCallbackI.java:36) at org.lwjgl.system.JNI.null invokeV(null)(JNI.java) at org.lwjgl.glfw.GLFW.null glfwWaitEventsTimeout(null)(GLFW.java:3174) diff --git a/src/test/resources/crashes/deobfuscator/integrated-server-deobf.txt b/src/test/resources/crashes/deobfuscator/integrated-server-deobf.txt index e67ca55..8fede2e 100644 --- a/src/test/resources/crashes/deobfuscator/integrated-server-deobf.txt +++ b/src/test/resources/crashes/deobfuscator/integrated-server-deobf.txt @@ -18,7 +18,7 @@ java.lang.IllegalArgumentException: Cannot set property cfb{name=facing, clazz=c at net.minecraft.world.level.levelgen.feature.ConfiguredFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos)(ConfiguredFeature.java:55) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:23) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.void lambda$place$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.core.BlockPos)(DecoratedFeature.java:23) - at cjb$$Lambda$4202/169364926.accept(Unknown Source) + at net.minecraft.world.level.levelgen.feature.DecoratedFeature$$Lambda$4202/null 169364926(null).accept(Unknown Source) at java.util.stream.Streams$StreamBuilderImpl.null forEachRemaining(null)(Streams.java:419) at java.util.stream.ReferencePipeline$Head.null forEach(null)(ReferencePipeline.java:580) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:22) @@ -26,7 +26,7 @@ java.lang.IllegalArgumentException: Cannot set property cfb{name=facing, clazz=c at net.minecraft.world.level.levelgen.feature.ConfiguredFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos)(ConfiguredFeature.java:55) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:23) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.void lambda$place$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.core.BlockPos)(DecoratedFeature.java:23) - at cjb$$Lambda$4202/169364926.accept(Unknown Source) + at net.minecraft.world.level.levelgen.feature.DecoratedFeature$$Lambda$4202/null 169364926(null).accept(Unknown Source) at java.util.stream.Streams$StreamBuilderImpl.null forEachRemaining(null)(Streams.java:419) at java.util.stream.ReferencePipeline$Head.null forEach(null)(ReferencePipeline.java:580) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:22) @@ -34,7 +34,7 @@ java.lang.IllegalArgumentException: Cannot set property cfb{name=facing, clazz=c at net.minecraft.world.level.levelgen.feature.ConfiguredFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos)(ConfiguredFeature.java:55) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:23) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.void lambda$place$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.core.BlockPos)(DecoratedFeature.java:23) - at cjb$$Lambda$4202/169364926.accept(Unknown Source) + at net.minecraft.world.level.levelgen.feature.DecoratedFeature$$Lambda$4202/null 169364926(null).accept(Unknown Source) at java.util.stream.ForEachOps$ForEachOp$OfRef.null accept(null)(ForEachOps.java:184) at java.util.stream.IntPipeline$4$1.null accept(null)(IntPipeline.java:250) at java.util.stream.Streams$RangeIntSpliterator.null forEachRemaining(null)(Streams.java:110) @@ -57,18 +57,18 @@ java.lang.IllegalArgumentException: Cannot set property cfb{name=facing, clazz=c at net.minecraft.world.level.chunk.ChunkGenerator.int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types)(ChunkGenerator.java:220) at net.minecraft.world.level.chunk.ChunkGenerator.net.minecraft.world.level.BlockGetter getBaseColumn(int,int)(ChunkGenerator.java:220) at net.minecraft.world.level.chunk.ChunkStatus.java.util.concurrent.CompletableFuture lambda$static$9(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess)(ChunkStatus.java:89) - at cga$$Lambda$1749/1956069733.doWork(Unknown Source) + at net.minecraft.world.level.chunk.ChunkStatus$$Lambda$1749/null 1956069733(null).doWork(Unknown Source) at net.minecraft.world.level.chunk.ChunkStatus.java.util.concurrent.CompletableFuture generate(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List)(ChunkStatus.java:219) at net.minecraft.server.level.ChunkMap.java.util.concurrent.CompletableFuture lambda$null$18(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,java.util.List)(ChunkMap.java:568) - at zs$$Lambda$4179/1440091096.apply(Unknown Source) + at net.minecraft.server.level.ChunkMap$$Lambda$4179/null 1440091096(null).apply(Unknown Source) at com.mojang.datafixers.util.Either$Left.null map(null)(Either.java:38) at net.minecraft.server.level.ChunkMap.java.util.concurrent.CompletionStage lambda$scheduleChunkGeneration$20(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,com.mojang.datafixers.util.Either)(ChunkMap.java:562) - at zs$$Lambda$4164/1959107723.apply(Unknown Source) + at net.minecraft.server.level.ChunkMap$$Lambda$4164/null 1959107723(null).apply(Unknown Source) at java.util.concurrent.CompletableFuture.null uniCompose(null)(CompletableFuture.java:952) at java.util.concurrent.CompletableFuture$UniCompose.null tryFire(null)(CompletableFuture.java:926) at java.util.concurrent.CompletableFuture$Completion.null run(null)(CompletableFuture.java:442) at net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$null$1(java.lang.Runnable,net.minecraft.util.thread.ProcessorHandle)(ChunkTaskPriorityQueueSorter.java:58) - at zu$$Lambda$4177/1354493102.run(Unknown Source) + at net.minecraft.server.level.ChunkTaskPriorityQueueSorter$$Lambda$4177/null 1354493102(null).run(Unknown Source) at net.minecraft.util.thread.ProcessorMailbox.boolean pollTask()(ProcessorMailbox.java:94) at net.minecraft.util.thread.ProcessorMailbox.int pollUntil(it.unimi.dsi.fastutil.ints.Int2BooleanFunction)(ProcessorMailbox.java:137) at net.minecraft.util.thread.ProcessorMailbox.void run()(ProcessorMailbox.java:105) @@ -98,7 +98,7 @@ Stacktrace: at net.minecraft.world.level.levelgen.feature.ConfiguredFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos)(ConfiguredFeature.java:55) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:23) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.void lambda$place$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.core.BlockPos)(DecoratedFeature.java:23) - at cjb$$Lambda$4202/169364926.accept(Unknown Source) + at net.minecraft.world.level.levelgen.feature.DecoratedFeature$$Lambda$4202/null 169364926(null).accept(Unknown Source) at java.util.stream.Streams$StreamBuilderImpl.null forEachRemaining(null)(Streams.java:419) at java.util.stream.ReferencePipeline$Head.null forEach(null)(ReferencePipeline.java:580) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:22) @@ -106,7 +106,7 @@ Stacktrace: at net.minecraft.world.level.levelgen.feature.ConfiguredFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos)(ConfiguredFeature.java:55) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:23) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.void lambda$place$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.core.BlockPos)(DecoratedFeature.java:23) - at cjb$$Lambda$4202/169364926.accept(Unknown Source) + at net.minecraft.world.level.levelgen.feature.DecoratedFeature$$Lambda$4202/null 169364926(null).accept(Unknown Source) at java.util.stream.Streams$StreamBuilderImpl.null forEachRemaining(null)(Streams.java:419) at java.util.stream.ReferencePipeline$Head.null forEach(null)(ReferencePipeline.java:580) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:22) @@ -114,7 +114,7 @@ Stacktrace: at net.minecraft.world.level.levelgen.feature.ConfiguredFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos)(ConfiguredFeature.java:55) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.boolean place(net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,net.minecraft.core.BlockPos,net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration)(DecoratedFeature.java:23) at net.minecraft.world.level.levelgen.feature.DecoratedFeature.void lambda$place$0(net.minecraft.world.level.levelgen.feature.configurations.DecoratedFeatureConfiguration,net.minecraft.world.level.WorldGenLevel,net.minecraft.world.level.chunk.ChunkGenerator,java.util.Random,org.apache.commons.lang3.mutable.MutableBoolean,net.minecraft.core.BlockPos)(DecoratedFeature.java:23) - at cjb$$Lambda$4202/169364926.accept(Unknown Source) + at net.minecraft.world.level.levelgen.feature.DecoratedFeature$$Lambda$4202/null 169364926(null).accept(Unknown Source) at java.util.stream.ForEachOps$ForEachOp$OfRef.null accept(null)(ForEachOps.java:184) at java.util.stream.IntPipeline$4$1.null accept(null)(IntPipeline.java:250) at java.util.stream.Streams$RangeIntSpliterator.null forEachRemaining(null)(Streams.java:110) @@ -152,7 +152,7 @@ Stacktrace: at net.minecraft.world.level.chunk.ChunkGenerator.int getBaseHeight(int,int,net.minecraft.world.level.levelgen.Heightmap$Types)(ChunkGenerator.java:220) at net.minecraft.world.level.chunk.ChunkGenerator.net.minecraft.world.level.BlockGetter getBaseColumn(int,int)(ChunkGenerator.java:220) at net.minecraft.world.level.chunk.ChunkStatus.java.util.concurrent.CompletableFuture lambda$static$9(net.minecraft.world.level.chunk.ChunkStatus,net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List,net.minecraft.world.level.chunk.ChunkAccess)(ChunkStatus.java:89) - at cga$$Lambda$1749/1956069733.doWork(Unknown Source) + at net.minecraft.world.level.chunk.ChunkStatus$$Lambda$1749/null 1956069733(null).doWork(Unknown Source) at net.minecraft.world.level.chunk.ChunkStatus.java.util.concurrent.CompletableFuture generate(net.minecraft.server.level.ServerLevel,net.minecraft.world.level.chunk.ChunkGenerator,net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager,net.minecraft.server.level.ThreadedLevelLightEngine,java.util.function.Function,java.util.List)(ChunkStatus.java:219) -- Chunk to be generated -- @@ -162,15 +162,15 @@ Details: Generator: cho@4b6df8c4 Stacktrace: at net.minecraft.server.level.ChunkMap.java.util.concurrent.CompletableFuture lambda$null$18(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,java.util.List)(ChunkMap.java:568) - at zs$$Lambda$4179/1440091096.apply(Unknown Source) + at net.minecraft.server.level.ChunkMap$$Lambda$4179/null 1440091096(null).apply(Unknown Source) at com.mojang.datafixers.util.Either$Left.null map(null)(Either.java:38) at net.minecraft.server.level.ChunkMap.java.util.concurrent.CompletionStage lambda$scheduleChunkGeneration$20(net.minecraft.world.level.ChunkPos,net.minecraft.server.level.ChunkHolder,net.minecraft.world.level.chunk.ChunkStatus,com.mojang.datafixers.util.Either)(ChunkMap.java:562) - at zs$$Lambda$4164/1959107723.apply(Unknown Source) + at net.minecraft.server.level.ChunkMap$$Lambda$4164/null 1959107723(null).apply(Unknown Source) at java.util.concurrent.CompletableFuture.null uniCompose(null)(CompletableFuture.java:952) at java.util.concurrent.CompletableFuture$UniCompose.null tryFire(null)(CompletableFuture.java:926) at java.util.concurrent.CompletableFuture$Completion.null run(null)(CompletableFuture.java:442) at net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$null$1(java.lang.Runnable,net.minecraft.util.thread.ProcessorHandle)(ChunkTaskPriorityQueueSorter.java:58) - at zu$$Lambda$4177/1354493102.run(Unknown Source) + at net.minecraft.server.level.ChunkTaskPriorityQueueSorter$$Lambda$4177/null 1354493102(null).run(Unknown Source) at net.minecraft.util.thread.ProcessorMailbox.boolean pollTask()(ProcessorMailbox.java:94) -- Affected level -- @@ -197,7 +197,7 @@ Stacktrace: at net.minecraft.server.MinecraftServer.boolean publishServer(net.minecraft.world.level.GameType,boolean,int)(MinecraftServer.java:257) at net.minecraft.server.MinecraftServer.boolean isSingleplayerOwner(com.mojang.authlib.GameProfile)(MinecraftServer.java:257) at net.minecraft.server.MinecraftServer.void lambda$spin$0(java.util.concurrent.atomic.AtomicReference)(MinecraftServer.java:257) - at net.minecraft.server.MinecraftServer$$Lambda$4083/982345020.run(Unknown Source) + at net.minecraft.server.MinecraftServer$$Lambda$4083/null 982345020(null).run(Unknown Source) at java.lang.Thread.null run(null)(Thread.java:745) -- System Details -- diff --git a/src/test/resources/crashes/deobfuscator/java16-deobf.txt b/src/test/resources/crashes/deobfuscator/java16-deobf.txt index 76333fe..f0f380a 100644 --- a/src/test/resources/crashes/deobfuscator/java16-deobf.txt +++ b/src/test/resources/crashes/deobfuscator/java16-deobf.txt @@ -17,10 +17,10 @@ java.lang.Error: Watchdog at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.net.minecraft.util.thread.ProcessorHandle getProcessor(net.minecraft.util.thread.ProcessorHandle,boolean)(ChunkTaskPriorityQueueSorter.java:91) at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$getProcessor$4(net.minecraft.util.thread.ProcessorHandle,net.minecraft.util.thread.ProcessorHandle,boolean)(ChunkTaskPriorityQueueSorter.java:91) at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$getProcessor$3(net.minecraft.util.thread.ProcessorHandle,boolean,net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message)(ChunkTaskPriorityQueueSorter.java:91) - at app//abg$$Lambda$3949/0x00000008013e60c8.accept(Unknown Source) + at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter$$Lambda$3949/null 0x00000008013e60c8(null).accept(Unknown Source) at app//net.minecraft.util.thread.ProcessorHandle$1.void tell(java.lang.Object)(ProcessorHandle.java:44) at app//net.minecraft.server.level.ChunkMap.void lambda$prepareTickingChunk$31(net.minecraft.server.level.ChunkHolder,java.lang.Runnable)(ChunkMap.java:635) - at app//abe$$Lambda$4014/0x00000008013ff918.execute(Unknown Source) + at app//net.minecraft.server.level.ChunkMap$$Lambda$4014/null 0x00000008013ff918(null).execute(Unknown Source) at java.base@16.0.1/java.util.concurrent.CompletableFuture$UniCompletion.claim(CompletableFuture.java:568) at java.base@16.0.1/java.util.concurrent.CompletableFuture$UniApply.tryFire(CompletableFuture.java:638) at java.base@16.0.1/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) @@ -28,7 +28,7 @@ java.lang.Error: Watchdog at java.base@16.0.1/java.util.concurrent.CompletableFuture$UniApply.tryFire(CompletableFuture.java:649) at java.base@16.0.1/java.util.concurrent.CompletableFuture$Completion.run(CompletableFuture.java:478) at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$message$1(java.lang.Runnable,net.minecraft.util.thread.ProcessorHandle)(ChunkTaskPriorityQueueSorter.java:58) - at app//abg$$Lambda$4053/0x000000080140bdd8.run(Unknown Source) + at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter$$Lambda$4053/null 0x000000080140bdd8(null).run(Unknown Source) at app//net.minecraft.util.thread.BlockableEventLoop.void doRunTask(java.lang.Runnable)(BlockableEventLoop.java:151) at app//net.minecraft.server.level.ServerChunkCache$MainThreadExecutor.void doRunTask(java.lang.Runnable)(ServerChunkCache.java:527) at app//net.minecraft.util.thread.BlockableEventLoop.boolean pollTask()(BlockableEventLoop.java:125) @@ -43,7 +43,7 @@ java.lang.Error: Watchdog at app//net.minecraft.server.MinecraftServer.net.minecraft.SystemReport fillServerSystemReport(net.minecraft.SystemReport)(MinecraftServer.java:274) at app//net.minecraft.server.MinecraftServer.boolean isSingleplayerOwner(com.mojang.authlib.GameProfile)(MinecraftServer.java:274) at app//net.minecraft.server.MinecraftServer.void lambda$spin$2(java.util.concurrent.atomic.AtomicReference)(MinecraftServer.java:274) - at app//net.minecraft.server.MinecraftServer$$Lambda$3913/0x00000008013735f0.run(Unknown Source) + at app//net.minecraft.server.MinecraftServer$$Lambda$3913/null 0x00000008013735f0(null).run(Unknown Source) at java.base@16.0.1/java.lang.Thread.run(Thread.java:831) @@ -65,10 +65,10 @@ Stacktrace: at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.net.minecraft.util.thread.ProcessorHandle getProcessor(net.minecraft.util.thread.ProcessorHandle,boolean)(ChunkTaskPriorityQueueSorter.java:91) at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$getProcessor$4(net.minecraft.util.thread.ProcessorHandle,net.minecraft.util.thread.ProcessorHandle,boolean)(ChunkTaskPriorityQueueSorter.java:91) at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$getProcessor$3(net.minecraft.util.thread.ProcessorHandle,boolean,net.minecraft.server.level.ChunkTaskPriorityQueueSorter$Message)(ChunkTaskPriorityQueueSorter.java:91) - at app//abg$$Lambda$3949/0x00000008013e60c8.accept(Unknown Source) + at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter$$Lambda$3949/null 0x00000008013e60c8(null).accept(Unknown Source) at app//net.minecraft.util.thread.ProcessorHandle$1.void tell(java.lang.Object)(ProcessorHandle.java:44) at app//net.minecraft.server.level.ChunkMap.void lambda$prepareTickingChunk$31(net.minecraft.server.level.ChunkHolder,java.lang.Runnable)(ChunkMap.java:635) - at app//abe$$Lambda$4014/0x00000008013ff918.execute(Unknown Source) + at app//net.minecraft.server.level.ChunkMap$$Lambda$4014/null 0x00000008013ff918(null).execute(Unknown Source) at java.base@16.0.1/java.util.concurrent.CompletableFuture$UniCompletion.claim(CompletableFuture.java:568) at java.base@16.0.1/java.util.concurrent.CompletableFuture$UniApply.tryFire(CompletableFuture.java:638) at java.base@16.0.1/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:506) @@ -76,7 +76,7 @@ Stacktrace: at java.base@16.0.1/java.util.concurrent.CompletableFuture$UniApply.tryFire(CompletableFuture.java:649) at java.base@16.0.1/java.util.concurrent.CompletableFuture$Completion.run(CompletableFuture.java:478) at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter.void lambda$message$1(java.lang.Runnable,net.minecraft.util.thread.ProcessorHandle)(ChunkTaskPriorityQueueSorter.java:58) - at app//abg$$Lambda$4053/0x000000080140bdd8.run(Unknown Source) + at app//net.minecraft.server.level.ChunkTaskPriorityQueueSorter$$Lambda$4053/null 0x000000080140bdd8(null).run(Unknown Source) at app//net.minecraft.util.thread.BlockableEventLoop.void doRunTask(java.lang.Runnable)(BlockableEventLoop.java:151) at app//net.minecraft.server.level.ServerChunkCache$MainThreadExecutor.void doRunTask(java.lang.Runnable)(ServerChunkCache.java:527) at app//net.minecraft.util.thread.BlockableEventLoop.boolean pollTask()(BlockableEventLoop.java:125) @@ -142,7 +142,7 @@ Details: at app//com.mojang.datafixers.functions.PointFreeRule$One.null rewrite(null)(PointFreeRule.java:651) at app//com.mojang.datafixers.functions.PointFreeRule$OrElse.null rewrite(null)(PointFreeRule.java:571) at app//com.mojang.datafixers.functions.Apply.null lambda$one$5(null)(Apply.java:46) - at app//com.mojang.datafixers.functions.Apply$$Lambda$1847/0x00000008010d90d0.get(Unknown Source) + at app//com.mojang.datafixers.functions.Apply$$Lambda$1847/null 0x00000008010d90d0(null).get(Unknown Source) at java.base@16.0.1/java.util.Optional.orElseGet(Optional.java:364) ... @@ -154,7 +154,7 @@ Details: at app//com.mojang.datafixers.functions.PointFreeRule$One.null rewrite(null)(PointFreeRule.java:651) at app//com.mojang.datafixers.functions.PointFreeRule$OrElse.null rewrite(null)(PointFreeRule.java:571) at app//com.mojang.datafixers.functions.Comp.null lambda$one$4(null)(Comp.java:44) - at app//com.mojang.datafixers.functions.Comp$$Lambda$1859/0x00000008010dac18.get(Unknown Source) + at app//com.mojang.datafixers.functions.Comp$$Lambda$1859/null 0x00000008010dac18(null).get(Unknown Source) at java.base@16.0.1/java.util.Optional.orElseGet(Optional.java:364) ... @@ -163,7 +163,7 @@ Details: at app//com.mojang.datafixers.functions.PointFreeRule$One.null rewrite(null)(PointFreeRule.java:651) at app//com.mojang.datafixers.functions.PointFreeRule$OrElse.null rewrite(null)(PointFreeRule.java:571) at app//com.mojang.datafixers.functions.Apply.null lambda$one$5(null)(Apply.java:46) - at app//com.mojang.datafixers.functions.Apply$$Lambda$1847/0x00000008010d90d0.get(Unknown Source) + at app//com.mojang.datafixers.functions.Apply$$Lambda$1847/null 0x00000008010d90d0(null).get(Unknown Source) at java.base@16.0.1/java.util.Optional.orElseGet(Optional.java:364) at app//com.mojang.datafixers.functions.Apply.null one(null)(Apply.java:46) at app//com.mojang.datafixers.functions.PointFreeRule$One.null rewrite(null)(PointFreeRule.java:651)