|
1 | 1 | package net.minecraftforge.gradle.tasks; |
2 | 2 |
|
3 | | -import groovy.lang.Closure; |
4 | | - |
5 | 3 | import java.io.BufferedOutputStream; |
6 | 4 | import java.io.File; |
7 | 5 | import java.io.FileNotFoundException; |
|
19 | 17 | import java.util.zip.ZipFile; |
20 | 18 | import java.util.zip.ZipOutputStream; |
21 | 19 |
|
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 | | - |
27 | 20 | import org.gradle.api.tasks.InputFile; |
28 | 21 | import org.gradle.api.tasks.OutputFile; |
29 | 22 | import org.gradle.api.tasks.TaskAction; |
|
36 | 29 | import org.objectweb.asm.tree.MethodNode; |
37 | 30 |
|
38 | 31 | import com.google.common.base.Function; |
| 32 | +import com.google.common.base.MoreObjects; |
39 | 33 | import com.google.common.base.Objects; |
40 | 34 | import com.google.common.collect.Lists; |
41 | 35 | import com.google.common.collect.Sets; |
42 | 36 | import com.google.common.io.ByteStreams; |
43 | 37 |
|
| 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 | + |
44 | 44 | public class MergeJars extends CachedTask |
45 | 45 | { |
46 | 46 | @InputFile |
@@ -548,7 +548,7 @@ public int hashCode() |
548 | 548 | @Override |
549 | 549 | public String toString() |
550 | 550 | { |
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(); |
552 | 552 | } |
553 | 553 | } |
554 | 554 |
|
|
0 commit comments