From de86e0b2a2ddc45e2e2c9383b219106ee4e2da21 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Sun, 20 Jul 2014 20:19:01 -0400
Subject: [PATCH] Finished off the filtering system! Also added new "fuzzy
 mode" to ItemStack filters in order to ignore metadata checks.

---
 .../client/gui/GuiMItemStackFilter.java       |  19 +++++++++++++++
 .../java/mekanism/client/gui/GuiSlot.java     |   3 ++-
 .../common/miner/MItemStackFilter.java        |  19 ++++++++-------
 .../common/tile/TileEntityDigitalMiner.java   |  22 +++++++++++++-----
 .../mekanism/gui/GuiMItemStackFilter.png      | Bin 4501 -> 5141 bytes
 .../assets/mekanism/gui/elements/GuiSlot.png  | Bin 2836 -> 2957 bytes
 .../resources/assets/mekanism/lang/en_US.lang |   1 +
 7 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java
index 8fc9b078e..57a591522 100644
--- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java
+++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java
@@ -149,6 +149,11 @@ public class GuiMItemStackFilter extends GuiMekanism
 		{
 			drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis);
 		}
+		
+		if(xAxis >= 15 && xAxis <= 29 && yAxis >= 45 && yAxis <= 59)
+		{
+			drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.fuzzyMode") + ": " + LangUtils.transYesNo(filter.fuzzy), xAxis, yAxis);
+		}
 
 		super.drawGuiContainerForegroundLayer(mouseX, mouseY);
 	}
@@ -196,6 +201,14 @@ public class GuiMItemStackFilter extends GuiMekanism
 		else {
 			drawTexturedModalRect(guiWidth + 148, guiHeight + 45, 176 + 23, 14, 14, 14);
 		}
+		
+		if(xAxis >= 15 && xAxis <= 29 && yAxis >= 45 && yAxis <= 59)
+		{
+			drawTexturedModalRect(guiWidth + 14, guiHeight + 45, 176 + 37, 0, 14, 14);
+		}
+		else {
+			drawTexturedModalRect(guiWidth + 14, guiHeight + 45, 176 + 37, 14, 14, 14);
+		}
 
 		if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35)
 		{
@@ -249,6 +262,12 @@ public class GuiMItemStackFilter extends GuiMekanism
 				SoundHandler.playSound("gui.button.press");
 				filter.requireStack = !filter.requireStack;
 			}
+			
+			if(xAxis >= 15 && xAxis <= 29 && yAxis >= 45 && yAxis <= 59)
+			{
+				SoundHandler.playSound("gui.button.press");
+				filter.fuzzy = !filter.fuzzy;
+			}
 
 			if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35)
 			{
diff --git a/src/main/java/mekanism/client/gui/GuiSlot.java b/src/main/java/mekanism/client/gui/GuiSlot.java
index 2e22eadbe..c17a4f5a6 100644
--- a/src/main/java/mekanism/client/gui/GuiSlot.java
+++ b/src/main/java/mekanism/client/gui/GuiSlot.java
@@ -105,7 +105,8 @@ public class GuiSlot extends GuiElement
 		PLUS(18, 18, 18, 18),
 		POWER(18, 18, 36, 18),
 		INPUT(18, 18, 54, 18),
-		OUTPUT(18, 18, 72, 18);
+		OUTPUT(18, 18, 72, 18),
+		CHECK(18, 18, 0, 36);
 
 		public int width;
 		public int height;
diff --git a/src/main/java/mekanism/common/miner/MItemStackFilter.java b/src/main/java/mekanism/common/miner/MItemStackFilter.java
index 39552089c..1bc560607 100644
--- a/src/main/java/mekanism/common/miner/MItemStackFilter.java
+++ b/src/main/java/mekanism/common/miner/MItemStackFilter.java
@@ -3,23 +3,16 @@ package mekanism.common.miner;
 import io.netty.buffer.ByteBuf;
 
 import java.util.ArrayList;
-import java.util.List;
 
-import mekanism.api.ListUtils;
 import mekanism.common.util.MekanismUtils;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class MItemStackFilter extends MinerFilter
 {
-	private static List<Block> metaIgnoreArray = ListUtils.asList(Blocks.planks, Blocks.ladder, Blocks.torch,
-			Blocks.furnace, Blocks.dispenser, Blocks.piston,
-			Blocks.piston_extension, Blocks.piston_head);
-
 	public ItemStack itemType;
+	public boolean fuzzy;
 
 	public MItemStackFilter(ItemStack item)
 	{
@@ -36,7 +29,7 @@ public class MItemStackFilter extends MinerFilter
 			return false;
 		}
 
-		if(itemStack.getItem() == itemType.getItem() && metaIgnoreArray.contains(Block.getBlockFromItem(itemType.getItem())))
+		if(itemStack.getItem() == itemType.getItem() && fuzzy)
 		{
 			return true;
 		}
@@ -50,6 +43,8 @@ public class MItemStackFilter extends MinerFilter
 		super.write(nbtTags);
 		
 		nbtTags.setInteger("type", 0);
+		
+		nbtTags.setBoolean("fuzzy", fuzzy);
 		itemType.writeToNBT(nbtTags);
 
 		return nbtTags;
@@ -60,6 +55,7 @@ public class MItemStackFilter extends MinerFilter
 	{
 		super.read(nbtTags);
 		
+		fuzzy = nbtTags.getBoolean("fuzzy");
 		itemType = ItemStack.loadItemStackFromNBT(nbtTags);
 	}
 
@@ -70,6 +66,8 @@ public class MItemStackFilter extends MinerFilter
 		
 		super.write(data);
 
+		data.add(fuzzy);
+		
 		data.add(MekanismUtils.getID(itemType));
 		data.add(itemType.stackSize);
 		data.add(itemType.getItemDamage());
@@ -80,6 +78,8 @@ public class MItemStackFilter extends MinerFilter
 	{
 		super.read(dataStream);
 		
+		fuzzy = dataStream.readBoolean();
+		
 		itemType = new ItemStack(Item.getItemById(dataStream.readInt()), dataStream.readInt(), dataStream.readInt());
 	}
 
@@ -105,6 +105,7 @@ public class MItemStackFilter extends MinerFilter
 		MItemStackFilter filter = new MItemStackFilter();
 		filter.replaceStack = replaceStack;
 		filter.requireStack = requireStack;
+		filter.fuzzy = fuzzy;
 		filter.itemType = itemType.copy();
 
 		return filter;
diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
index 640e33e8b..b8ac8b017 100644
--- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
+++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
@@ -206,11 +206,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
 
 						List<ItemStack> drops = MinerUtils.getDrops(worldObj, coord, silkTouch);
 
-						if(canInsert(drops))
+						if(canInsert(drops) && setReplace(coord, index))
 						{
 							add(drops);
-
-							setReplace(coord, index);
 							toRemove.add(index);
 
 							worldObj.playAuxSFXAtEntity(null, 2001, coord.xCoord, coord.yCoord, coord.zCoord, Block.getIdFromBlock(block) + (meta << 12));
@@ -294,10 +292,13 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
 		return MekanismUtils.getTicks(this, 80);
 	}
 
-	public void setReplace(Coord4D obj, int index)
+	/*
+	 * returns false if unsuccessful
+	 */
+	public boolean setReplace(Coord4D obj, int index)
 	{
 		ItemStack stack = getReplace(index);
-
+		 
 		if(stack != null)
 		{
 			worldObj.setBlock(obj.xCoord, obj.yCoord, obj.zCoord, Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 3);
@@ -307,9 +308,18 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
 				obj.getBlock(worldObj).dropBlockAsItem(worldObj, obj.xCoord, obj.yCoord, obj.zCoord, obj.getMetadata(worldObj), 1);
 				worldObj.setBlockToAir(obj.xCoord, obj.yCoord, obj.zCoord);
 			}
+			
+			return true;
 		}
 		else {
-			worldObj.setBlockToAir(obj.xCoord, obj.yCoord, obj.zCoord);
+			if(!replaceMap.get(index).requireStack)
+			{
+				worldObj.setBlockToAir(obj.xCoord, obj.yCoord, obj.zCoord);
+				
+				return true;
+			}
+			
+			return false;
 		}
 	}
 
diff --git a/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png b/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png
index 4da67ab336695cab7182bfeea1314ee09e5696b9..f848a31e60b262cda7a6c5499f8de4df5f17712a 100644
GIT binary patch
delta 3730
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
I@yj><2^u=EnE(I)

delta 3085
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
GfBzpkMV;UP

diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png b/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png
index dc64827db380cee1e492cf6f49103a39a99abf02..bea9f695f85d7242a167318b013b08d376360818 100644
GIT binary patch
delta 973
zcmV;;12X)S7L6CM9|V5~SV=@dRCodH-M>#1K@<SsL5YQx1^$YSl_n%6G};iQp)$Z9
zU}CI|m5n(oOD-`{8wxA`04&kU#>T=}kl5MUT9}w<G?0@yvdMyXSzy+=S^c&FcG>qH
z-!N~EgBzx1XJ-c?@mN_|32U$WiBUp0ad|2%uTLe%ITMbBSK)t7a-8#FA-oCCljDRi
zw-aNtg*Z(ia^-2Nqv?9Ab1i+Ko6@-6C@>vABTnFyV|8_P*Z}U`?4^VWFRwlhVSNzJ
z^&TX}xzT^J(*QzP?wwAG^R<6_*Z_LH>q&9?{l%U8H$!TirXq6XX{w{?`fi<TO`qm^
z27zN4a!5gdK%svE8bF}~qbveB1T=sg%5o4WR6qkLbYPT4AcuekkV9Dx0)+}_0EG^W
zvIyi5&;W8M%R!(}0S%zgfl(HL90D3Z4rMtA6e^$r6gn`<B9KEs1IVE)2Z2HbG=M?}
zMp*=M2xtH~l;t2$sDK7g=)fq8Kn?*7AcwLX1PT?Hj(dLr#Mkqu9&s~|;p_Pm1I5ie
z;_LZSkGPpfd_8~qF&B1Uzn&gR1OlZA*p(&Qh|CZ2YzXq`uWvk(O19fj7k%%gLbh<f
z9|2lG6oNok1vG%Jj-0v)v>>1Xw16lCfvyT@09_q9brWboV7M!A3vn7lEG;b!w;$iw
z*hqTv=hJ`S<eqKJKfK!xx8{EyDrQwnRrFD7YAa4vhqnZB3uJ2mZG2&I^2Z5ZKR&+S
z`*Ho+xcB3PuO@HG<lld9jJf~ZxEh=%P=Y{b8o;>8zj}Y`P^<ss&~yDgL9RTLla#qV
zfsqZMS{=uwIp``kDo*{}LF0^?{IRwx*N%sWPs4wp8%-eoC!AdW3?o;bao-`%cST@i
z11PQdOH<#6t9-o?R1f{TG5JdqRS$t(fsqa1peu6|Vm(f^^4HHb-Cw_6O@0%<uHt<H
zX#yh~Kw8N5?~arI#j{_-z*hYBeMS6#1+qPXcGO1z)#Pt;;#aj)!+z99C2hs2>hP8T
z0Rod02PS{y6*#*zvuAUTyxC<VKp<7%$XkNN$-n(=D>c9S2@vR-K%D$D3#Y99T^l&{
z5=a#=`BMemPoSd$CVxi<PT2%f1x)@_LH83VSm5H_3uAw#H~9-5IHeIt5ZLoufH=|j
z$BO6Tv;AM*e$BRd$o?99On^WJf%qt(-UO`t8PFo7ATU9JKUVeF1b%$}IV{P_Kf#fa
vn!uz4ViWLt{z>V}OS54Ilmi*~hXsBEU{vV_BwL{*00000NkvXXu0mjf*H60<

delta 809
zcmV+^1J?YF7nByT9|V5}-$_J4RCodH-LYyEK^OqwISm%}ioSqCKuDuaP@7be<N*Zn
z0jzA~tSs+9P@5E1K0qv^m9>Rf1nhhYD?w4t%pMDyaK|Q@$z&G4ZF1SY{r^AT-28h9
z*}2i`>gp^cZrj`2VdvvCF-i!RZjQp%?kG9V)o>wv2#=HFTn~Tu!>8~zIZg;`2Ql_D
z#OVuBDo<Y>eaB;+JLv=6m&Wm4ftC1-IDu2P$z;+rfF}>eDPh9<+b=`dorP=TXGwAH
zO<x@}fDpFESCZoVm_BM6z<7K&Db94dad7^ANR881M5#P|b@Uyd*SXX8G{*}FTqux3
z3IYTw70>`G9T<OQ5hx*`0hCadgFvMM8bGB3qbvd?1T=sW%5o5>R6ql$bYPT4poD-1
zP(oP_0+kAA0F@4mvIvwA&;Uv(%R!)00S%zifl(HL5&{}P31vA5R4SkWR5~!qB2Yp=
z11O;^2Z2fjG=NG6Mp*<(2xtH$l;t2$slZBH3n1RlpSpj=#XOq(`4a=h#XREu{Ha@9
z%p=~<pT4by`TgtZkwhR+n}AhWijBzntjvNSFV1}7kyNsIL*4M&ONGpEzFz?{APPZX
zr~(?mP)APP1TqL{02vU4ATU$`4PdAvr)~ln1e#TWGsNi)vAMa~EI+=tx0m$CpYOBF
zhn6w_`uTrvc)0%SL^0c1+M-WeQ?58|9ljDMEl{ih<oLnj<c|}+yM6m|`1|g$Wsl>8
zZzpfc<Ue|DjCpk5vKs6sP=ml=8o;v2KY9A+L|6awLofCJ1f}wvpQOzB1Qs@c_UgDS
z&2g`Ci{f<m9XHOR$scRGb?0Ju{yNNt(FEcr;go;+FpN@pmc2skABw=j22fk^H%333
zt9-W+v~T@~G5Ko~RS$u=z`_P_+$(b*VmD5E<?rt6JHLCpo%|+#SH)ujX#xuyKw8NB
zXUEC^?#=Heuq%FkUlIRbfnt9^JMBAwcJk+(_-!riu%Gr_Nv=3;9ljDEK!5-N0t5&U
nAV9NB2q*)S@CUmX&P3oJ@gcY3w|f}<00000NkvXXu0mjf6X<x`

diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang
index 9c2564c03..0f9169393 100644
--- a/src/main/resources/assets/mekanism/lang/en_US.lang
+++ b/src/main/resources/assets/mekanism/lang/en_US.lang
@@ -440,6 +440,7 @@ gui.digitalMiner.toMine=To mine
 gui.digitalMiner.running=Running
 gui.digitalMiner.inverse=Inverse mode
 gui.digitalMiner.requireReplace=Require replace
+gui.digitalMiner.fuzzyMode=Fuzzy mode
 
 //Recipe names
 recipe.mekanismShaped=Shaped