Fix decompiler thread classes being excluded

MaxPixelStudios · Aug 31, 2024 · fedfa7a · fedfa7a
1 parent a0145bb
commit fedfa7a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/...nt/src/test/java/cn/maxpixel/mcdecompiler/test/mapping/parchment/ParchmentFormatTest.java b/...nt/src/test/java/cn/maxpixel/mcdecompiler/test/mapping/parchment/ParchmentFormatTest.java
@@ -36,7 +36,7 @@ void testFormatExtension() {
     }
 
     @Test
-    void testProcessor(@TempDir(cleanup = CleanupMode.ON_SUCCESS) Path tmp) throws IOException {
+    void testProcessorAndGenerator(@TempDir(cleanup = CleanupMode.ON_SUCCESS) Path tmp) throws IOException {
         LOGGER.info(tmp.toString());
         var is = getClass().getClassLoader().getResourceAsStream("parchment.json");
         assertNotNull(is);

diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml
@@ -90,6 +90,12 @@
                                 <exclude>it/unimi/dsi/fastutil/**/*Big*</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>cn.maxpixel.minecraft-decompiler:decompiler</artifact>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </filter>
                     </filters>
                     <relocations>
                         <relocation>

diff --git a/...iler/src/main/java/cn/maxpixel/mcdecompiler/decompiler/thread/ExternalJarClassLoader.java b/...iler/src/main/java/cn/maxpixel/mcdecompiler/decompiler/thread/ExternalJarClassLoader.java
@@ -31,7 +31,7 @@ public ExternalJarClassLoader(URL[] urls) {
 
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-        if(name.startsWith("cn.maxpixel.mcdecompiler.decompiler.thread")) {
+        if (name.startsWith("cn.maxpixel.mcdecompiler.decompiler.thread")) {
             synchronized (getClassLoadingLock(name)) {
                 Class<?> c = findLoadedClass(name);
                 if (c == null) {

diff --git a/...etector/src/main/java/cn/maxpixel/mcdecompiler/mapping/detector/DefaultDetectionUnit.java b/...etector/src/main/java/cn/maxpixel/mcdecompiler/mapping/detector/DefaultDetectionUnit.java
@@ -22,7 +22,7 @@ public boolean canDetectHeader() {
     }
 
     @Override
-    public Pair<MappingFormat<?, ?>, Percentage> detectContent(List<String> contents) {
+    public Pair</*@Nullable*/ MappingFormat<?, ?>, /*@NotNull*/ Percentage> detectContent(List<String> contents) {
         String s = contents.get(0);
         if (s.startsWith("PK: ") || s.startsWith("CL: ") || s.startsWith("FD: ") || s.startsWith("MD: ")) return Pair.of(MappingFormats.SRG, Percentage.NINETY_NINE);
         else if (s.endsWith(":")) return Pair.of(MappingFormats.PROGUARD, Percentage.NINETY);

diff --git a/...ormat-detector/src/main/java/cn/maxpixel/mcdecompiler/mapping/detector/DetectionUnit.java b/...ormat-detector/src/main/java/cn/maxpixel/mcdecompiler/mapping/detector/DetectionUnit.java
@@ -22,7 +22,7 @@ default Predicate<String> getLineFilter() {
         return Optional.empty();
     }
 
-    Pair<MappingFormat<?, ?>, Percentage> detectContent(List<String> contents);
+    Pair</*@Nullable*/ MappingFormat<?, ?>, /*@NotNull*/ Percentage> detectContent(List<String> contents);
 
     enum Percentage {
         ZERO,