Make get*Component* accept Class<C> instead of Class<? extends C>

Add some magic to eliminate the need of writing `XXX.class` in some situations
Some notes: Since a component should exactly match its class, Class<C> is used instead of Class<? extends C>

Author: XiaoPangxie732

extensions/parchment/src/main/java/cn/maxpixel/mcdecompiler/mapping/parchment/ParchmentMappingGenerator.java

@@ -101,7 +101,7 @@ private static void writeClasses(ClassifiedMapping<PairedMapping> mappings, Json
     }
 
     private static void writeParams(JsonWriter writer, @NotNull PairedMapping method) throws IOException {
-        var params = method.getComponent(LocalVariableTable.Paired.class);
+        LocalVariableTable.Paired params = method.getComponent();
         if (params != null && !params.isEmpty()) {
             writer.name(KEY_PARAMETERS).beginArray();
             for (var indexes = params.getLocalVariableIndexes().iterator(); indexes.hasNext(); ) {
@@ -112,7 +112,7 @@ private static void writeParams(JsonWriter writer, @NotNull PairedMapping method
                         .jsonValue(Integer.toString(i))
                         .name(KEY_NAME)
                         .value(param.unmappedName);
-                Documented doc = param.getComponent(Documented.class);
+                Documented doc = param.getComponent();
                 if (doc != null && !doc.contents.isEmpty()) {
                     writer.name(KEY_JAVADOC).value(doc.getContentString());
                 }
@@ -123,7 +123,7 @@ private static void writeParams(JsonWriter writer, @NotNull PairedMapping method
     }
 
     private static void writeDoc(PairedMapping m, JsonWriter writer) throws IOException {
-        Documented doc = m.getComponent(Documented.class);
+        Documented doc = m.getComponent();
         if (doc != null && !doc.contents.isEmpty()) {
             writer.name(KEY_JAVADOC)
                     .beginArray();

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/Mapping.java

@@ -51,46 +51,84 @@ protected Mapping(@NotNull Component @NotNull ... components) {
      */
     protected Mapping() {}
 
+    /**
+     * Gets the component of the given type if it is present.<br>
+     * For the {@link Owned} component, it is recommended to use {@link #getOwned()} instead of this method
+     *
+     * @param component The given component type. Cannot be null
+     * @return The component if exists, or {@code null}
+     */
+    @SuppressWarnings("unchecked")
+    public <C extends Component> C getComponent(@NotNull Class<C> component) {
+        return (C) components.get(Objects.requireNonNull(component));
+    }
+
     /**
      * Gets the component of given type if it is present.<br>
      * For the {@link Owned} component, it is recommended to use {@link #getOwned()} instead of this method
      *
-     * @param component Given component type. Cannot be null
+     * @param type Used to obtain the component type. You needn't pass anything.
      * @return The component if exists, or {@code null}
+     * @see #getComponent(Class)
      */
     @SuppressWarnings("unchecked")
-    public <C extends Component> C getComponent(@NotNull Class<? extends C> component) {
-        return (C) components.get(component);
+    public <C extends Component> C getComponent(C... type) {
+        return getComponent((Class<C>) type.getClass().getComponentType());
     }
 
     /**
-     * Gets the component of given type if it is present, otherwise create a new component<br>
+     * Gets the component of the given type if it is present, otherwise creates a new component<br>
      *
-     * @param component Given component type. Cannot be null
+     * @param component The given component type. Cannot be null
      * @return The component if exists, or the newly created component
      */
     @SuppressWarnings("unchecked")
-    public <C extends Component> @NotNull C getOrCreateComponent(@NotNull Class<? extends C> component, @NotNull Supplier<? extends C> factory) {
-        var value = components.get(component);
+    public <C extends Component> @NotNull C getOrCreateComponent(@NotNull Class<C> component, @NotNull Supplier<C> factory) {
+        var value = components.get(Objects.requireNonNull(component));
         if (value == null) {
             value = Objects.requireNonNull(factory.get());
+            if (value.getClass() != component) throw new IllegalArgumentException("Type mismatch");
             components.put(component, value);
         }
         return (C) value;
     }
 
     /**
-     * Gets the component of given type.
+     * Gets the component of the given type if it is present, otherwise creates a new component<br>
+     *
+     * @param type Used to obtain the component type. You needn't pass anything.
+     * @return The component if exists, or the newly created component
+     */
+    @SuppressWarnings("unchecked")
+    public <C extends Component> @NotNull C getOrCreateComponent(@NotNull Supplier<C> factory, C... type) {
+        return getOrCreateComponent((Class<C>) type.getClass().getComponentType(), factory);
+    }
+
+    /**
+     * Gets the component of the given type.
      * <p>
      * For the {@link Owned} component, it is recommended to use {@link #getOwned()} instead of this method
      *
-     * @param component Given component type. Cannot be null
-     * @return The component
+     * @param component The given component type. Cannot be null
+     * @return The component optional
      */
-    public <C extends Component> @NotNull Optional<C> getComponentOptional(@NotNull Class<? extends C> component) {
+    public <C extends Component> @NotNull Optional<C> getComponentOptional(@NotNull Class<C> component) {
         return Optional.ofNullable(getComponent(component));
     }
 
+    /**
+     * Gets the component of the given type.
+     * <p>
+     * For the {@link Owned} component, it is recommended to use {@link #getOwned()} instead of this method
+     *
+     * @param type Used to obtain the component type. You needn't pass anything.
+     * @return The component optional
+     */
+    @SuppressWarnings("unchecked")
+    public <C extends Component> @NotNull Optional<C> getComponentOptional(C... type) {
+        return getComponentOptional((Class<C>) type.getClass().getComponentType());
+    }
+
     /**
      * Gets the {@link Owned} component if it is present
      *

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/NamespacedMapping.java

@@ -196,7 +196,7 @@ public NamespacedMapping(String[] namespaces, String name, Component... componen
     @SuppressWarnings("unchecked")
     @Override
     public Owned<NamespacedMapping> getOwned() {
-        return getComponent(Owned.class);
+        return getComponent();
     }
 
     /**

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/PairedMapping.java

@@ -103,7 +103,7 @@ public PairedMapping() {}
     @SuppressWarnings("unchecked")
     @Override
     public Owned<PairedMapping> getOwned() {
-        return getComponent(Owned.class);
+        return getComponent();
     }
 
     /**

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/generator/PdmeMappingGenerator.java

@@ -76,7 +76,7 @@ public ObjectList<String> generate(ClassifiedMapping<PairedMapping> mappings, Ma
                 synchronized (lines) {
                     lines.add(String.join(PARA, "Def", unmappedName, method.mappedName, NIL, NIL, doc));
                 }
-                var lvt = method.getComponent(LocalVariableTable.Paired.class);
+                LocalVariableTable.Paired lvt = method.getComponent();
                 if (lvt != null) {
                     IntIterator it = lvt.getLocalVariableIndexes().iterator();
                     while (it.hasNext()) {
@@ -123,7 +123,7 @@ private static String nilWhenBlank(String s) {
     }
 
     private static String getDoc(PairedMapping m) {
-        var doc = m.getComponent(Documented.class);
+        Documented doc = m.getComponent();
         return doc != null ? doc.getContentString() : "";
     }
 

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/generator/ProguardMappingGenerator.java

@@ -78,7 +78,7 @@ public ObjectList<String> generate(ClassifiedMapping<PairedMapping> mappings, Ma
                 if (end > 1) args.deleteCharAt(args.length() - 1);
                 String ret = NamingUtil.descriptor2Java(mappedDesc.substring(end + 1));
                 if (method.hasComponent(LineNumber.class)) {
-                    LineNumber lineNumber = method.getComponent(LineNumber.class);
+                    LineNumber lineNumber = method.getComponent();
                     lines.add("    " + lineNumber.startLineNumber + ':' + lineNumber.endLineNumber + ':' +
                             ret + ' ' + method.mappedName + '(' + args + ") -> " + method.unmappedName);
                 } else {

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/generator/TinyV2MappingGenerator.java

@@ -57,7 +57,7 @@ public ObjectList<String> generate(ClassifiedMapping<NamespacedMapping> mappings
         }
         for (ClassMapping<NamespacedMapping> cls : mappings.classes) {
             lines.add("c\t" + NamingUtil.concatNamespaces(namespaces, cls.mapping::getName, "\t"));
-            var classDoc = cls.mapping.getComponent(Documented.class);
+            Documented classDoc = cls.mapping.getComponent();
             if (classDoc != null) {
                 String content = classDoc.getContentString();
                 if (!content.isBlank()) lines.add("\tc\t" + TinyUtil.escape(content));
@@ -66,7 +66,7 @@ public ObjectList<String> generate(ClassifiedMapping<NamespacedMapping> mappings
                 String desc = MappingUtils.Namespaced.checkTiny(namespace0, cls, field);
                 synchronized (lines) {
                     lines.add("\tf\t" + desc + '\t' + NamingUtil.concatNamespaces(namespaces, field::getName, "\t"));
-                    var fieldDoc = field.getComponent(Documented.class);
+                    Documented fieldDoc = field.getComponent();
                     if (fieldDoc != null) {
                         String doc = fieldDoc.getContentString();
                         if (!doc.isBlank()) lines.add("\t\tc\t" + TinyUtil.escape(doc));
@@ -77,13 +77,13 @@ public ObjectList<String> generate(ClassifiedMapping<NamespacedMapping> mappings
                 String desc = MappingUtils.Namespaced.checkTiny(namespace0, cls, method);
                 synchronized (lines) {
                     lines.add("\tm\t" + desc + '\t' + NamingUtil.concatNamespaces(namespaces, method::getName, "\t"));
-                    var methodDoc = method.getComponent(Documented.class);
+                    Documented methodDoc = method.getComponent();
                     if (methodDoc != null) {
                         String doc = methodDoc.getContentString();
                         if (!doc.isBlank()) lines.add("\t\tc\t" + TinyUtil.escape(doc));
                     }
                     if (method.hasComponent(LocalVariableTable.Namespaced.class)) {
-                        LocalVariableTable.Namespaced lvt = method.getComponent(LocalVariableTable.Namespaced.class);
+                        LocalVariableTable.Namespaced lvt = method.getComponent();
                         boolean omittedThis = method.hasComponent(StaticIdentifiable.class) &&
                                 !method.getComponent(StaticIdentifiable.class).isStatic;
                         lvt.getLocalVariableIndexes().forEach(index -> {
@@ -93,7 +93,7 @@ public ObjectList<String> generate(ClassifiedMapping<NamespacedMapping> mappings
                                 return MappingUtils.isStringNotBlank(name) ? name : "";
                             }, "\t");
                             lines.add("\t\tp\t" + index + '\t' + names);
-                            var paramDoc = localVariable.getComponent(Documented.class);
+                            Documented paramDoc = localVariable.getComponent();
                             if (paramDoc != null) {
                                 String doc = paramDoc.getContentString();
                                 if (!doc.isBlank()) lines.add("\t\t\tc\t" + TinyUtil.escape(doc));

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/generator/TsrgV2MappingGenerator.java

@@ -65,10 +65,10 @@ public ObjectList<String> generate(ClassifiedMapping<NamespacedMapping> mappings
                 synchronized (lines) {
                     genDescriptorLine(lines, namespace0, method, NamingUtil.concatNamespaces(namespaces,
                             method::getName, " "));
-                    var si = method.getComponent(StaticIdentifiable.class);
+                    StaticIdentifiable si = method.getComponent();
                     if (si != null && si.isStatic) lines.add("\t\tstatic");
                     if (method.hasComponent(LocalVariableTable.Namespaced.class)) {
-                        LocalVariableTable.Namespaced lvt = method.getComponent(LocalVariableTable.Namespaced.class);
+                        LocalVariableTable.Namespaced lvt = method.getComponent();
                         lvt.getLocalVariableIndexes().forEach(index -> {
                             String names = NamingUtil.concatNamespaces(namespaces, namespace -> {
                                 String name = lvt.getLocalVariable(index).getName(namespace);
@@ -89,7 +89,7 @@ public ObjectList<String> generate(ClassifiedMapping<NamespacedMapping> mappings
     }
 
     private static void genDescriptorLine(ObjectArrayList<String> lines, String namespace0, NamespacedMapping method, String names) {
-        Descriptor.Namespaced desc = method.getComponent(Descriptor.Namespaced.class);
+        Descriptor.Namespaced desc = method.getComponent();
         if (!namespace0.equals(desc.descriptorNamespace)) throw new IllegalArgumentException();
         int i = names.indexOf(' ');
         lines.add('\t' + names.substring(0, i + 1) + desc.descriptor + names.substring(i));

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/remapper/ClassifiedMappingRemapper.java

@@ -136,7 +136,7 @@ else if (mapping.hasComponent(Descriptor.Mapped.class))
 
     public String getUnmappedDesc(Mapping mapping, String unmappedNamespace, Object2ObjectOpenHashMap<String, UniDescriptorRemapper> map,
                                   ClassifiedMapping<NamespacedMapping> mappings) {
-        var desc = mapping.getComponent(Descriptor.Namespaced.class);
+        Descriptor.Namespaced desc = mapping.getComponent();
         if (desc != null) return unmappedNamespace.equals(desc.descriptorNamespace) ? desc.descriptor : map
                 .computeIfAbsent(desc.descriptorNamespace, (String n) -> new UniDescriptorRemapper(genMappingsByNamespaceMap(mappings.classes, n)))
                 .unmapMethodDesc(desc.descriptor);

modules/mapping-api/src/main/java/cn/maxpixel/mcdecompiler/mapping/util/MappingUtils.java

@@ -84,7 +84,7 @@ public static String checkTiny(String namespace0, ClassMapping<NamespacedMapping
             if (!mapping.hasComponent(Owned.class) || !mapping.hasComponent(Descriptor.Namespaced.class))
                 throw new UnsupportedOperationException();
             checkOwner(mapping.getOwned(), cls);
-            Descriptor.Namespaced desc = mapping.getComponent(Descriptor.Namespaced.class);
+            Descriptor.Namespaced desc = mapping.getComponent();
             if (!namespace0.equals(desc.descriptorNamespace)) throw new IllegalArgumentException("Descriptor namespace mismatch");
             return desc.descriptor;
         }