From 1ff0e6032aebeeefe38e717f48ced0bcd3b3030f Mon Sep 17 00:00:00 2001 From: Namikon Date: Tue, 24 May 2016 12:53:36 +0200 Subject: [PATCH] Version .64: ItemDescriptor now checks if the given Item .fromString(String) is valid. Will return null as intended if it is not ItemDescriptor is not able to compare itself to another instance of itself, providing a better solution than .equals() --- build.gradle | 2 +- .../yamcore/auxiliary/ItemDescriptor.java | 51 ++++++++++++++++++- .../enums/ItemEqualsCompareMethodEnum.java | 8 +++ 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 src/main/java/eu/usrv/yamcore/auxiliary/enums/ItemEqualsCompareMethodEnum.java diff --git a/build.gradle b/build.gradle index bd04969..64a7224 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-0.5.63" +version = "1.7.10-0.5.64" group= "eu.usrv.YAMCore" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "YAMCore" diff --git a/src/main/java/eu/usrv/yamcore/auxiliary/ItemDescriptor.java b/src/main/java/eu/usrv/yamcore/auxiliary/ItemDescriptor.java index 87c8e53..7c6de32 100644 --- a/src/main/java/eu/usrv/yamcore/auxiliary/ItemDescriptor.java +++ b/src/main/java/eu/usrv/yamcore/auxiliary/ItemDescriptor.java @@ -7,6 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import eu.usrv.yamcore.YAMCore; +import eu.usrv.yamcore.auxiliary.enums.ItemEqualsCompareMethodEnum; /** * This class is able to convert from any Item/ItemStack/String representation @@ -111,8 +112,8 @@ public class ItemDescriptor try { String[] args = pItemIdentifier.split(":"); - ItemDescriptor tDesc = null; - + //ItemDescriptor tDesc = null; + if (args.length >= 2) { String tModID = args[0]; @@ -121,6 +122,10 @@ public class ItemDescriptor if (args.length == 3) tMetaID = Integer.parseInt(args[2]); tRet = new ItemDescriptor(tModID, tItemName, tMetaID); + + // Verify that given Item is valid + if (tRet.getItemStack(1) == null) + tRet = null; } } catch (NumberFormatException e) @@ -136,7 +141,49 @@ public class ItemDescriptor return tRet; } + + /** + * Compares two ItemDescriptor instances + * + * @param pID1 First Item to compare + * @param pID2 Second Item to compare + * @param pCompareMethod The Method that is used to compare + * @return True or false, according to the compare result + */ + public static boolean isEqualTo(ItemDescriptor pID1, ItemDescriptor pID2, ItemEqualsCompareMethodEnum pCompareMethod) + { + String tObjectHashA = ""; + String tObjectHashB = ""; + + switch (pCompareMethod) + { + case Exact: + tObjectHashA = pID1.toString(); + tObjectHashB = pID2.toString(); + + break; + + case IgnoreMetaData: + tObjectHashA = String.format("%s:%s", pID1.getModID(), pID1.getItemName()); + tObjectHashB = String.format("%s:%s", pID2.getModID(), pID2.getItemName()); + break; + } + return tObjectHashA.equals(tObjectHashB); + } + + /** + * Compare *this* ItemDescriptor to a different one + * + * @param pOther The ItemDescriptor to compare against + * @param pCompareMethod The Method that is used to compare + * @return True or false, according to the compare result + */ + public boolean isEqualTo(ItemDescriptor pOther, ItemEqualsCompareMethodEnum pCompareMethod) + { + return ItemDescriptor.isEqualTo(this, pOther, pCompareMethod); + } + /** * Creates an Item-representation of the current ItemDescriptor * diff --git a/src/main/java/eu/usrv/yamcore/auxiliary/enums/ItemEqualsCompareMethodEnum.java b/src/main/java/eu/usrv/yamcore/auxiliary/enums/ItemEqualsCompareMethodEnum.java new file mode 100644 index 0000000..8806b81 --- /dev/null +++ b/src/main/java/eu/usrv/yamcore/auxiliary/enums/ItemEqualsCompareMethodEnum.java @@ -0,0 +1,8 @@ +package eu.usrv.yamcore.auxiliary.enums; + +public enum ItemEqualsCompareMethodEnum { + Exact, + //IgnoreNBT, + IgnoreMetaData + //IgnoreMetaDataAndNBT +}