keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix IOUtils import error caused by server/client libraries desync.

Browse source
This commit is contained in:
LexManos 2017-08-09 12:28:34 -07:00
parent c6d0c93a50
commit 9ec954a3de
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
View file

@ -19,6 +19,7 @@
package net.minecraftforge.fml.relauncher; package net.minecraftforge.fml.relauncher;
import java.io.Closeable;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -42,8 +43,6 @@ import java.util.jar.Attributes;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import org.apache.commons.compress.utils.IOUtils;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import com.google.common.io.Files; import com.google.common.io.Files;
import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.ITweaker;
@ -402,7 +401,7 @@ public class CoreModManager {
} }
finally finally
{ {
IOUtils.closeQuietly(jar); closeQuietly(jar);
} }
// Support things that are mod jars, but not FML mod jars // Support things that are mod jars, but not FML mod jars
try try
@ -457,7 +456,7 @@ public class CoreModManager {
} }
finally finally
{ {
IOUtils.closeQuietly(jar); closeQuietly(jar);
} }
} }
} }
@ -788,4 +787,11 @@ public class CoreModManager {
} }
} }
private static void closeQuietly(Closeable closeable) {
try {
if (closeable != null)
closeable.close();
} catch (final IOException ioe){}
}
} }