diff --git a/docs/README.md b/docs/README.md index f3cc8f0b35..f4d4c2fcb1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -73,4 +73,4 @@ Please ensure you have a valid email address associated with your GitHub account [ForgeDev]: https://docs.minecraftforge.net/en/latest/forgedev/ [Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests -[Patreon]: https://www.patreon.com/MinecraftForge +[Patreon]: https://www.patreon.com/LexManos diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/BackgroundScanHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/BackgroundScanHandler.java index 494c56bb5e..21f03ae4f1 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/BackgroundScanHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/BackgroundScanHandler.java @@ -9,13 +9,11 @@ import com.mojang.logging.LogUtils; import net.minecraftforge.fml.loading.ImmediateWindowHandler; import net.minecraftforge.fml.loading.LoadingModList; import net.minecraftforge.fml.loading.LogMarkers; -import net.minecraftforge.fml.loading.progress.StartupNotificationManager; import net.minecraftforge.forgespi.language.ModFileScanData; import org.slf4j.Logger; import java.time.Duration; import java.time.Instant; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.*; @@ -32,9 +30,6 @@ public class BackgroundScanHandler private static final Logger LOGGER = LogUtils.getLogger(); private final ExecutorService modContentScanner; - private final List pendingFiles; - private final List scannedFiles; - private final List allFiles; private final List modFiles; private ScanStatus status; private LoadingModList loadingModList; @@ -46,9 +41,6 @@ public class BackgroundScanHandler thread.setDaemon(true); return thread; }); - scannedFiles = new ArrayList<>(); - pendingFiles = new ArrayList<>(); - allFiles = new ArrayList<>(); status = ScanStatus.NOT_STARTED; } @@ -63,8 +55,6 @@ public class BackgroundScanHandler } status = ScanStatus.RUNNING; ImmediateWindowHandler.updateProgress("Scanning mod candidates"); - allFiles.add(file); - pendingFiles.add(file); final CompletableFuture future = CompletableFuture.supplyAsync(file::compileContent, modContentScanner) .whenComplete(file::setScanResult) .whenComplete((r,t)-> this.addCompletedFile(file,r,t)); @@ -76,8 +66,6 @@ public class BackgroundScanHandler status = ScanStatus.ERRORED; LOGGER.error(LogMarkers.SCAN,"An error occurred scanning file {}", file, throwable); } - pendingFiles.remove(file); - scannedFiles.add(file); } public void setLoadingModList(LoadingModList loadingModList) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java index 8d2827ccf7..d96bb1dc08 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java @@ -15,58 +15,49 @@ import org.objectweb.asm.Type; import java.lang.annotation.ElementType; import java.util.LinkedList; -import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -public class ModClassVisitor extends ClassVisitor -{ +public class ModClassVisitor extends ClassVisitor { private Type asmType; private Type asmSuperType; private Set interfaces; private final LinkedList annotations = new LinkedList<>(); - public ModClassVisitor() - { + + public ModClassVisitor() { super(Opcodes.ASM9); } - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) - { + public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { this.asmType = Type.getObjectType(name); - this.asmSuperType = superName != null && superName.length() > 0 ? Type.getObjectType(superName) : null; + this.asmSuperType = superName != null && !superName.isEmpty() ? Type.getObjectType(superName) : null; this.interfaces = Stream.of(interfaces).map(Type::getObjectType).collect(Collectors.toSet()); } @Override - public AnnotationVisitor visitAnnotation(final String annotationName, final boolean runtimeVisible) - { + public AnnotationVisitor visitAnnotation(final String annotationName, final boolean runtimeVisible) { ModAnnotation ann = new ModAnnotation(ElementType.TYPE, Type.getType(annotationName), this.asmType.getClassName()); annotations.addFirst(ann); return new ModAnnotationVisitor(annotations, ann); } - @Override - public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) - { + public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { return new ModFieldVisitor(name, annotations); } @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) - { + public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { return new ModMethodVisitor(name, desc, annotations); } - public void buildData(final Set classes, final Set annotations) { + public void buildData(final Set classes, final Set baked) { classes.add(new ModFileScanData.ClassData(this.asmType, this.asmSuperType, this.interfaces)); - final List collect = this.annotations.stream(). - filter(ma->ModFileScanData.interestingAnnotations().test(ma.getASMType())). - map(a -> ModAnnotation.fromModAnnotation(this.asmType, a)).collect(Collectors.toList()); - annotations.addAll(collect); + for (var a : this.annotations) { + //if (ModFileScanData.interestingAnnotations().test(a.getASMType())) // Always true, so who cares. Left as a note to remove this in SPI later. + baked.add(ModAnnotation.fromModAnnotation(this.asmType, a)); + } } - }