From 3bdcceddf1657e7c514ac6e7af1caf42ce3be9b8 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sun, 22 Dec 2013 13:31:04 +0800
Subject: [PATCH] Removed some unused textures

---
 .../models/{lainWire.png => flatWire.png}     | Bin
 .../textures/items/models/insulationtiny.png  | Bin 1076 -> 0 bytes
 .../textures/items/models/wire.png            | Bin 702 -> 0 bytes
 src/resonantinduction/wire/ItemPartWire.java  |   4 ++--
 src/resonantinduction/wire/part/FlatWire.java |  20 ++++++++++--------
 5 files changed, 13 insertions(+), 11 deletions(-)
 rename resources/assets/resonantinduction/textures/items/models/{lainWire.png => flatWire.png} (100%)
 delete mode 100644 resources/assets/resonantinduction/textures/items/models/insulationtiny.png
 delete mode 100644 resources/assets/resonantinduction/textures/items/models/wire.png

diff --git a/resources/assets/resonantinduction/textures/items/models/lainWire.png b/resources/assets/resonantinduction/textures/items/models/flatWire.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/models/lainWire.png
rename to resources/assets/resonantinduction/textures/items/models/flatWire.png
diff --git a/resources/assets/resonantinduction/textures/items/models/insulationtiny.png b/resources/assets/resonantinduction/textures/items/models/insulationtiny.png
deleted file mode 100644
index ca3dbc44d41970d1873d253e3f626ca79155fc9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1076
zcmV-41k3x0P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0009RX+uL$P-t&-
zZ*ypGa3D!TLm+T+Z)Rz1WdHzp+GAi~p5W-><jN$#z)(<BQsf@w7#R^6rNDlkfsKKg
zfq{X6fgv%uxWF+Wz=wf>fgvwHFO>lmFfuTFyT-uCz`($8S=Z6U$(4aLz?xi8RKmc(
zaDah<!6+rQIGKTg;R^!;Lwb2hK?wr`V+;cWgGf?#K?wr`V*vvLgGhErkTU}VV+#WV
z6HiHMMF|4~1A}vZL1j^9dPa$Yp{1pzf@4a4QmR65WpPPrZn1)AUUGg>L4HwUNoooM
z0|V3!1_lNOUYGn51^2|vJOv{IRR$`9h{z}f2n!KD2r&dmE-fm92PFf80D}U90fPfW
z07D`}J;MTqqYQ5t#Ti`~OBq)%-eVGD3SyeTbb(ozIg)uH^BWdRmJXI%ta_}itoPU~
z*`~35V-IKF&7s86#qotRk@EtVBi9ygP3{FeQan?6g?K0N3G+?km*HP5pd+wD&{gn?
zP^!=m;a(9Hk-ehfqF=-&i5rPuk*JWAlRPGsFD)&7LZ(bsUG|n-pS+9wABC-og-Uu#
zZ<W`o6sVf0{!}}t-lY+$sigTq>wxwoom5>bJwd%!`bP{F7}gra7~7i2n=+feG`nEF
z(_)F`1gkphT$?!CKs#4^YX@UT9VazsB^L!(c{c@jWe;^vT`v=F8y|PyV7~<a{DAtv
zi9t()cZFOGeHqRaAs1;C6%kz#Gc$Hi+=B$RMBSvY<c5?rsW;O(GAuGPv*u=B%w^BB
z&#x%hRQRq~yCkc0RoR;g{mPQ6T{VogUUgIJA2#YW)ij@Nm1`?(KiVnXRn&dDSGBLP
z|L#PaNwX*aof<#w@C=Qa{j<K$Ntk<jzWIWsi$oT;F8Q`BbNRiMA*)WWaap@>z2$~&
zn@l!u*=n+F`wpv}`**wUIlC`x|AT`$hkhPuKPG;B#YyW^=guUb{dIoQMeR#RuOwdm
zcYV%Hn_GA9)ZbISf8t@@W3eaupJl!fd3o@4{#*HX7d|w7GX4DO>w@p$KLviB`qTQ)
z@&A7S4FC@``j+us00002VoOIv0RM-N%)bBt010qNS#tmY4#EHc4#EKyC`y0;000Mc
zNliru-3b=~Hy5zH=fVI00HH}lK~yNumC!+I0znW);jgB<#{t1jj*t_D>~p7FBP$Q3
z`+-3SLfhF4nmAFh76k>5zp7p|_bc<!Mr#KruRepfR(!>KtF}RAl2pB;9T-&fmjsHz
zgaoP=Of%3?Bvr*XSlOdqfR)ftbaMi1<|#AEnn5^%=5+4Fqc=Oxdsrk)Qq<_9i`}gi
uWtNlv2d+IVfNKwnBS*RY_VBkJdiVh{#WU)ex?E2H0000<MNUMnLSTXv5zqPn

diff --git a/resources/assets/resonantinduction/textures/items/models/wire.png b/resources/assets/resonantinduction/textures/items/models/wire.png
deleted file mode 100644
index 1244ffb742c6f1c77f7d4946c6674d6d3747a29b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 702
zcmV;v0zv(WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4!!^Y4!!~ELb1RA000McNliru-3b^JIUizbGqV5y0!v9m
zK~z}7?Uu_<v`iR;pFYqu42i@;;$h{bxiW6O3wLfzyf!aEi4LeR*r#tr=l_%0&6w|7
zOs&Wp0!3H7Rlr|{*fzYmxk=MBad~;kX0suLK-YB`V>muO=IQB4?2CZjHY|z)DJAnf
zBZOcaM*zyQWSXYEo`Bpo3?VSjGa&?ietvMyVXb8thP_L$^#sOoq^c^`>orO#lu}43
zsp}dc#Qr^ScXyXU2zc)q$C0uuF~-pMJw;KFQbKEuF$V8FRaMdVJyJ@Vrs4VdS?nai
zJkP`!i7`?XMSf9PmZX%h*5bX#IY*2U=NwW>gb<{ZcK5*7*B4UCOrr05LI_k<h1QxF
zBTA`kM&}$#DXg{oA#ieXLX457X-Fxdl)@N8j1g-sbzNhvMF@d&4(~nIT9i^d6X2f=
zqTAcsGz<gR*Vnwfyl{Sgj<q)H{_yZ1el-U^KR;=jhH)He+ZJOC(=-udr0crh52CZP
zGraczv~A1l>nkZG-rwIjJw5$>0?W=<RmJ!BHy0Ndc`H_{)&4zje}A7=s}<|@nx<*c
zTJ!ey#?{poA0HpIZObqW)OAf!6m(t3(a}+k=EuiJv2zrsl<?l?JP<+<Lipd!%l<FP
zxVIdb=NTy_)>^dIq?9nm<Wln9qm&}X2!QuK6JBOJ5irIegkYZM{NUxwmNfh?f#q5V
zK~+_|6PTt6tu;c3+<rm`VvM<#rIcBclv3`5y={R~ip^$2N(tv&uHD5GQc9+2%Cbl)
k^N-5`2OMy~0SD}YKQ1FkR}a?iMgRZ+07*qoM6N<$g4xJC@Bjb+

diff --git a/src/resonantinduction/wire/ItemPartWire.java b/src/resonantinduction/wire/ItemPartWire.java
index b47eb9e11..bbcd5d5a6 100644
--- a/src/resonantinduction/wire/ItemPartWire.java
+++ b/src/resonantinduction/wire/ItemPartWire.java
@@ -14,7 +14,6 @@ import resonantinduction.ResonantInduction;
 import resonantinduction.TabRI;
 import resonantinduction.Utility;
 import resonantinduction.wire.part.FlatWire;
-import resonantinduction.wire.render.RenderPartWire;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import codechicken.lib.vec.BlockCoord;
@@ -27,6 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemPartWire extends JItemMultiPart
 {
+	public static Icon flatWireTexture;
 	private Icon[] icons = new Icon[EnumWireMaterial.values().length];
 
 	public ItemPartWire(int id)
@@ -86,7 +86,7 @@ public class ItemPartWire extends JItemMultiPart
 			icons[material.ordinal()] = register.registerIcon(ResonantInduction.PREFIX + "wire." + EnumWireMaterial.values()[material.ordinal()].getName().toLowerCase());
 		}
 
-		RenderPartWire.registerIcons(register);
+		flatWireTexture = register.registerIcon(ResonantInduction.PREFIX + "models/flatWire");
 	}
 
 	@Override
diff --git a/src/resonantinduction/wire/part/FlatWire.java b/src/resonantinduction/wire/part/FlatWire.java
index 3673dc9ea..368cf7252 100644
--- a/src/resonantinduction/wire/part/FlatWire.java
+++ b/src/resonantinduction/wire/part/FlatWire.java
@@ -14,8 +14,8 @@ import org.lwjgl.opengl.GL11;
 import resonantinduction.Utility;
 import resonantinduction.wire.EnumWireMaterial;
 import resonantinduction.wire.IAdvancedConductor;
+import resonantinduction.wire.ItemPartWire;
 import resonantinduction.wire.render.RenderFlatWire;
-import resonantinduction.wire.render.RenderPartWire;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;
@@ -198,7 +198,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 			connMap = 0;
 
 			updateInternalConnections();
-			
+
 			if (updateOpenConnections())
 			{
 				updateExternalConnections();
@@ -212,14 +212,14 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 	public void onAdded()
 	{
 		super.onAdded();
-		
+
 		if (!world().isRemote)
 		{
 			updateOpenConnections();
 			boolean changed = updateInternalConnections();
 			// don't use || because it's fail fast
 			changed |= updateExternalConnections();
-			
+
 			if (changed)
 			{
 				sendConnUpdate();
@@ -279,10 +279,12 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 
 		for (int r = 0; r < 4; r++)
 		{
-			/*if (!maskOpen(r))
-			{
-				continue;
-			}*/
+			/*
+			 * if (!maskOpen(r))
+			 * {
+			 * continue;
+			 * }
+			 */
 
 			if (connectStraight(r))
 			{
@@ -621,7 +623,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 	@SideOnly(Side.CLIENT)
 	public Icon getIcon()
 	{
-		return RenderPartWire.lainWireIcon;
+		return ItemPartWire.flatWireTexture;
 	}
 
 	public Colour getColour()