Every machine now compares on damage and NBT by default

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Added crafting preview screen (way2muchnoise)
 - Added max crafting task depth (raoulvdberge)
 - Added helpful tooltips to Solderer and Processing Pattern Encoder (raoulvdberge)
+- Every machine now compares on damage and NBT by default (raoulvdberge)
 - Updated JEI, fixes crashes (way2muchnoise)
 
 ### 1.0.5

src/main/java/refinedstorage/tile/TileConstructor.java

@@ -17,6 +17,7 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorage;
 import refinedstorage.api.network.NetworkUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.container.slot.SlotSpecimen;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerFluid;
@@ -47,7 +48,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
 
     private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING);
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int type = IType.ITEMS;
 
     private IBlockState block;

src/main/java/refinedstorage/tile/TileDestructor.java

@@ -19,6 +19,7 @@ import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorage;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerFluid;
 import refinedstorage.inventory.ItemHandlerUpgrade;
@@ -46,7 +47,7 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF
 
     private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED);
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
     private int type = IType.ITEMS;
 

src/main/java/refinedstorage/tile/TileDetector.java

@@ -82,7 +82,7 @@ public class TileDetector extends TileNode implements IComparable, IType {
     private ItemHandlerBasic itemFilters = new ItemHandlerBasic(1, this);
     private ItemHandlerFluid fluidFilters = new ItemHandlerFluid(1, this);
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int type = IType.ITEMS;
     private int mode = MODE_EQUAL;
     private int amount = 0;

src/main/java/refinedstorage/tile/TileDiskDrive.java

@@ -13,6 +13,7 @@ import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageItems;
 import refinedstorage.api.network.INetworkMaster;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.fluid.IFluidStorage;
 import refinedstorage.api.storage.fluid.IFluidStorageProvider;
 import refinedstorage.api.storage.item.IItemStorage;
@@ -122,7 +123,7 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
     private FluidStorage fluidStorages[] = new FluidStorage[8];
 
     private int priority = 0;
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
     private int type = IType.ITEMS;
 

src/main/java/refinedstorage/tile/TileDiskManipulator.java

@@ -12,6 +12,7 @@ import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorage;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.apiimpl.storage.NBTStorage;
 import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
 import refinedstorage.apiimpl.storage.fluid.FluidUtils;
@@ -58,7 +59,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
     private static final String NBT_TYPE = "Type";
     private static final String NBT_IO_MODE = "IOMode";
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
     private int type = IType.ITEMS;
     private int ioMode = IO_MODE_INSERT;

src/main/java/refinedstorage/tile/TileExporter.java

@@ -13,6 +13,7 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorage;
 import refinedstorage.api.network.NetworkUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerFluid;
 import refinedstorage.inventory.ItemHandlerUpgrade;
@@ -33,7 +34,7 @@ public class TileExporter extends TileMultipartNode implements IComparable, ITyp
 
     private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_CRAFTING, ItemUpgrade.TYPE_STACK);
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int type = IType.ITEMS;
 
     public TileExporter() {

src/main/java/refinedstorage/tile/TileFluidInterface.java

@@ -9,6 +9,7 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import refinedstorage.RefinedStorage;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.apiimpl.storage.fluid.FluidUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerFluid;
@@ -42,7 +43,7 @@ public class TileFluidInterface extends TileNode implements IComparable {
     private static final String NBT_TANK_IN = "TankIn";
     private static final String NBT_TANK_OUT = "TankOut";
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT;
 
     private FluidTank tankIn = new FluidTank(TANK_CAPACITY) {
         @Override

src/main/java/refinedstorage/tile/TileFluidStorage.java

@@ -6,6 +6,7 @@ import net.minecraftforge.fluids.FluidStack;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.api.network.INetworkMaster;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.fluid.IFluidStorage;
 import refinedstorage.api.storage.fluid.IFluidStorageProvider;
 import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
@@ -67,7 +68,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider,
     private EnumFluidStorageType type;
 
     private int priority = 0;
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT;
     private int mode = IFilterable.WHITELIST;
 
     public TileFluidStorage() {

src/main/java/refinedstorage/tile/TileImporter.java

@@ -11,6 +11,7 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import refinedstorage.RefinedStorage;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerFluid;
 import refinedstorage.inventory.ItemHandlerUpgrade;
@@ -34,7 +35,7 @@ public class TileImporter extends TileMultipartNode implements IComparable, IFil
 
     private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
     private int type = IType.ITEMS;
 

src/main/java/refinedstorage/tile/TileInterface.java

@@ -9,6 +9,7 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import refinedstorage.RefinedStorage;
 import refinedstorage.api.network.NetworkUtils;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.inventory.ItemHandlerBasic;
 import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
@@ -25,7 +26,7 @@ public class TileInterface extends TileNode implements IComparable {
     private ItemHandlerBasic exportItems = new ItemHandlerBasic(9, this);
     private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, this, ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK, ItemUpgrade.TYPE_CRAFTING);
 
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
 
     private int currentSlot = 0;
 

src/main/java/refinedstorage/tile/TileStorage.java

@@ -7,6 +7,7 @@ import net.minecraftforge.items.ItemHandlerHelper;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.api.network.INetworkMaster;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.item.IItemStorage;
 import refinedstorage.api.storage.item.IItemStorageProvider;
 import refinedstorage.apiimpl.storage.item.ItemStorageNBT;
@@ -67,7 +68,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
     private EnumItemStorageType type;
 
     private int priority = 0;
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
 
     public TileStorage() {

src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java

@@ -12,6 +12,7 @@ import net.minecraftforge.items.IItemHandler;
 import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
 import refinedstorage.RefinedStorage;
 import refinedstorage.api.network.INetworkMaster;
+import refinedstorage.api.storage.CompareUtils;
 import refinedstorage.api.storage.fluid.IFluidStorage;
 import refinedstorage.api.storage.fluid.IFluidStorageProvider;
 import refinedstorage.api.storage.item.IItemStorage;
@@ -79,7 +80,7 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
     private ItemHandlerFluid fluidFilters = new ItemHandlerFluid(9, this);
 
     private int priority = 0;
-    private int compare = 0;
+    private int compare = CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_DAMAGE;
     private int mode = IFilterable.WHITELIST;
     private int type = IType.ITEMS;