Add descriptor for field scheme inside ClassInfo

src/main/java/net/neoforged/art/api/ClassProvider.java

@@ -166,8 +166,20 @@ public interface IClassInfo {
          *
          * @param name the field name
          * @return the field, or an empty optional if it doesn't exist
+         * @deprecated Use with descriptor
+         * @see ClassProvider#getField(String, String)
          */
-        Optional<? extends IFieldInfo> getField(String name); //TODO: Desc?
+        @Deprecated
+        Optional<? extends IFieldInfo> getField(String name);
+
+        /**
+         * Queries a field based on its field name and descriptor.
+         *
+         * @param name the field name
+         * @param desc the field descriptor
+         * @return the field, or an empty optional if it doesn't exist
+         */
+        Optional<? extends IFieldInfo> getField(String name, String desc);
 
         /**
          * Returns all the methods declared in this class.

src/main/java/net/neoforged/art/internal/ClassProviderImpl.java

@@ -119,7 +119,7 @@ static class ClassInfo implements IClassInfo {
 
             if (!node.fields.isEmpty())
                 this.fields = Collections.unmodifiableMap(node.fields.stream().map(FieldInfo::new)
-                    .collect(Collectors.toMap(FieldInfo::getName, Function.identity())));
+                    .collect(Collectors.toMap(f -> f.getName() + f.getDescriptor(), Function.identity())));
             else
                 this.fields = null;
         }
@@ -179,9 +179,25 @@ public Collection<? extends IFieldInfo> getFields() {
             return fieldsView;
         }
 
+        @Deprecated
         @Override
         public Optional<? extends IFieldInfo> getField(String name) {
-            return fields == null ? Optional.empty() : Optional.ofNullable(this.fields.get(name));
+            if (this.fields != null) {
+                for (Map.Entry<String, FieldInfo> entry : this.fields.entrySet()) {
+                    if (entry.getKey().split(" ")[0].equals(name)) {
+                        // Backwards compatibility not possible when duplication
+                        // on field names, constructor was crashing without descriptor logic
+                        // Let it be any in this case
+                        return Optional.of(entry.getValue());
+                    }
+                }
+            }
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<? extends IFieldInfo> getField(String name, String desc) {
+            return this.fields == null ? Optional.empty() : Optional.ofNullable(this.fields.get(name + " " + desc));
         }
 
         @Override