Skip to content

Commit 71a9559

Browse files
committed
fixed warning in merge jars task
1 parent 94e8d71 commit 71a9559

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/main/java/net/minecraftforge/gradle/tasks/MergeJars.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.minecraftforge.gradle.tasks;
22

3-
import groovy.lang.Closure;
4-
53
import java.io.BufferedOutputStream;
64
import java.io.File;
75
import java.io.FileNotFoundException;
@@ -19,11 +17,6 @@
1917
import java.util.zip.ZipFile;
2018
import java.util.zip.ZipOutputStream;
2119

22-
import net.minecraftforge.fml.relauncher.Side;
23-
import net.minecraftforge.fml.relauncher.SideOnly;
24-
import net.minecraftforge.gradle.util.caching.Cached;
25-
import net.minecraftforge.gradle.util.caching.CachedTask;
26-
2720
import org.gradle.api.tasks.InputFile;
2821
import org.gradle.api.tasks.OutputFile;
2922
import org.gradle.api.tasks.TaskAction;
@@ -36,11 +29,18 @@
3629
import org.objectweb.asm.tree.MethodNode;
3730

3831
import com.google.common.base.Function;
32+
import com.google.common.base.MoreObjects;
3933
import com.google.common.base.Objects;
4034
import com.google.common.collect.Lists;
4135
import com.google.common.collect.Sets;
4236
import com.google.common.io.ByteStreams;
4337

38+
import groovy.lang.Closure;
39+
import net.minecraftforge.fml.relauncher.Side;
40+
import net.minecraftforge.fml.relauncher.SideOnly;
41+
import net.minecraftforge.gradle.util.caching.Cached;
42+
import net.minecraftforge.gradle.util.caching.CachedTask;
43+
4444
public class MergeJars extends CachedTask
4545
{
4646
@InputFile
@@ -548,7 +548,7 @@ public int hashCode()
548548
@Override
549549
public String toString()
550550
{
551-
return Objects.toStringHelper(this).add("name", node.name).add("desc", node.desc).add("server", server).add("client", client).toString();
551+
return MoreObjects.toStringHelper(this).add("name", node.name).add("desc", node.desc).add("server", server).add("client", client).toString();
552552
}
553553
}
554554

0 commit comments

Comments
 (0)