Code cleanup

Author: LexManos

LICENSE-header.txt

@@ -1,16 +1,2 @@
-Mapping Verifier
-Copyright (c) 2016-2020.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation version 2.1
-of the License.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Copyright (c) Forge Development LLC
+SPDX-License-Identifier: LGPL-2.1-only

src/main/java/net/minecraftforge/mappingverifier/AccessLevels.java

@@ -1,34 +1,23 @@
 /*
- * Mapping Verifier
- * Copyright (c) 2016-2020.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 package net.minecraftforge.mappingverifier;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.FieldInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TypeInsnNode;
 import net.minecraftforge.mappingverifier.InheratanceMap.Class;
 import net.minecraftforge.mappingverifier.InheratanceMap.Node;
@@ -43,26 +32,28 @@ protected AccessLevels(MappingVerifier verifier) {
     public boolean process() {
         InheratanceMap inh = verifier.getInheratance();
         IMappingFile map = verifier.getMappings();
-        return inh.getRead()
-        .sorted((o1, o2) -> o1.name.compareTo(o2.name))
-        .map(cls -> {
+
+        boolean success = true;
+        for (Class cls : inh.getOwned()) {
             Main.LOG.fine("  Processing: " + map.remapClass(cls.name));
             ClassNode node = inh.getNode(cls.name);
 
             if (node == null) {
                 error("  Missing node: " + cls.name);
-                return false; //Does this ever happen?
+                success = false;
+                continue; //Does this ever happen?
             }
 
             Set<String> warned = new HashSet<>();
 
             String newCls = map.remapClass(cls.name);
             String pkg = packageName(newCls);
-            boolean success = node.methods.stream().sequential()
-            .sorted((o1, o2) -> o1.name.equals(o2.name) ? o1.desc.compareTo(o2.desc) : o1.name.compareTo(o2.name))
-            .map(mt -> {
-                boolean inner_success = true;
 
+            List<MethodNode> methods = node.methods.stream().sequential()
+                .sorted((o1, o2) -> o1.name.equals(o2.name) ? o1.desc.compareTo(o2.desc) : o1.name.compareTo(o2.name))
+                .collect(Collectors.toList());
+
+            for (MethodNode mt : methods) {
                 for (AbstractInsnNode isn : mt.instructions.toArray()) {
                     if (isn instanceof FieldInsnNode) {
                         FieldInsnNode field = (FieldInsnNode)isn;
@@ -93,7 +84,7 @@ public boolean process() {
                         boolean isPackage = pkg.equals(packageName(newOwner));
                         boolean isSubclass = cls.getStack().contains(target.owner);
 
-                        inner_success &= canAccess(newCls, newOwner + "/" + newField, target.access, isPackage, isSubclass, isSelf, warned);
+                        success &= canAccess(newCls, newOwner + "/" + newField, target.access, isPackage, isSubclass, isSelf, warned);
                     } else if (isn instanceof MethodInsnNode) {
                         MethodInsnNode method = (MethodInsnNode)isn;
 
@@ -123,7 +114,7 @@ public boolean process() {
 
                         boolean isPackage = pkg.equals(packageName(newOwner));
                         boolean isSubclass = cls.getStack().contains(target.owner);
-                        inner_success &= canAccess(newCls, newOwner + "/" + newMethod + newDesc, target.access, isPackage, isSubclass, isSelf, warned);
+                        success &= canAccess(newCls, newOwner + "/" + newMethod + newDesc, target.access, isPackage, isSubclass, isSelf, warned);
                     } else if (isn instanceof TypeInsnNode) {
                         String obfed = ((TypeInsnNode)isn).desc;
                         boolean isSelf = obfed.equals(node.name);
@@ -138,15 +129,13 @@ public boolean process() {
                         String newOwner = map.remapClass(obfed);
                         boolean isPackage = pkg.equals(packageName(newOwner));
                         boolean isSubclass = cls.getStack().contains(inh.getClass(obfed));
-                        inner_success &= canAccess(newCls, newOwner, owner.getAccess(), isPackage, isSubclass, isSelf, warned);
+                        success &= canAccess(newCls, newOwner, owner.getAccess(), isPackage, isSubclass, isSelf, warned);
                     }
                 }
+            }
+        }
 
-                return inner_success;
-            }).reduce(true, (a,b) -> a && b);
-
-            return success;
-        }).reduce(true, (a,b) -> a && b);
+        return success;
     }
 
     private String packageName(String clsName) {

src/main/java/net/minecraftforge/mappingverifier/IVerifier.java

@@ -1,20 +1,6 @@
 /*
- * Mapping Verifier
- * Copyright (c) 2016-2020.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 package net.minecraftforge.mappingverifier;
 

src/main/java/net/minecraftforge/mappingverifier/InheratanceMap.java

@@ -1,20 +1,6 @@
 /*
- * Mapping Verifier
- * Copyright (c) 2016-2020.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 package net.minecraftforge.mappingverifier;
 
@@ -24,12 +10,15 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -58,17 +47,23 @@ public class InheratanceMap {
     private Map<String, ClassNode> nodes = new HashMap<>();
     private Map<String, Set<Method>> bouncers = new HashMap<>();
     private Map<String, Set<Method>> toResolveBouncers = new HashMap<>();
+    private Set<Class> owned = new TreeSet<>();
+    private Set<Class> ownedView = Collections.unmodifiableSet(owned);
 
-    public void processClass(InputStream data) throws IOException {
+    public void processClass(InputStream data, boolean owned) throws IOException {
         ClassNode node = new ClassNode();
         ClassReader reader = new ClassReader(data);
         reader.accept(node, 0);
 
         Class cls = getClass(node.name);
         cls.parent = getClass(node.superName);
         cls.wasRead = true;
+        cls.owned = owned;
         cls.access = node.access;
 
+        if (owned)
+            this.owned.add(cls);
+
         for (String intf : node.interfaces)
             cls.interfaces.add(getClass(intf));
 
@@ -107,7 +102,7 @@ public void processClass(InputStream data) throws IOException {
                 }
             }
         }
-        
+
         for (Method m : bouncers.getOrDefault(cls.name, new HashSet<>())) {
             addBouncer(cls, m);
         }
@@ -125,7 +120,7 @@ private void addBouncer(Class cls, Method m) {
                 return;
             }
         }
-        
+
         if (parent != null) {
             bouncers.computeIfAbsent(parent.name, (name) -> new HashSet<>()).add(m);
         }
@@ -151,6 +146,10 @@ public Stream<Class> getRead() {
         return classes.values().stream().filter(e -> e.wasRead);
     }
 
+    public Collection<Class> getOwned() {
+        return this.ownedView;
+    }
+
     public void resolve() {
         classes.values().stream().forEach(this::resolve);
     }
@@ -189,7 +188,7 @@ private void resolve(Class cls) {
                     }
                 }
             }
-            
+
             for (Method bounce : toResolveBouncers.getOrDefault(mtd.getKey(), new HashSet<>())) {
                 if (!mtd.overrides.isEmpty()) {
                     bounce.overrides.addAll(mtd.overrides);
@@ -222,15 +221,19 @@ private void resolve(Class cls) {
         cls.resolved = true;
     }
 
-    public static class Class {
+    public static class Class implements Comparable<Class> {
         private boolean resolved = false;
         private boolean wasRead = false;
+        private boolean owned = false;
         private int access = 0;
         private Class parent;
         public final String name;
-        public final Map<String, Field> fields = new HashMap<>();
-        public final Map<String, Method> methods = new HashMap<>();
-        public final List<Class> interfaces = new ArrayList<>();
+        private final Map<String, Field> fields = new TreeMap<>();
+        private final Map<String, Field> fieldsView = Collections.unmodifiableMap(fields);
+        private final Map<String, Method> methods = new TreeMap<>();
+        private final Map<String, Method> methodsView = Collections.unmodifiableMap(methods);
+        private final List<Class> interfaces = new ArrayList<>();
+        private final List<Class> interfacesView = Collections.unmodifiableList(interfaces);
         private List<Class> stack = null;
 
         public Class(String name) {
@@ -241,6 +244,10 @@ public boolean wasRead() {
             return wasRead;
         }
 
+        public boolean isOwned() {
+            return owned;
+        }
+
         public int getAccess() {
             return access;
         }
@@ -253,11 +260,28 @@ public Class getParent() {
             return parent;
         }
 
+        public Map<String, Field> getFields() {
+            return this.fieldsView;
+        }
+
+        public Map<String, Method> getMethods() {
+            return this.methodsView;
+        }
+
+        public Collection<Class> getInterfaces() {
+            return this.interfacesView;
+        }
+
         @Override
         public String toString() {
             return this.name + " [" + fields.size() + ", " + methods.size() + "]";
         }
 
+        @Override
+        public int hashCode() {
+            return this.name.hashCode();
+        }
+
         public Field getField(String name) {
             return fields.get(name);
         }
@@ -291,9 +315,15 @@ public List<Class> getStack() {
             }
             return stack;
         }
+
+        @Override
+        public int compareTo(Class o) {
+            if (o == null) return -1;
+            return this.name.compareTo(o.name);
+        }
     }
 
-    public static class Node {
+    public static class Node implements Comparable<Node> {
         public final Class owner;
         public final String name;
         public final String desc;
@@ -329,6 +359,16 @@ public int hashCode() {
         public String toString() {
             return Access.get(this.access).name() + " " + this.owner.name + "/" + this.name + this.desc;
         }
+
+        @Override
+        public int compareTo(Node o) {
+            if (o == null) return -1;
+            int ret = this.owner.compareTo(o.owner);
+            if (ret != 0) return ret;
+            ret = this.name.compareTo(o.name);
+            if (ret != 0) return ret;
+            return this.desc.compareTo(o.desc);
+        }
     }
 
     public static class Field extends Node {