STUPID MAVEN USING A STUPID LIB WHICH DOES NOT SUPPORT ANNOTATED TYPE…

… PARAMETERS
MaxPixelStudios · Jun 2, 2024 · 6b1f2e9 · 6b1f2e9
1 parent cc7982a
commit 6b1f2e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/modules/api/pom.xml b/modules/api/pom.xml
@@ -29,11 +29,6 @@
             <artifactId>remapper</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>cn.maxpixel.minecraft-decompiler</groupId>
-            <artifactId>mapping-format-detector</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

diff --git a/modules/cli/pom.xml b/modules/cli/pom.xml
@@ -24,6 +24,11 @@
             <artifactId>api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.maxpixel.minecraft-decompiler</groupId>
+            <artifactId>mapping-format-detector</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

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
@@ -3,8 +3,6 @@
 import cn.maxpixel.mcdecompiler.mapping.format.MappingFormat;
 import cn.maxpixel.mcdecompiler.mapping.format.MappingFormats;
 import it.unimi.dsi.fastutil.Pair;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -24,7 +22,7 @@ public boolean canDetectHeader() {
     }
 
     @Override
-    public Pair<@Nullable MappingFormat<?, ?>, @NotNull Percentage> detectContent(List<String> contents) {
+    public Pair<MappingFormat<?, ?>, 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
@@ -3,8 +3,6 @@
 import cn.maxpixel.mcdecompiler.mapping.format.MappingFormat;
 import it.unimi.dsi.fastutil.Pair;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -24,7 +22,7 @@ default Predicate<String> getLineFilter() {
         return Optional.empty();
     }
 
-    Pair<@Nullable MappingFormat<?, ?>, @NotNull Percentage> detectContent(List<String> contents);
+    Pair<MappingFormat<?, ?>, Percentage> detectContent(List<String> contents);
 
     enum Percentage {
         ZERO,