From a561f4c41c57d4dfbdb946ea18c2848dc702bb87 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Fri, 23 Dec 2016 15:23:31 -0800 Subject: [PATCH] Fix #3561 import io.IOUtils instead of compress.utils.IOUtils (#3562) --- .../java/net/minecraftforge/common/config/Configuration.java | 2 +- .../java/net/minecraftforge/fml/client/FMLClientHandler.java | 2 +- .../java/net/minecraftforge/fml/common/FMLModContainer.java | 2 +- src/main/java/net/minecraftforge/fml/common/Loader.java | 2 +- .../net/minecraftforge/fml/common/asm/FMLSanityChecker.java | 2 +- .../fml/common/asm/transformers/AccessTransformer.java | 2 +- .../fml/common/asm/transformers/MarkerTransformer.java | 2 +- .../fml/common/discovery/DirectoryDiscoverer.java | 2 +- .../net/minecraftforge/fml/common/discovery/JarDiscoverer.java | 2 +- .../java/net/minecraftforge/fml/common/patcher/GenDiffSet.java | 2 +- .../java/net/minecraftforge/fml/relauncher/CoreModManager.java | 2 +- .../fml/repackage/com/nothome/delta/GDiffPatcher.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/config/Configuration.java b/src/main/java/net/minecraftforge/common/config/Configuration.java index dc68d66024..56ba1022a6 100644 --- a/src/main/java/net/minecraftforge/common/config/Configuration.java +++ b/src/main/java/net/minecraftforge/common/config/Configuration.java @@ -62,7 +62,7 @@ import net.minecraftforge.fml.client.config.IConfigElement; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.FMLInjectionData; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; /** * This class offers advanced configurations capabilities, allowing to provide diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index 5791429d1c..fda26ded99 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -108,7 +108,7 @@ import net.minecraftforge.fml.common.registry.PersistentRegistryManager; import net.minecraftforge.fml.common.toposort.ModSortingException; import net.minecraftforge.fml.relauncher.Side; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java b/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java index 92a809e627..a42f8b5e11 100644 --- a/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java +++ b/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java @@ -54,7 +54,7 @@ import net.minecraftforge.fml.common.versioning.VersionParser; import net.minecraftforge.fml.common.versioning.VersionRange; import net.minecraftforge.fml.relauncher.Side; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Level; diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java index 8b482a67c1..32fbff04f5 100644 --- a/src/main/java/net/minecraftforge/fml/common/Loader.java +++ b/src/main/java/net/minecraftforge/fml/common/Loader.java @@ -60,7 +60,7 @@ import net.minecraftforge.fml.common.versioning.VersionParser; import net.minecraftforge.fml.relauncher.ModListHelper; import net.minecraftforge.fml.relauncher.Side; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import com.google.common.base.CharMatcher; diff --git a/src/main/java/net/minecraftforge/fml/common/asm/FMLSanityChecker.java b/src/main/java/net/minecraftforge/fml/common/asm/FMLSanityChecker.java index a461fa4fe3..4464f7d7b9 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/FMLSanityChecker.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/FMLSanityChecker.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import net.minecraft.launchwrapper.LaunchClassLoader; diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java index aa048b03fd..3e7e69175b 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java @@ -45,7 +45,7 @@ import java.util.zip.ZipOutputStream; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraftforge.fml.relauncher.FMLRelaunchLog; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.AbstractInsnNode; diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/MarkerTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/MarkerTransformer.java index 7be0c748f4..91a4951013 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/MarkerTransformer.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/MarkerTransformer.java @@ -35,7 +35,7 @@ import java.util.zip.ZipOutputStream; import net.minecraft.launchwrapper.IClassTransformer; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java b/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java index 3848717bd6..77fde78dae 100644 --- a/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java +++ b/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java @@ -33,7 +33,7 @@ import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.ModContainerFactory; import net.minecraftforge.fml.common.discovery.asm.ASMModParser; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import com.google.common.base.Throwables; diff --git a/src/main/java/net/minecraftforge/fml/common/discovery/JarDiscoverer.java b/src/main/java/net/minecraftforge/fml/common/discovery/JarDiscoverer.java index 816cc1ffca..396198e6d2 100644 --- a/src/main/java/net/minecraftforge/fml/common/discovery/JarDiscoverer.java +++ b/src/main/java/net/minecraftforge/fml/common/discovery/JarDiscoverer.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.ModContainerFactory; import net.minecraftforge.fml.common.discovery.asm.ASMModParser; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import java.util.regex.Matcher; diff --git a/src/main/java/net/minecraftforge/fml/common/patcher/GenDiffSet.java b/src/main/java/net/minecraftforge/fml/common/patcher/GenDiffSet.java index 2a9b1075b0..b104a5aeef 100644 --- a/src/main/java/net/minecraftforge/fml/common/patcher/GenDiffSet.java +++ b/src/main/java/net/minecraftforge/fml/common/patcher/GenDiffSet.java @@ -31,7 +31,7 @@ import java.util.jar.JarFile; import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; import net.minecraftforge.fml.repackage.com.nothome.delta.Delta; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java b/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java index cdfb7e03ea..0914cd1183 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java @@ -56,7 +56,7 @@ import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.Name; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.SortingIndex; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import com.google.common.base.Strings; diff --git a/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffPatcher.java b/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffPatcher.java index 6b40f8038d..a27316f5b8 100644 --- a/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffPatcher.java +++ b/src/main/java/net/minecraftforge/fml/repackage/com/nothome/delta/GDiffPatcher.java @@ -19,7 +19,7 @@ package net.minecraftforge.fml.repackage.com.nothome.delta; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_INT; import static net.minecraftforge.fml.repackage.com.nothome.delta.GDiffWriter.COPY_INT_UBYTE;