From 85eb839db1eadf4e261decedb39ead3984a5e2f7 Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Thu, 30 Jul 2020 15:12:23 +0300
Subject: [PATCH] Make all custom functional interfaces to util.function

---
 src/main/java/net/fabricmc/loom/LoomGradleExtension.java      | 2 +-
 .../java/net/fabricmc/loom/providers/MinecraftProvider.java   | 4 ++--
 .../net/fabricmc/loom/util/{ => function}/FsPathConsumer.java | 2 +-
 .../net/fabricmc/loom/util/{ => function}/IoConsumer.java     | 2 +-
 .../java/net/fabricmc/loom/util/{ => function}/LazyBool.java  | 4 +++-
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename src/main/java/net/fabricmc/loom/util/{ => function}/FsPathConsumer.java (97%)
 rename src/main/java/net/fabricmc/loom/util/{ => function}/IoConsumer.java (97%)
 rename src/main/java/net/fabricmc/loom/util/{ => function}/LazyBool.java (89%)

diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
index 3fb9ee97..705a6d5e 100644
--- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
+++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java
@@ -54,7 +54,7 @@ import net.fabricmc.loom.providers.MinecraftMappedProvider;
 import net.fabricmc.loom.providers.MinecraftProvider;
 import net.fabricmc.loom.providers.PatchProvider;
 import net.fabricmc.loom.providers.McpConfigProvider;
-import net.fabricmc.loom.util.LazyBool;
+import net.fabricmc.loom.util.function.LazyBool;
 import net.fabricmc.loom.util.LoomDependencyManager;
 
 public class LoomGradleExtension {
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
index f6c7efa1..36621ba0 100644
--- a/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
+++ b/src/main/java/net/fabricmc/loom/providers/MinecraftProvider.java
@@ -62,8 +62,8 @@ import org.gradle.api.logging.Logger;
 import net.fabricmc.loom.util.Constants;
 import net.fabricmc.loom.util.DependencyProvider;
 import net.fabricmc.loom.util.DownloadUtil;
-import net.fabricmc.loom.util.FsPathConsumer;
-import net.fabricmc.loom.util.IoConsumer;
+import net.fabricmc.loom.util.function.FsPathConsumer;
+import net.fabricmc.loom.util.function.IoConsumer;
 import net.fabricmc.loom.util.ManifestVersion;
 import net.fabricmc.loom.util.MinecraftVersionInfo;
 import net.fabricmc.loom.util.StaticPathWatcher;
diff --git a/src/main/java/net/fabricmc/loom/util/FsPathConsumer.java b/src/main/java/net/fabricmc/loom/util/function/FsPathConsumer.java
similarity index 97%
rename from src/main/java/net/fabricmc/loom/util/FsPathConsumer.java
rename to src/main/java/net/fabricmc/loom/util/function/FsPathConsumer.java
index e9355e79..6c6f073a 100644
--- a/src/main/java/net/fabricmc/loom/util/FsPathConsumer.java
+++ b/src/main/java/net/fabricmc/loom/util/function/FsPathConsumer.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom.util;
+package net.fabricmc.loom.util.function;
 
 import java.io.IOException;
 import java.nio.file.FileSystem;
diff --git a/src/main/java/net/fabricmc/loom/util/IoConsumer.java b/src/main/java/net/fabricmc/loom/util/function/IoConsumer.java
similarity index 97%
rename from src/main/java/net/fabricmc/loom/util/IoConsumer.java
rename to src/main/java/net/fabricmc/loom/util/function/IoConsumer.java
index b47f751d..0974d95f 100644
--- a/src/main/java/net/fabricmc/loom/util/IoConsumer.java
+++ b/src/main/java/net/fabricmc/loom/util/function/IoConsumer.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package net.fabricmc.loom.util;
+package net.fabricmc.loom.util.function;
 
 import java.io.IOException;
 
diff --git a/src/main/java/net/fabricmc/loom/util/LazyBool.java b/src/main/java/net/fabricmc/loom/util/function/LazyBool.java
similarity index 89%
rename from src/main/java/net/fabricmc/loom/util/LazyBool.java
rename to src/main/java/net/fabricmc/loom/util/function/LazyBool.java
index e76622f7..a8ed0f16 100644
--- a/src/main/java/net/fabricmc/loom/util/LazyBool.java
+++ b/src/main/java/net/fabricmc/loom/util/function/LazyBool.java
@@ -1,10 +1,12 @@
-package net.fabricmc.loom.util;
+package net.fabricmc.loom.util.function;
 
 import java.util.Objects;
 import java.util.function.BooleanSupplier;
 
 /**
  * A lazily computed boolean value.
+ *
+ * @author Juuz
  */
 public final class LazyBool implements BooleanSupplier {
 	private BooleanSupplier supplier;