Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove dependency on Java 1.7

Browse source
This commit is contained in:
asiekierka 2014-10-24 19:37:14 +02:00
parent 7f0f16ef62
commit 5cd1f38a4a
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
api/buildcraft/api/core/StackKey.java
View file

@ -8,8 +8,6 @@
*/ */
package buildcraft.api.core; package buildcraft.api.core;
import java.util.Objects;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -84,14 +82,14 @@ public final class StackKey {
if (stack != null) { if (stack != null) {
if (stack.getItem() != k.stack.getItem() || if (stack.getItem() != k.stack.getItem() ||
stack.getHasSubtypes() && stack.getItemDamage() != k.stack.getItemDamage() || stack.getHasSubtypes() && stack.getItemDamage() != k.stack.getItemDamage() ||
!Objects.equals(stack.getTagCompound(), k.stack.getTagCompound())) { !stack.getTagCompound().equals(k.stack.getTagCompound())) {
return false; return false;
} }
} }
if (fluidStack != null) { if (fluidStack != null) {
if (fluidStack.fluidID != k.fluidStack.fluidID || if (fluidStack.fluidID != k.fluidStack.fluidID ||
fluidStack.amount != k.fluidStack.amount || fluidStack.amount != k.fluidStack.amount ||
!Objects.equals(fluidStack.tag, k.fluidStack.tag)) { !fluidStack.tag.equals(k.fluidStack.tag)) {
return false; return false;
} }
} }
@ -104,13 +102,13 @@ public final class StackKey {
if (stack != null) { if (stack != null) {
result = 31 * result + stack.getItem().hashCode(); result = 31 * result + stack.getItem().hashCode();
result = 31 * result + stack.getItemDamage(); result = 31 * result + stack.getItemDamage();
result = 31 * result + Objects.hashCode(stack.getTagCompound()); result = 31 * result + stack.getTagCompound().hashCode();
} }
result = 31 * result + 7; result = 31 * result + 7;
if (fluidStack != null) { if (fluidStack != null) {
result = 31 * result + fluidStack.fluidID; result = 31 * result + fluidStack.fluidID;
result = 31 * result + fluidStack.amount; result = 31 * result + fluidStack.amount;
result = 31 * result + Objects.hashCode(fluidStack.tag); result = 31 * result + fluidStack.tag.hashCode();
} }
return result; return result;
} }