From 168bf74f8b73a5645b5ca94e2cabb090579a7591 Mon Sep 17 00:00:00 2001 From: modmuss Date: Tue, 12 Mar 2024 09:25:33 +0000 Subject: [PATCH] Rename TransferVariant.componentsMatches -> componentsMatch (#3645) --- .../fabric/api/transfer/v1/storage/TransferVariant.java | 2 +- .../fabricmc/fabric/impl/transfer/fluid/FluidVariantImpl.java | 2 +- .../net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/TransferVariant.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/TransferVariant.java index 2ce9cd783..433de1051 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/TransferVariant.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/storage/TransferVariant.java @@ -59,7 +59,7 @@ public interface TransferVariant { * *

Note: True is returned if both tags are {@code null}. */ - default boolean componentsMatches(ComponentChanges other) { + default boolean componentsMatch(ComponentChanges other) { return Objects.equals(getComponents(), other); } diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/FluidVariantImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/FluidVariantImpl.java index 1366fa5f6..76e11276c 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/FluidVariantImpl.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/FluidVariantImpl.java @@ -99,7 +99,7 @@ public class FluidVariantImpl implements FluidVariant { FluidVariantImpl fluidVariant = (FluidVariantImpl) o; // fail fast with hash code - return hashCode == fluidVariant.hashCode && fluid == fluidVariant.fluid && componentsMatches(fluidVariant.components); + return hashCode == fluidVariant.hashCode && fluid == fluidVariant.fluid && componentsMatch(fluidVariant.components); } @Override diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java index e6ae72e0f..2ebc8e13b 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/ItemVariantImpl.java @@ -88,7 +88,7 @@ public class ItemVariantImpl implements ItemVariant { ItemVariantImpl ItemVariant = (ItemVariantImpl) o; // fail fast with hash code - return hashCode == ItemVariant.hashCode && item == ItemVariant.item && componentsMatches(ItemVariant.components); + return hashCode == ItemVariant.hashCode && item == ItemVariant.item && componentsMatch(ItemVariant.components); } @Override