Checkstyle fixes to patchwork-fml

Author: coderbot16

patchwork-fml/src/main/java/net/minecraftforge/api/distmarker/Dist.java

@@ -29,14 +29,13 @@
  *     <li>{@link #CLIENT} is the <em>client</em> distribution, it contains
  *     the game client, and has code to render a viewport into a game world.</li>
  *     <li>{@link #DEDICATED_SERVER} is the <em>dedicated server</em> distribution,
- *     it contains a server, which can simulate the world and communicates via network.</li>
+ *     it contains a server, which can simulate the world and communicates via the network.</li>
  * </ul>
  */
 public enum Dist {
-
 	/**
 	 * The client distribution. This is the game client players can purchase and play.
-	 * It contains the graphics and other rendering to present a viewport into the game world.
+	 * It contains graphics and other rendering to present a viewport into the game world.
 	 */
 	CLIENT,
 	/**
@@ -55,14 +54,14 @@ public static Dist fromEnvType(EnvType type) {
 	}
 
 	/**
-	 * @return If this marks a dedicated server.
+	 * @return {@code true} if this marks a dedicated server.
 	 */
 	public boolean isDedicatedServer() {
 		return !isClient();
 	}
 
 	/**
-	 * @return if this marks a client.
+	 * @return {@code true} if this marks a client.
 	 */
 	public boolean isClient() {
 		return this == CLIENT;

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

@@ -19,24 +19,25 @@
 
 package net.minecraftforge.fml;
 
-import net.fabricmc.loader.api.FabricLoader;
+import java.util.concurrent.Callable;
+import java.util.function.Supplier;
+
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 
-import java.util.concurrent.Callable;
-import java.util.function.Supplier;
+import net.fabricmc.loader.api.FabricLoader;
 
 public final class DistExecutor {
 	private DistExecutor() {
 	}
 
 	/**
-	 * Run the callable in the supplier only on the specified {@link Dist}
+	 * Run the callable in the supplier only on the specified {@link Dist}.
 	 *
-	 * @param dist  The dist to run on
-	 * @param toRun A supplier of the callable to run (Supplier wrapper to ensure classloading only on the appropriate dist)
-	 * @param <T>   The return type from the callable
-	 * @return The callable's result
+	 * @param dist  The {@link Dist} to run on
+	 * @param toRun A {@link Supplier} of the {@link Callable} to run ({@link Supplier} wrapper to ensure classloading only on the appropriate dist)
+	 * @param <T>   The return type from the {@link Callable}
+	 * @return The {@link Callable}'s result
 	 */
 	public static <T> T callWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
 		if (dist == FMLEnvironment.dist) {
@@ -46,6 +47,7 @@ public static <T> T callWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
 				throw new RuntimeException(e);
 			}
 		}
+
 		return null;
 	}
 
@@ -57,12 +59,12 @@ public static void runWhenOn(Dist dist, Supplier<Runnable> toRun) {
 
 	public static <T> T runForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
 		switch (FabricLoader.getInstance().getEnvironmentType()) {
-			case CLIENT:
-				return clientTarget.get().get();
-			case SERVER:
-				return serverTarget.get().get();
-			default:
-				throw new IllegalArgumentException("UNSIDED?");
+		case CLIENT:
+			return clientTarget.get().get();
+		case SERVER:
+			return serverTarget.get().get();
+		default:
+			throw new IllegalArgumentException("UNSIDED?");
 		}
 	}
 }

patchwork-fml/src/main/java/net/minecraftforge/fml/loading/FMLEnvironment.java

@@ -19,9 +19,10 @@
 
 package net.minecraftforge.fml.loading;
 
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraftforge.api.distmarker.Dist;
 
+import net.fabricmc.loader.api.FabricLoader;
+
 public class FMLEnvironment {
 	public static final Dist dist = Dist.fromEnvType(FabricLoader.getInstance().getEnvironmentType());
 

patchwork-fml/src/main/java/net/minecraftforge/fml/loading/FMLPaths.java

@@ -19,18 +19,18 @@
 
 package net.minecraftforge.fml.loading;
 
-import net.fabricmc.loader.api.FabricLoader;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 
-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-public enum FMLPaths
-{
+import net.fabricmc.loader.api.FabricLoader;
+
+public enum FMLPaths {
 	GAMEDIR(),
 	MODSDIR("mods"),
 	CONFIGDIR("config"),
@@ -55,21 +55,20 @@ public enum FMLPaths
 		this.isDirectory = isDir;
 	}
 
-	private Path computePath(String... path)
-	{
-		return Paths.get(path[0], Arrays.copyOfRange(path, 1, path.length));
-	}
-
-	// TODO: Implementation Detail: public static void setup(IEnvironment env)
-
 	public static void loadAbsolutePaths(Path rootPath) {
 		throw new UnsupportedOperationException("Implementation detail");
 	}
 
+	// TODO: Implementation Detail: public static void setup(IEnvironment env)
+
 	public static Path getOrCreateGameRelativePath(Path path, String name) {
 		return FileUtils.getOrCreateDirectory(FMLPaths.GAMEDIR.get().resolve(path), name);
 	}
 
+	private Path computePath(String... path) {
+		return Paths.get(path[0], Arrays.copyOfRange(path, 1, path.length));
+	}
+
 	public Path relative() {
 		return relativePath;
 	}
@@ -84,7 +83,7 @@ public Path get() {
 				FileUtils.getOrCreateDirectory(absolutePath, name());
 			}
 
-			LOGGER.debug(CORE,"Path {} is {}", this, absolutePath);
+			LOGGER.debug(CORE, "Path {} is {}", this, absolutePath);
 		}
 
 		return absolutePath;

patchwork-fml/src/main/java/net/minecraftforge/fml/loading/FileUtils.java

@@ -19,50 +19,53 @@
 
 package net.minecraftforge.fml.loading;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import static net.minecraftforge.fml.loading.LogMarkers.CORE;
 
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static net.minecraftforge.fml.loading.LogMarkers.CORE;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-public class FileUtils
-{
+public class FileUtils {
 	private static final Logger LOGGER = LogManager.getLogger();
 
 	public static Path getOrCreateDirectory(Path dirPath, String dirLabel) {
 		if (!Files.isDirectory(dirPath.getParent())) {
-			getOrCreateDirectory(dirPath.getParent(), "parent of "+dirLabel);
+			getOrCreateDirectory(dirPath.getParent(), "parent of " + dirLabel);
 		}
-		if (!Files.isDirectory(dirPath))
-		{
-			LOGGER.debug(CORE,"Making {} directory : {}", dirLabel, dirPath);
+
+		if (!Files.isDirectory(dirPath)) {
+			LOGGER.debug(CORE, "Making {} directory : {}", dirLabel, dirPath);
+
 			try {
 				Files.createDirectory(dirPath);
 			} catch (IOException e) {
 				if (e instanceof FileAlreadyExistsException) {
-					LOGGER.fatal(CORE,"Failed to create {} directory - there is a file in the way", dirLabel);
+					LOGGER.fatal(CORE, "Failed to create {} directory - there is a file in the way", dirLabel);
 				} else {
-					LOGGER.fatal(CORE,"Problem with creating {} directory (Permissions?)", dirLabel, e);
+					LOGGER.fatal(CORE, "Problem with creating {} directory (Permissions?)", dirLabel, e);
 				}
+
 				throw new RuntimeException("Problem creating directory", e);
 			}
-			LOGGER.debug(CORE,"Created {} directory : {}", dirLabel, dirPath);
+
+			LOGGER.debug(CORE, "Created {} directory : {}", dirLabel, dirPath);
 		} else {
-			LOGGER.debug(CORE,"Found existing {} directory : {}", dirLabel, dirPath);
+			LOGGER.debug(CORE, "Found existing {} directory : {}", dirLabel, dirPath);
 		}
+
 		return dirPath;
 	}
 
-
 	public static String fileExtension(final Path path) {
 		String fileName = path.getFileName().toString();
 		int idx = fileName.lastIndexOf('.');
+
 		if (idx > -1) {
-			return fileName.substring(idx+1);
+			return fileName.substring(idx + 1);
 		} else {
 			return "";
 		}