From 17f29aeb7c92ed75b25149a01d3ca537bf79f7bb Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Fri, 2 Aug 2013 12:45:10 -0400
Subject: [PATCH] Gave Quantum Entangler a texture. Signing off until around 9
 PM EST.

---
 .../textures/items/quantum_entangler.png         | Bin 0 -> 1097 bytes
 .../entangler/ItemQuantumEntangler.java          |  10 +++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/resonantinduction/textures/items/quantum_entangler.png

diff --git a/resources/assets/resonantinduction/textures/items/quantum_entangler.png b/resources/assets/resonantinduction/textures/items/quantum_entangler.png
new file mode 100644
index 0000000000000000000000000000000000000000..4960e84f873158b54b46d7c7d1a52f1fcbaad352
GIT binary patch
literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000BHNkl<ZSV!$wSxZ|{5I#T371Ss94IjjP
z0~G}kMZ^V{rY6QjX&M84NLv#m3-zIaw3uQPt+b^@`rPOKlj;2?o!hIq$vL4EU;1#!
z<=!(h-)!GZ6cMS%JdbJ|j=KU-*6W9-(kPkgC;|Y%>gsAfH8nNV)YL@H&CNC-9S||x
z-Q7(c9UZKvs;Y|W>grg>LwQ#KxLjXfPwMq&QZMohpuN4FT3T9Mm55Rpz}>dCHtOo?
zA{G5eDx9O*+FAx-41kS4dv7VYA@%$nwYIi0fZpC-BLD!=+1W`d_NAcb<qb77G?)WG
z*wyJ*QvMW&5odaOn)degv;fxD)~K(qk0Sx#DrQCT>8YJYqZCLO;Wd;jE-upY@^VpO
zx)mDUdA(i+EFcgKIANRu<PgT8U}k2<Hhgt;ML5}PmX42)i;jF3V5_UEHVCc>(;@^~
zcs?{VM4OwNESS&dZNnaqht}8EX<=c3#>U2Ic6OFFHZ~{{iSRuDfsEhp=fZ^}r3%=!
z3lK60A)jJAlgY5hrNS=naVMQl+aRW<rdSu+vZ4q;XlrYWg)T2I{}|8wAQgC10P^7{
zDNn5Moc>M<->heV$mMeUyuZKC-W#WY>G3xcBCL3h#bQR@JEI`c3IqaWNv!NFa8u|c
zol?(Ipdw$6J+;F~LJFnGr{vL@Pv^VQ(NViQ+;Xnv0p|trAeBn7QdGVU0Pf(fbb<~<
z*=dLZf`W^S3s!n?aG>piP$<NA(T<Sy`Fxet0EEy1!^6Y2FuaM!<E$9Gfc6|8A18zx
zJb+*ET-p$w16}B(ot>S+Y%nDvFd;zf?(W(=0FRQ%q#cQHIPA)Xi9~|KF8}~|a&oe=
zSs>g!Ffc&d+uQf37>du%&RmV3oSbmFq;{5;mS|#Pf{n{gp)EoPgNkJy00bg|0i$C<
z`HtFISy`cxkr8{BsAw25Z~N0c$H8D2ugIko)a~spgF&dTudn&}?(U9%K|F|BPft(5
z>sOzwah%}cW?TcjK0UE0Hf}8xksL>(zrUX_-JnE_Itl0e{QMsEvT<xgp)4t1van&9
z79rLr>~bpj)>=%y@gPA|1_uXONi-TQs)1lI$ls)Z@e5hyO|Wt7m&O2Ok;HFfW1~IE
zpa5)mbadoegmZIqcAW@lS#a4QlL$D6k+bOJJ@~;%&xePH+~;^F-^%IGc0t*}VHuG$
zU{eAa;mps^GXQjqj(YzJKq=22MoRbJ;oiKd<nq6`s~yMx!s!19I3w^2d$5)XUi1(x
P00000NkvXXu0mjfKymxC

literal 0
HcmV?d00001

diff --git a/src/resonantinduction/entangler/ItemQuantumEntangler.java b/src/resonantinduction/entangler/ItemQuantumEntangler.java
index 75adeb59..4ccc47d1 100644
--- a/src/resonantinduction/entangler/ItemQuantumEntangler.java
+++ b/src/resonantinduction/entangler/ItemQuantumEntangler.java
@@ -2,11 +2,13 @@ package resonantinduction.entangler;
 
 import java.util.List;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
+import resonantinduction.ResonantInduction;
 import resonantinduction.base.ItemBase;
 import resonantinduction.base.Vector3;
 import cpw.mods.fml.relauncher.Side;
@@ -27,6 +29,12 @@ public class ItemQuantumEntangler extends ItemBase
 		setMaxStackSize(1);
 		// TODO Handheld model, render animation, energy usage (should be easy?)
 	}
+	
+	@Override
+	public void registerIcons(IconRegister register)
+	{
+		itemIcon = register.registerIcon(ResonantInduction.PREFIX + "quantum_entangler");
+	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
@@ -79,7 +87,7 @@ public class ItemQuantumEntangler extends ItemBase
 				return itemstack;
 			}
 
-			// TELEPORT//
+			// TELEPORT //
 
 			Vector3 vec = getBindVec(itemstack);
 			int dimID = getDimID(itemstack);