From 23a2316157117499c4c65220982eb0906738c396 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Wed, 30 Dec 2015 16:14:27 +0300 Subject: [PATCH] Fixed wrong import. --- .../net/minecraftforge/client/model/obj/OBJModel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java index c11676bae..564e15f34 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java +++ b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java @@ -11,7 +11,6 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; @@ -54,6 +53,7 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Charsets; import com.google.common.base.Function; +import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -1244,7 +1244,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData @Override public int hashCode() { - return Objects.hash(visibilityMap, parent, operation); + return Objects.hashCode(visibilityMap, parent, operation); } @Override @@ -1257,8 +1257,8 @@ public class OBJModel implements IRetexturableModel, IModelCustomData if (getClass() != obj.getClass()) return false; OBJState other = (OBJState) obj; - return Objects.equals(visibilityMap, other.visibilityMap) && - Objects.equals(parent, other.parent) && + return Objects.equal(visibilityMap, other.visibilityMap) && + Objects.equal(parent, other.parent) && operation == other.operation; }