From b478e67025673a3ebe63cd34260f42158c76c932 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sun, 22 Dec 2013 13:45:21 +0800
Subject: [PATCH] Fixed flat wire glitchy texture

---
 .../{items => blocks}/models/flatWire.png     | Bin 4008 -> 3041 bytes
 .../{items => blocks}/models/insulation.png   | Bin
 .../{items => blocks}/wire.aluminum.png       | Bin
 .../{items => blocks}/wire.copper.png         | Bin
 .../textures/{items => blocks}/wire.iron.png  | Bin
 .../textures/{items => blocks}/wire.png       | Bin
 .../{items => blocks}/wire.silver.png         | Bin
 .../{items => blocks}/wire.superconductor.png | Bin
 .../textures/{items => blocks}/wire.tin.png   | Bin
 src/resonantinduction/ResonantInduction.java  |   4 ++--
 .../wire/{ItemPartWire.java => ItemWire.java} |  14 ++++++++++----
 src/resonantinduction/wire/part/FlatWire.java |   3 +--
 .../wire/render/RenderFlatWire.java           |   3 +++
 13 files changed, 16 insertions(+), 8 deletions(-)
 rename resources/assets/resonantinduction/textures/{items => blocks}/models/flatWire.png (66%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/models/insulation.png (100%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/wire.aluminum.png (100%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/wire.copper.png (100%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/wire.iron.png (100%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/wire.png (100%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/wire.silver.png (100%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/wire.superconductor.png (100%)
 rename resources/assets/resonantinduction/textures/{items => blocks}/wire.tin.png (100%)
 rename src/resonantinduction/wire/{ItemPartWire.java => ItemWire.java} (91%)

diff --git a/resources/assets/resonantinduction/textures/items/models/flatWire.png b/resources/assets/resonantinduction/textures/blocks/models/flatWire.png
similarity index 66%
rename from resources/assets/resonantinduction/textures/items/models/flatWire.png
rename to resources/assets/resonantinduction/textures/blocks/models/flatWire.png
index 2e22b65600786a3f7618d970fa61c7ec4e1a222c..85831eabb056d5381ab91b323314823f92b3c218 100644
GIT binary patch
delta 356
zcmZ1>|4`hlGr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK7@NO2Z;L>4nJa0`PlBg3pY
z5*y7rx#}5tJY5_^DsIi0Y`E@-0*}ki|4Z)#E#=4#4`Fd-TKa%(^U>=Oer2=&%7$%t
z{*fbdZEFzMwp{0IUd!|;K^v|)W%I6jb$>@#==$IsBjXiXE-ZV?k31~2J@&zB=1le3
zk}fPtO;N9VUr5KE`<c%$+0r4jF!p-y3(w=X*gH6)vIPX|{d-*et*&Y2#bhf!f0Hez
zf2zAgsp-h)BU7%we)_!Tl(KB~q?whQX5L-m8ac(?>RXM)f)%y*1zCgTUfRh_P>AY3
ztf|jc#-uh|vhQ)jszu-Hc5|Lmp8LO3u=reOly=cMi}RQB72|T31cxrMTn=<l*4lv3
z9zy|;{u`6eyopyixkgz2;`)<oF6;Y$kNzviz+l;QDedVmQ1CH$y85}Sb4q9e0DoPP
AssI20

delta 1330
zcmaDTzCzxtGr-TCmrII^fq{Y7)59eQNGpJ_02`20ezj~nkm4-xh%9Dc;9CvCjD2s8
z{Ml&M$yLvC+0(@_q~g|@h`rw0{vx({B^^e5-8muCL><?<9Pv7G$mxjFnx>A3U*a80
zJEkrL5)qv(;Srs!y>q8({19ZZ@7ln!DKbgox`g=6KV9=DPds}%+V@k<&b#ks-Z^>3
zw)&mB^Eb`kQ);zD&a99$UEE;(gm0&F!?qQ=S=|no{BG5IN-sz*>FHx^%bd~1`N5+9
zv&91)3+{7F6Xu`tf4ZC@*KPL2G_U*Z{fFEiDmT2l6uT?hGA_HG>-n5wK8x4qc5UXH
zkh{ru8{_dpnd6K%Y-Xo_cCea!Zi(@M(?@`i<-o5<``7F?cQ4z@x@v!qlfLS<_2R3K
zQNOc0?jOm2WZueDzjR8Fmh!nnI%f_!tkS<a{ncdqH(n*GyM!1NTLgkm35cZ^iv4FU
zw$s}abjQT!uu0Z)e?j)o?sxKKn?bPQ)r!7XQ_?*IidP-Ye(V2H-lTNqE}vMYCc#5C
zmyK<OPi%d9t0;Hr>(f64ze!d1?md>(e*M(^NA?*Xqtki}*-YZ=&Ew7EPtO*9-}-eP
z2zs_XDgR{sQ}*YZbU%U3O&_9u2OnwtBR<hbZSqN#4^|+^;NsEZ(sAVIFNKL8jnz9M
z9V^!U)qJ$zUkA6gU2s5vrdCqzP8}z+6Kpp%QekGCa@`}5IKLug>zZj-pCD_jpPJFI
zL$lCezv)G_TQ2(*tL&b!7;1BrPrsvD&gs#o;yy|F>hEk3cHKA^kw6zlnFkE)4zIm{
zkgLIwCrKb9HWvt4ZC(ZTPm2o)Oi9Y}>17O`x%x~f+lPC5%iqfeEOctUqdwI$HR%3<
zzfzNzSI$~K^|$s)<}T@sS<5mH%&z~KwnviT{`228@*KHsX3n#V{)S&(ngDWl!Tw_*
zuYsX0s-~28dt2`9`IjCYH<#;bTeR@Sb)b@#gueRu?;q9muDlk%QAA8!ahA;Nn`hD-
zzE=RD#fOq#K&Yks@4`<Y<aD{ElsnNZlBxUq+=u51(j_!v#Mg0OpRe(wexd07qo=1m
z5!=`i>T3LixBBqCg1>GyD<-VmCaIOxu<rG)b*I(bXRMsHY9*72_hu9AtJB|1wB4ls
ze?mf^L3i|>M@E}k=Q;T=Ty9fmUk!xXrbnVbi0x@j=;d7H+*GhM?$#YI?wMJ$7q(5_
z4uVb(<G1e=*9E~%0fw90>aU$R<>Z#(An@)w$Mw?K>$?5gUoSlii#ic<o5yt8lU#Pb
zIb645#P#l+Dl|L0?B<v6+>%#Ae6LPvofS}-eQws~XDMPD?JzB?ZF`SCQ)rhdnm<cn
z?n@u`9p_5_&6bbazb5|LdjH(#|IfH^X)dX|K8@|cQ?EQezCQa0cJ))mZ#nrS2^mX-
zM>MHMFzu+_1B5IU_V1tnoqwgickM>gNQ;gwC;Dz0TC>gZOusaf<&AIk<$F^m{?(gj
z=Rbe>`KSBJPlMp6pOtTc(6`Qsw;cpcB|5ME{_;J)|3=r+g1x@=t_Pp$$F^=gek=K{
z;Q=LJc>5GLCB_#Womw^b-@hvzYXfyO)cyWz=~~@+$fqy5_Dfim_Fh&AOXc(@UawgS
zC&t4R`mVhG^1XlW4JmK2o<yGHO}n+t|Ngyw<<CmN*+J_s-=8nFQS+<S-@hvxPuDXu
Z+<CE;`N0OIS-|p-!PC{xWt~$(69D9IgO&gQ

diff --git a/resources/assets/resonantinduction/textures/items/models/insulation.png b/resources/assets/resonantinduction/textures/blocks/models/insulation.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/models/insulation.png
rename to resources/assets/resonantinduction/textures/blocks/models/insulation.png
diff --git a/resources/assets/resonantinduction/textures/items/wire.aluminum.png b/resources/assets/resonantinduction/textures/blocks/wire.aluminum.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/wire.aluminum.png
rename to resources/assets/resonantinduction/textures/blocks/wire.aluminum.png
diff --git a/resources/assets/resonantinduction/textures/items/wire.copper.png b/resources/assets/resonantinduction/textures/blocks/wire.copper.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/wire.copper.png
rename to resources/assets/resonantinduction/textures/blocks/wire.copper.png
diff --git a/resources/assets/resonantinduction/textures/items/wire.iron.png b/resources/assets/resonantinduction/textures/blocks/wire.iron.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/wire.iron.png
rename to resources/assets/resonantinduction/textures/blocks/wire.iron.png
diff --git a/resources/assets/resonantinduction/textures/items/wire.png b/resources/assets/resonantinduction/textures/blocks/wire.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/wire.png
rename to resources/assets/resonantinduction/textures/blocks/wire.png
diff --git a/resources/assets/resonantinduction/textures/items/wire.silver.png b/resources/assets/resonantinduction/textures/blocks/wire.silver.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/wire.silver.png
rename to resources/assets/resonantinduction/textures/blocks/wire.silver.png
diff --git a/resources/assets/resonantinduction/textures/items/wire.superconductor.png b/resources/assets/resonantinduction/textures/blocks/wire.superconductor.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/wire.superconductor.png
rename to resources/assets/resonantinduction/textures/blocks/wire.superconductor.png
diff --git a/resources/assets/resonantinduction/textures/items/wire.tin.png b/resources/assets/resonantinduction/textures/blocks/wire.tin.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/wire.tin.png
rename to resources/assets/resonantinduction/textures/blocks/wire.tin.png
diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java
index 7ac9d34a..5206684d 100644
--- a/src/resonantinduction/ResonantInduction.java
+++ b/src/resonantinduction/ResonantInduction.java
@@ -34,7 +34,7 @@ import resonantinduction.multimeter.TileEntityMultimeter;
 import resonantinduction.tesla.BlockTesla;
 import resonantinduction.tesla.TileEntityTesla;
 import resonantinduction.wire.EnumWireMaterial;
-import resonantinduction.wire.ItemPartWire;
+import resonantinduction.wire.ItemWire;
 import universalelectricity.api.item.IElectricalItem;
 import universalelectricity.api.vector.Vector3;
 import basiccomponents.api.BasicRegistry;
@@ -180,7 +180,7 @@ public class ResonantInduction
 		// Items
 		itemQuantumEntangler = new ItemQuantumEntangler(getNextItemID());
 		itemLinker = new ItemLinker(getNextItemID());
-		itemPartWire = new ItemPartWire(getNextItemID());
+		itemPartWire = new ItemWire(getNextItemID());
 
 		// Blocks
 		blockTesla = new BlockTesla(getNextBlockID());
diff --git a/src/resonantinduction/wire/ItemPartWire.java b/src/resonantinduction/wire/ItemWire.java
similarity index 91%
rename from src/resonantinduction/wire/ItemPartWire.java
rename to src/resonantinduction/wire/ItemWire.java
index bbcd5d5a..20e1237e 100644
--- a/src/resonantinduction/wire/ItemPartWire.java
+++ b/src/resonantinduction/wire/ItemWire.java
@@ -14,6 +14,7 @@ import resonantinduction.ResonantInduction;
 import resonantinduction.TabRI;
 import resonantinduction.Utility;
 import resonantinduction.wire.part.FlatWire;
+import resonantinduction.wire.render.RenderFlatWire;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import codechicken.lib.vec.BlockCoord;
@@ -24,12 +25,11 @@ import codechicken.multipart.TMultiPart;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ItemPartWire extends JItemMultiPart
+public class ItemWire extends JItemMultiPart
 {
-	public static Icon flatWireTexture;
 	private Icon[] icons = new Icon[EnumWireMaterial.values().length];
 
-	public ItemPartWire(int id)
+	public ItemWire(int id)
 	{
 		super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "wire", id).getInt(id));
 		this.setUnlocalizedName(ResonantInduction.PREFIX + "wire");
@@ -77,6 +77,12 @@ public class ItemPartWire extends JItemMultiPart
 		list.add("Max Amperage: " + UnitDisplay.getDisplay(EnumWireMaterial.values()[itemstack.getItemDamage()].maxAmps, Unit.AMPERE));
 	}
 
+	@SideOnly(Side.CLIENT)
+	public int getSpriteNumber()
+	{
+		return 0;
+	}
+
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IconRegister register)
@@ -86,7 +92,7 @@ public class ItemPartWire extends JItemMultiPart
 			icons[material.ordinal()] = register.registerIcon(ResonantInduction.PREFIX + "wire." + EnumWireMaterial.values()[material.ordinal()].getName().toLowerCase());
 		}
 
-		flatWireTexture = register.registerIcon(ResonantInduction.PREFIX + "models/flatWire");
+		RenderFlatWire.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 368cf725..5d54005b 100644
--- a/src/resonantinduction/wire/part/FlatWire.java
+++ b/src/resonantinduction/wire/part/FlatWire.java
@@ -14,7 +14,6 @@ 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 codechicken.lib.colour.Colour;
 import codechicken.lib.data.MCDataInput;
@@ -623,7 +622,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 	@SideOnly(Side.CLIENT)
 	public Icon getIcon()
 	{
-		return ItemPartWire.flatWireTexture;
+		return RenderFlatWire.flatWireTexture;
 	}
 
 	public Colour getColour()
diff --git a/src/resonantinduction/wire/render/RenderFlatWire.java b/src/resonantinduction/wire/render/RenderFlatWire.java
index bc81228c..2489d404 100644
--- a/src/resonantinduction/wire/render/RenderFlatWire.java
+++ b/src/resonantinduction/wire/render/RenderFlatWire.java
@@ -3,6 +3,7 @@ package resonantinduction.wire.render;
 import java.util.Arrays;
 import java.util.LinkedList;
 
+import net.minecraft.block.Block;
 import net.minecraft.util.Icon;
 import resonantinduction.wire.part.FlatWire;
 import codechicken.lib.lighting.LightModel;
@@ -26,6 +27,8 @@ import codechicken.lib.vec.Vector3;
 
 public class RenderFlatWire
 {
+	public static Icon flatWireTexture;
+
 	public static class UVT implements IUVTransformation
 	{
 		public Transformation t;