reviews

Author: TheGlitch76

patchwork-events-lifecycle/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLFingerprintViolationEvent.java

@@ -31,14 +31,18 @@
  * <p>TODO: Patchwork will never fire this event. All jars that pass through patchwork are modified sweepingly.</p>
  */
 public class FMLFingerprintViolationEvent extends ModLifecycleEvent {
-	private boolean isDirectory;
-	private Set<String> fingerprints;
-	private File source;
-	private String expectedFingerprint;
+	private final boolean isDirectory;
+	private final Set<String> fingerprints;
+	private final File source;
+	private final String expectedFingerprint;
 
 	// For EventBus
 	public FMLFingerprintViolationEvent() {
 		super();
+		this.isDirectory = false;
+		this.fingerprints = null;
+		this.source = null;
+		this.expectedFingerprint = null;
 	}
 
 	public FMLFingerprintViolationEvent(boolean isDirectory, File source, ImmutableSet<String> fingerprints, String expectedFingerprint) {

patchwork-events-lifecycle/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java

@@ -24,13 +24,13 @@
 /**
  * This is the third of four commonly called events during mod lifecycle startup.
  *
- * <p>Called before {@link InterModProcessEvent}
+ * <p>Called before {@link InterModProcessEvent}</p>
  *
- * <p></p>Called after {@link FMLClientSetupEvent} or {@link FMLDedicatedServerSetupEvent}
+ * <p>Called after {@link FMLClientSetupEvent} or {@link FMLDedicatedServerSetupEvent}</p>
  *
- * <p>Enqueue {@link net.minecraftforge.fml.InterModComms} messages to other mods with this event.
+ * <p>Enqueue {@link net.minecraftforge.fml.InterModComms} messages to other mods with this event.</p>
  *
- * <p>This is a parallel dispatch event.
+ * <p>This is a parallel dispatch event.</p>
  */
 public class InterModEnqueueEvent extends ModLifecycleEvent {
 	// For EventBus

patchwork-events-lifecycle/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java

@@ -26,12 +26,12 @@
 /**
  * This is the fourth of four commonly called events during mod lifecycle startup.
  *
- * <p>Called after {@link InterModEnqueueEvent}
+ * <p>Called after {@link InterModEnqueueEvent}</p>
  *
  * <p>Retrieve {@link net.minecraftforge.fml.InterModComms} {@link net.minecraftforge.fml.InterModComms.IMCMessage} suppliers
- * and process them as you wish with this event.
+ * and process them as you wish with this event.</p>
  *
- * <p>This is a parallel dispatch event.
+ * <p>This is a parallel dispatch event.</p>
  *
  * @see #getIMCStream()
  * @see #getIMCStream(Predicate)

patchwork-fml/src/main/java/net/minecraftforge/fml/InterModComms.java

@@ -163,26 +163,24 @@ public long estimateSize() {
 
 		@Override
 		public boolean tryAdvance(final Consumer<? super IMCMessage> action) {
-			IMCMessage next;
+			if (!iterator.hasNext()) {
+				return false;
+			}
 
-			do {
-				if (!iterator.hasNext()) {
-					return false;
-				}
+			IMCMessage next = iterator.next();
 
-				next = this.iterator.next();
+			while (iterator.hasNext() && !methodFilter.test(next.method)) {
+				next = iterator.next();
 			}
 
-			while (!methodFilter.test(next.method));
-
 			action.accept(next);
 			this.iterator.remove();
 			return true;
 		}
 
 		@Override
 		public Spliterator<IMCMessage> trySplit() {
-			return null;
+			throw new UnsupportedOperationException("forge behavior is return null, report this to Patchwork!");
 		}
 	}
 }

patchwork-fml/src/main/java/net/minecraftforge/fml/ModList.java

@@ -22,14 +22,15 @@
 import net.fabricmc.loader.FabricLoader;
 
 public class ModList {
-	//Patchwork: initalize directly because there's no args
+	// Patchwork: initalize directly because there's no args
 	private static ModList INSTANCE = new ModList();
 
 	public static ModList get() {
 		return INSTANCE;
 	}
 
 	public boolean isLoaded(String modId) {
+		// Patchwork: use Fabric Loader lookup instead of an internal one
 		return FabricLoader.INSTANCE.isModLoaded(modId);
 	}
 }