use fabric api lookup for ModList + checkstyle fixes

Author: TheGlitch76

patchwork-dispatcher/src/main/java/com/patchworkmc/impl/Patchwork.java

@@ -28,7 +28,6 @@
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.ModContainer;
-import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
@@ -118,10 +117,7 @@ public void onInitialize() {
 			modIds.add(initializer.getModId());
 		}
 
-		// Init ModList
-		ModList.create(modIds);
 		// Send initialization events
-
 		dispatchRegistryEvents(mods);
 		// TODO: One per modcontainer
 		dispatch(mods, new FMLCommonSetupEvent(new ModContainer("minecraft")));

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.
  *
- * Called before {@link InterModProcessEvent}
- * Called after {@link FMLClientSetupEvent} or {@link FMLDedicatedServerSetupEvent}
+ * <p>Called before {@link InterModProcessEvent}
  *
+ * <p></p>Called after {@link FMLClientSetupEvent} or {@link FMLDedicatedServerSetupEvent}
  *
- * 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.
  *
- * This is a parallel dispatch event.
+ * <p>This is a parallel dispatch event.
  */
 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.
  *
- * Called after {@link InterModEnqueueEvent}
+ * <p>Called after {@link InterModEnqueueEvent}
  *
- * Retrieve {@link net.minecraftforge.fml.InterModComms} {@link net.minecraftforge.fml.InterModComms.IMCMessage} suppliers
+ * <p>Retrieve {@link net.minecraftforge.fml.InterModComms} {@link net.minecraftforge.fml.InterModComms.IMCMessage} suppliers
  * and process them as you wish with this event.
  *
- * This is a parallel dispatch event.
+ * <p>This is a parallel dispatch event.
  *
  * @see #getIMCStream()
  * @see #getIMCStream(Predicate)

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

@@ -48,21 +48,21 @@ public static final class IMCMessage {
 		 * @return The modid of the sender. This is supplied by the caller, or by the active mod container context.
 		 * Consider it unreliable.
 		 */
-		public final String getSenderModId() {
+		public String getSenderModId() {
 			return this.senderModId;
 		}
 
 		/**
 		 * @return The modid being sent to.
 		 */
-		public final String getModId() {
+		public String getModId() {
 			return this.modId;
 		}
 
 		/**
 		 * @return The method being sent to.
 		 */
-		public final String getMethod() {
+		public String getMethod() {
 			return this.method;
 		}
 
@@ -71,7 +71,7 @@ public final String getMethod() {
 		 * @return A {@link Supplier} of the message.
 		 */
 		@SuppressWarnings("unchecked")
-		public final <T> Supplier<T> getMessageSupplier() {
+		public <T> Supplier<T> getMessageSupplier() {
 			return (Supplier<T>) this.thing;
 		}
 	}
@@ -90,6 +90,7 @@ public static boolean sendTo(final String modId, final String method, final Supp
 		if (!ModList.get().isLoaded(modId)) {
 			return false;
 		}
+
 		containerQueues.computeIfAbsent(modId, k -> new ConcurrentLinkedQueue<>()).add(new IMCMessage(ModLoadingContext.get().getActiveContainer().getModId(), modId, method, thing));
 		return true;
 	}
@@ -107,6 +108,7 @@ public static boolean sendTo(final String senderModId, final String modId, final
 		if (!ModList.get().isLoaded(modId)) {
 			return false;
 		}
+
 		containerQueues.computeIfAbsent(modId, k -> new ConcurrentLinkedQueue<>()).add(new IMCMessage(senderModId, modId, method, thing));
 		return true;
 	}
@@ -120,9 +122,11 @@ public static boolean sendTo(final String senderModId, final String modId, final
 	 */
 	public static Stream<IMCMessage> getMessages(final String modId, final Predicate<String> methodMatcher) {
 		ConcurrentLinkedQueue<IMCMessage> queue = containerQueues.get(modId);
+
 		if (queue == null) {
 			return Stream.empty();
 		}
+
 		return StreamSupport.stream(new QueueFilteringSpliterator(queue, methodMatcher), false);
 	}
 
@@ -141,7 +145,7 @@ private static class QueueFilteringSpliterator implements Spliterator<IMCMessage
 		private final Predicate<String> methodFilter;
 		private final Iterator<IMCMessage> iterator;
 
-		public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
+		private QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
 			this.queue = queue;
 			this.iterator = queue.iterator();
 			this.methodFilter = methodFilter;
@@ -160,13 +164,17 @@ public long estimateSize() {
 		@Override
 		public boolean tryAdvance(final Consumer<? super IMCMessage> action) {
 			IMCMessage next;
+
 			do {
 				if (!iterator.hasNext()) {
 					return false;
 				}
+
 				next = this.iterator.next();
 			}
+
 			while (!methodFilter.test(next.method));
+
 			action.accept(next);
 			this.iterator.remove();
 			return true;
@@ -176,6 +184,5 @@ public boolean tryAdvance(final Consumer<? super IMCMessage> action) {
 		public Spliterator<IMCMessage> trySplit() {
 			return null;
 		}
-
 	}
 }

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

@@ -19,29 +19,17 @@
 
 package net.minecraftforge.fml;
 
-import java.util.List;
+import net.fabricmc.loader.FabricLoader;
 
 public class ModList {
-	private static ModList INSTANCE;
-	private List<String> mods;
-
-	//Patchwork: signature changed to just have a list of modids
-	private ModList(List<String> mods) {
-		this.mods = mods;
-	}
+	//Patchwork: initalize directly because there's no args
+	private static ModList INSTANCE = new ModList();
 
 	public static ModList get() {
 		return INSTANCE;
 	}
 
-	//Patchwork: method does not exist in Forge
-	public static ModList create(List<String> mods) {
-		INSTANCE = new ModList(mods);
-		return INSTANCE;
-	}
-
 	public boolean isLoaded(String modId) {
-		return this.mods.contains(modId);
+		return FabricLoader.INSTANCE.isModLoaded(modId);
 	}
-
 }