Split mapping formats into separate files

MaxPixelStudios · Nov 19, 2024 · 162e209 · 162e209
1 parent f7c93f1
commit 162e209
Show file tree

Hide file tree

Showing 28 changed files with 1,433 additions and 1,217 deletions.
diff --git a/.../mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/CsrgMappingFormat.java b/.../mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/CsrgMappingFormat.java
@@ -0,0 +1,25 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.PairedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.CsrgMappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.CsrgMappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum CsrgMappingFormat implements MappingFormat.Classified<PairedMapping> {
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "csrg";
+    }
+
+    @Override
+    public @NotNull CsrgMappingProcessor getProcessor() {
+        return CsrgMappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull CsrgMappingGenerator getGenerator() {
+        return CsrgMappingGenerator.INSTANCE;
+    }
+}
diff --git a/...les/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/MappingFormats.java b/...les/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/MappingFormats.java
@@ -18,160 +18,21 @@
 
 package cn.maxpixel.mcdecompiler.mapping.format;
 
-import cn.maxpixel.mcdecompiler.mapping.NamespacedMapping;
-import cn.maxpixel.mcdecompiler.mapping.PairedMapping;
-import cn.maxpixel.mcdecompiler.mapping.generator.MappingGenerator;
-import cn.maxpixel.mcdecompiler.mapping.generator.MappingGenerators;
-import cn.maxpixel.mcdecompiler.mapping.processor.MappingProcessor;
-import cn.maxpixel.mcdecompiler.mapping.processor.MappingProcessors;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectSets;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
 import java.util.Set;
 
 public final class MappingFormats {
-    public static final MappingFormat.Classified<PairedMapping> SRG = new MappingFormat.Classified<>() {
-        @Override
-        public @NotNull String getName() {
-            return "srg";
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<PairedMapping> getProcessor() {
-            return MappingProcessors.SRG;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<PairedMapping> getGenerator() {
-            return MappingGenerators.SRG;
-        }
-    };
-
-    public static final MappingFormat.Classified<PairedMapping> CSRG = new MappingFormat.Classified<>() {
-        @Override
-        public @NotNull String getName() {
-            return "csrg";
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<PairedMapping> getProcessor() {
-            return MappingProcessors.CSRG;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<PairedMapping> getGenerator() {
-            return MappingGenerators.CSRG;
-        }
-    };
-
-    public static final MappingFormat.Classified<PairedMapping> TSRG_V1 = new MappingFormat.Classified<>() {
-        @Override
-        public @NotNull String getName() {
-            return "tsrg-v1";
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<PairedMapping> getProcessor() {
-            return MappingProcessors.TSRG_V1;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<PairedMapping> getGenerator() {
-            return MappingGenerators.TSRG_V1;
-        }
-    };
-
-    public static final MappingFormat.Classified<NamespacedMapping> TSRG_V2 = new MappingFormat.Classified<>() {
-        @Override
-        public @NotNull String getName() {
-            return "tsrg-v2";
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<NamespacedMapping> getProcessor() {
-            return MappingProcessors.TSRG_V2;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<NamespacedMapping> getGenerator() {
-            return MappingGenerators.TSRG_V2;
-        }
-    };
-
-    public static final MappingFormat.Classified<PairedMapping> PROGUARD = new MappingFormat.Classified<>() {
-        @Override
-        public @NotNull String getName() {
-            return "proguard";
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<PairedMapping> getProcessor() {
-            return MappingProcessors.PROGUARD;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<PairedMapping> getGenerator() {
-            return MappingGenerators.PROGUARD;
-        }
-    };
-
-    public static final MappingFormat.Classified<NamespacedMapping> TINY_V1 = new MappingFormat.Classified<>() {// TODO: support properties
-        @Override
-        public @NotNull String getName() {
-            return "tiny-v1";
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<NamespacedMapping> getProcessor() {
-            return MappingProcessors.TINY_V1;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<NamespacedMapping> getGenerator() {
-            return MappingGenerators.TINY_V1;
-        }
-    };
-
-    public static final MappingFormat.Classified<NamespacedMapping> TINY_V2 = new MappingFormat.Classified<>() {
-        @Override
-        public @NotNull String getName() {
-            return "tiny-v2";
-        }
-
-        @Override
-        public char getCommentChar() {
-            return '\0';
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<NamespacedMapping> getProcessor() {
-            return MappingProcessors.TINY_V2;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<NamespacedMapping> getGenerator() {
-            return MappingGenerators.TINY_V2;
-        }
-    };
-
-    public static final MappingFormat.Classified<PairedMapping> PDME = new MappingFormat.Classified<>() {
-        @Override
-        public @NotNull String getName() {
-            return "pdme";
-        }
-
-        @Override
-        public @NotNull MappingProcessor.Classified<PairedMapping> getProcessor() {
-            return MappingProcessors.PDME;
-        }
-
-        @Override
-        public @NotNull MappingGenerator.Classified<PairedMapping> getGenerator() {
-            return MappingGenerators.PDME;
-        }
-    };
+    public static final SrgMappingFormat SRG = SrgMappingFormat.INSTANCE;
+    public static final CsrgMappingFormat CSRG = CsrgMappingFormat.INSTANCE;
+    public static final TsrgV1MappingFormat TSRG_V1 = TsrgV1MappingFormat.INSTANCE;
+    public static final TsrgV2MappingFormat TSRG_V2 = TsrgV2MappingFormat.INSTANCE;
+    public static final ProguardMappingFormat PROGUARD = ProguardMappingFormat.INSTANCE;
+    public static final TinyV1MappingFormat TINY_V1 = TinyV1MappingFormat.INSTANCE;
+    public static final TinyV2MappingFormat TINY_V2 = TinyV2MappingFormat.INSTANCE;
+    public static final PdmeMappingFormat PDME = PdmeMappingFormat.INSTANCE;
 
     private static final Object2ObjectOpenHashMap<String, MappingFormat<?, ?>> MAPPING_FORMATS = new Object2ObjectOpenHashMap<>();
 

diff --git a/.../mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/PdmeMappingFormat.java b/.../mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/PdmeMappingFormat.java
@@ -0,0 +1,25 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.PairedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.PdmeMappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.PdmeMappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum PdmeMappingFormat implements MappingFormat.Classified<PairedMapping> {
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "pdme";
+    }
+
+    @Override
+    public @NotNull PdmeMappingProcessor getProcessor() {
+        return PdmeMappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull PdmeMappingGenerator getGenerator() {
+        return PdmeMappingGenerator.INSTANCE;
+    }
+}
diff --git a/...ping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/ProguardMappingFormat.java b/...ping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/ProguardMappingFormat.java
@@ -0,0 +1,25 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.PairedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.ProguardMappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.ProguardMappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum ProguardMappingFormat implements MappingFormat.Classified<PairedMapping> {
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "proguard";
+    }
+
+    @Override
+    public @NotNull ProguardMappingProcessor getProcessor() {
+        return ProguardMappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull ProguardMappingGenerator getGenerator() {
+        return ProguardMappingGenerator.INSTANCE;
+    }
+}
diff --git a/...s/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/SrgMappingFormat.java b/...s/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/SrgMappingFormat.java
@@ -0,0 +1,25 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.PairedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.SrgMappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.SrgMappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum SrgMappingFormat implements MappingFormat.Classified<PairedMapping> {
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "srg";
+    }
+
+    @Override
+    public @NotNull SrgMappingProcessor getProcessor() {
+        return SrgMappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull SrgMappingGenerator getGenerator() {
+        return SrgMappingGenerator.INSTANCE;
+    }
+}
diff --git a/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TinyV1MappingFormat.java b/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TinyV1MappingFormat.java
@@ -0,0 +1,25 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.NamespacedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.TinyV1MappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.TinyV1MappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum TinyV1MappingFormat implements MappingFormat.Classified<NamespacedMapping> {// TODO: support properties
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "tiny-v1";
+    }
+
+    @Override
+    public @NotNull TinyV1MappingProcessor getProcessor() {
+        return TinyV1MappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull TinyV1MappingGenerator getGenerator() {
+        return TinyV1MappingGenerator.INSTANCE;
+    }
+}
diff --git a/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TinyV2MappingFormat.java b/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TinyV2MappingFormat.java
@@ -0,0 +1,30 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.NamespacedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.TinyV2MappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.TinyV2MappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum TinyV2MappingFormat implements MappingFormat.Classified<NamespacedMapping> {
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "tiny-v2";
+    }
+
+    @Override
+    public char getCommentChar() {
+        return '\0';
+    }
+
+    @Override
+    public @NotNull TinyV2MappingProcessor getProcessor() {
+        return TinyV2MappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull TinyV2MappingGenerator getGenerator() {
+        return TinyV2MappingGenerator.INSTANCE;
+    }
+}
diff --git a/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TsrgV1MappingFormat.java b/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TsrgV1MappingFormat.java
@@ -0,0 +1,25 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.PairedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.TsrgV1MappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.TsrgV1MappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum TsrgV1MappingFormat implements MappingFormat.Classified<PairedMapping> {
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "tsrg-v1";
+    }
+
+    @Override
+    public @NotNull TsrgV1MappingProcessor getProcessor() {
+        return TsrgV1MappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull TsrgV1MappingGenerator getGenerator() {
+        return TsrgV1MappingGenerator.INSTANCE;
+    }
+}
diff --git a/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TsrgV2MappingFormat.java b/...apping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/format/TsrgV2MappingFormat.java
@@ -0,0 +1,25 @@
+package cn.maxpixel.mcdecompiler.mapping.format;
+
+import cn.maxpixel.mcdecompiler.mapping.NamespacedMapping;
+import cn.maxpixel.mcdecompiler.mapping.generator.TsrgV2MappingGenerator;
+import cn.maxpixel.mcdecompiler.mapping.processor.TsrgV2MappingProcessor;
+import org.jetbrains.annotations.NotNull;
+
+public enum TsrgV2MappingFormat implements MappingFormat.Classified<NamespacedMapping> {
+    INSTANCE;
+
+    @Override
+    public @NotNull String getName() {
+        return "tsrg-v2";
+    }
+
+    @Override
+    public @NotNull TsrgV2MappingProcessor getProcessor() {
+        return TsrgV2MappingProcessor.INSTANCE;
+    }
+
+    @Override
+    public @NotNull TsrgV2MappingGenerator getGenerator() {
+        return TsrgV2MappingGenerator.INSTANCE;
+    }
+}