Make MCD API optional for Parchment extension

MaxPixelStudios · Aug 25, 2024 · a0145bb · a0145bb
1 parent 3aefb43
commit a0145bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/extensions/parchment/pom.xml b/extensions/parchment/pom.xml
@@ -17,6 +17,12 @@
             <groupId>cn.maxpixel.minecraft-decompiler</groupId>
             <artifactId>api</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.maxpixel.minecraft-decompiler</groupId>
+            <artifactId>mapping-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>

diff --git a/...archment/src/main/java/cn/maxpixel/mcdecompiler/mapping/parchment/ParchmentExtension.java b/...archment/src/main/java/cn/maxpixel/mcdecompiler/mapping/parchment/ParchmentExtension.java
@@ -6,12 +6,10 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ParchmentExtension implements Extension {
-    public static final String NAME = "parchment";
-
     @NotNull
     @Override
     public String getName() {
-        return NAME;
+        return ParchmentMappingFormat.NAME;
     }
 
     @Override

diff --git a/...ment/src/main/java/cn/maxpixel/mcdecompiler/mapping/parchment/ParchmentMappingFormat.java b/...ment/src/main/java/cn/maxpixel/mcdecompiler/mapping/parchment/ParchmentMappingFormat.java
@@ -10,6 +10,7 @@
 
 public enum ParchmentMappingFormat implements MappingFormat.Classified<PairedMapping> {
     INSTANCE;
+    public static final String NAME = "parchment";
     public static final String KEY_NAME = "name";
     public static final String KEY_JAVADOC = "javadoc";
     public static final String KEY_DESCRIPTOR = "descriptor";
@@ -23,7 +24,7 @@ public enum ParchmentMappingFormat implements MappingFormat.Classified<PairedMap
 
     @Override
     public @NotNull String getName() {
-        return ParchmentExtension.NAME;
+        return NAME;
     }
 
     @Override

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
@@ -4,7 +4,6 @@
 import cn.maxpixel.mcdecompiler.common.util.Utils;
 import cn.maxpixel.mcdecompiler.mapping.format.MappingFormats;
 import cn.maxpixel.mcdecompiler.mapping.parchment.FormatVersion;
-import cn.maxpixel.mcdecompiler.mapping.parchment.ParchmentExtension;
 import cn.maxpixel.mcdecompiler.mapping.parchment.ParchmentMappingFormat;
 import cn.maxpixel.mcdecompiler.mapping.parchment.ParchmentMappingProcessor;
 import cn.maxpixel.rewh.logging.LogManager;
@@ -33,7 +32,7 @@ void testFormatVersion() {
     @Test
     void testFormatExtension() {
         ExtensionManager.init();
-        assertEquals(ParchmentMappingFormat.INSTANCE, MappingFormats.get(ParchmentExtension.NAME));
+        assertEquals(ParchmentMappingFormat.INSTANCE, MappingFormats.get(ParchmentMappingFormat.NAME));
     }
 
     @Test