From 47b845a67ad38f9549e502d2be492672989f9185 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Tue, 25 Feb 2014 22:59:57 +0800 Subject: [PATCH] Fixed solar panel and thermopile texture --- .../generator/thermopile/BlockThermopile.java | 26 ++++++++++++++++++ .../textures/blocks/solarPanel_top.png | Bin 2392 -> 3966 bytes .../textures/blocks/thermopile.png | Bin 1406 -> 2149 bytes .../textures/blocks/thermopile_top.png | Bin 0 -> 1733 bytes 4 files changed, 26 insertions(+) create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/thermopile_top.png diff --git a/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java b/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java index 78ab86a4..f2f12bf9 100644 --- a/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java +++ b/electrical/src/main/java/resonantinduction/electrical/generator/thermopile/BlockThermopile.java @@ -1,6 +1,10 @@ package resonantinduction.electrical.generator.thermopile; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.World; import resonantinduction.core.Reference; import universalelectricity.api.UniversalElectricity; @@ -8,11 +12,33 @@ import calclavia.lib.prefab.block.BlockTile; public class BlockThermopile extends BlockTile { + public Icon topIcon; + public BlockThermopile(int id) { super(id, UniversalElectricity.machine); } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IconRegister iconReg) + { + topIcon = iconReg.registerIcon(Reference.PREFIX + "thermopile_top"); + super.registerIcons(iconReg); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int side, int meta) + { + if (side == 1) + { + return topIcon; + } + + return blockIcon; + } + @Override public TileEntity createNewTileEntity(World world) { diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/solarPanel_top.png b/src/main/resources/assets/resonantinduction/textures/blocks/solarPanel_top.png index 3cf5bc322c93005f9991b0fa295dbb27ac2d12ca..bb6fa7c4b26d988d919c0adca831c655b659636b 100644 GIT binary patch literal 3966 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 diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/thermopile.png b/src/main/resources/assets/resonantinduction/textures/blocks/thermopile.png index a40786d429416b69e63abdcbce87c4bc102d4ce9..eb381e1d45c7f613de8099c5d050be991580e120 100644 GIT binary patch literal 2149 zcmbVNdpKKnAJ4GPwCK#%q3urNQrqNm5(!BqZbwjcX=JN1)kqFfNluysL7(jm-G32zL($k`u30Lc-;R!*U=P4i$(Q*!hNLEFj=B zu!ks~L{Et`942s!k;1+)UL0ObIFH81+A{$=1sxR-!E!F35DCRHx`KgyrAtTW>TLoR zcmb*34X|-x zQEO6u2%QbFHf*6Q1~yDCm(U4>sHiA>6d8|5LkS>_MpJ8$NH`RMlSPZ=Tm?=nGu>2x zU>Q#;kjMpy7*H#6gOLb11B-h4Is}o#)ANn6ShkTUG-U(@S3&^sM1n}9j_Va#CTGL{ zb>ppQ87Eo-6WFi}iIDQp^9V8BB%`_edqZj<>J8mnDnJi~D})eUga{VP-5~}R{etHU z_;fNvqfl66$c997b|HhHqZ0(#+Sph-JCbajY)RBjjkj@aSk@rbnFP`xkOYD*WLqj^ zOLHO;sWuSVnnodSa^1x;IakbsH|+{gyBl2M-*V~BQkW}8q#OhhZdQO#7$QexVTc59 z_N4-rhXi6i5+(ageLSzDg566Uj{hzNLP;PU^UoDooG2yoKMScUm-bqJCtO0!>iEb=S~8e2rE#UgO4VDzYQL$W^RdLt-QZyO zF{P~1e0spR8hp~aC9hDC#kY)$ZF5tXy%UeunMqO^^P}P01e_Y!w1tE0)e7t{l_L9l28A{vC z!K=j!&xRd1TO!Y|_3D-AFLN4-HJxVfyE+;Dlr{1jj&K5#71!Swcn6+zZQlA(ioeOH zR`vZ?6%Td)>a{t3JpnR>E0twOx`(AD+ji^q7SkTKVy0uZepX>ZE46xA5vXU@!1y8g z-2BZT@xS-$hvp|WF`L&_fAp9-Y+IfsPhAh1-SSZ}zwAOwM~u(F_fYB6vW&eQb(1L{ z8b3A3GZZr09J@=OrbNzN{6$#To2l#dfpGMP;gu7h{&(6FFBuvqUhH)HHqkfpSEvFy z^KQWV)&^Vpd<`tpy}t=HGVY=8dN}>8t(;I5?q=ajExAU$U6FmdSa%I$txqAw4U`^f zODzF3`r5EbzOkH^8#>h7?S}4MfO7DprgTsv&J+Q55X*>$H-8Vf$d1+FXlJ^2@O_eV zQ@mOOu5D{|ZGK*w+_J9U+-RrK5v=v0jHu^&)xaJkMm$@pW8)VT+Fu9Q;)HwR$o+K< z4<38qhOb=v=Z-Fe^s$gy57ImBtA5HCBRvD%gYKV1l}><$v#P>nym-rT&nN6Vy{(7;4(LqR6#qfH6Wz>i>R#OM@wI&n*GPHp8aPMI@$261T`qN- z^tLrsK#wQ&s5GzuH(-WN^N!N^fpfHO2#a%=(wbolNFJ6vIc$ zo_X)Dy(^W~PkwAcV(Tq2=9e8nqukp0PtnRBDsM5=y>l#m=c%HFM zE7GeV*s;85YwE)@#}b*A@#Srdqxy@&>l4XcA+?-6V?+D)UeaHkPRdK}TkHDB^$ zL=HVQH%s}eW&I4ix9OXf@zE2fyhNP)jrA4bHM+eX7gk%#s_}R*z3^`N?cZF}Dj%q} zJ7U*PIy5z{Sp#7{#lKiw%m_S4xM9d@tMywNx~yFMWVVKt&(qII8}>dtQfq!>>XcF3 zVr1mP>Ft#|Una|+%=qsB<2!^W10AqOCO-hPC#EhTfi9=CiI|Xk&P8KbrJnl7@9yFS Jl{g)Z{}17XfNTH& delta 1398 zcmV-+1&R9Q5dI2~8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0000QbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQ zF)>H;LN@>a1no&gK~z{ry_d;KtS@Iu6zL%=XsuWm4B?V3^a7okWI)!aYRKF zCy*%46OK4^oYD%$CW+blCMW*B%ej^}X_E%q#kp0ds?Jy68LH}kLt|s3Aw@++mY<)W zl!Af+D=RD0cxh>=)*y@{jF*&@SaET&6&4ms=vP)&YObQ9LOT8W`g+-dgDq=oYil(Y zs;a82p`pRr+JD-NK8Bs0oe~VItE;W9u1-2_O-+q;baY6kZE9*#ivWr}z}Pa^+S;ly z_Hf*mmX_q202?Or^75WYZf>q5Cnx8LFcz;#oqtZ;mOgv3w+O(L3D~W!uG-Mhkk~n6 z!umNn;IYTdg9$b|1Q;X5BGBC2ECL%F8?Pb|AeGcm;D5&n^z`&-0qvI%$94h~Y2XI} z54hOR6+2EzQ!?(=8(-Bbi(D=frCv zw#8eI0CN!FL~-gwfX$r1($bO^Q>Ilu;~*42yiI{I$T1Y7s50(HKqQia{H+ocy2wIsWreY8JOg@Vvz8# zXm)m1x#X<6SIjLgF521InQd=x+xq&tU0z<=(SOmA#y2-N?e_N8uCK3?DL`-#0W-A* z*h4iy3St7IqoXn+jMra1=9M|d*_@U!gnBtWJr&{e^K*@1gDn`$gNZ#?HhWQ+I3F-d zO+j1(mkq(*cLwQrd2(_h0(gFNb0d$Dg#5tV2`nru*!1+Y`WXNDbFh!Si6T5aJXEm}O6q}Q z$nCbWvSL?PR~jceti=XfFxUf3u$=%ODLRIJoEW6VyP27p6khO9^Q7I3E{+{>^3_q@^m20+iFG?RI;?*IS*07*qoM6N<$ Ef_-t2od5s; diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/thermopile_top.png b/src/main/resources/assets/resonantinduction/textures/blocks/thermopile_top.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b492e19663a201d4b03893c8e339b6f14c14bd GIT binary patch literal 1733 zcmbVNX;2eq7>>b?)T-5T6fDX%sDmQeZ0-#NNU}j-2y!W)&=Qi(AtW1j7f3j&HCRy` z52{8-JU~H5fm8=AAlIM;9dwl1YK7{6D701uEqGL@-5}WhaQxAo-TjVzp65Nj_nqAw z9kp!c^tsb%G}_GYFeH{50mtJ^r{1F;kB(4-Cn--P<1h`Gt;A89M2)4PK)6AvMPpH= z+OqZ%8c3r#Y4q`lWTGNcq{0kLr31q>8%z|NMhgr!o0O__lmyaHt==eR44!Ld0D85U zk-$^16eby}(}(5YXk1QIyecPM1*;jsK|r8cL*N90hnxj=zcpK>(l6gt$CDA6g2qSr8j!Q8(Wo;)-~D5nBLETnx$@ zuGWZRk~hx&Gx4d{)ELyD$V{z!e>$eK?xPE zH<5bG2sjj#X;>yHW>B8K3Bh1eDBcPiiHSr}DFe+)69_R`puymXYaC6GvFN{Uyc12t zTTCbzixOBSuA)PV5&?5Y9zxEF@yTTRO{6u4g&Ld zp&UfOhGlXN1WBX_A`}R?G6`EK6|(u08t>u?V75>$lL=r1VndLeBa{ndLLNsTVL^PE z43N zIRhzYKu2->r&uPps0wsU-S+lwF z*wZdRySs(kKKfewL6B=GbK^))R;{Yqqb{q2&s5H4FI=nDXl*zM2Cqc93M*V*khH)a zdA$H`TW|5IJD4CX%n|&a`?6E%!OBi4x&_Y0q?(w7&njkvx}dF^?4OwE>5 zHxzW_<3k&)`5ia-#A;{1+Lnq2o^1F|xA&a-G6?f+v)T#^t=pd7aeDo8yyMCFrrM*zik9{n5u*}So6oZQ zPo6z1+VznBY@furitStx z;C9sh-TsKq{m-vF^{VWxzp?8^2yFllDSaWmHGG)IiS%tBvNaYS??_s7#`^_#uWmbG zw|C3U!>f{AtMmNUbjed(m$QB8>e5I^mJ+PVzpHloD(~{0M0-GhHR9VT`3qWhPNf4s zA1?Yc1X|PrCO0mYiJ!gFYb<4h0rkY1btj!W@>1t5{@TXd zdop9dx3p@g<~R}8>OE4nvEr}c=J_6*XaWJ;mmj=jNUimZ*+rzat?;ImPb(Us2VDfq z`^DDyrt+qY+GEECPb_WjT6G~LsHW*?YwoPve48KQ+1Ht{asDFVr$kpJ_>`Rl$h&_qtcu2X@T%#->9VoL sn;BkaS4r|&77<@m9L%cGELY3hc501g