From ea6077ff175d26e396b8356251a7d909080ad213 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 21 Sep 2014 00:56:43 -0400 Subject: [PATCH] Tighten drawer rendering (no more glitchy seams) --- build.gradle | 4 +-- .../textures/blocks/drawers_acacia_trim.png | Bin 0 -> 272 bytes .../textures/blocks/drawers_big_oak_trim.png | Bin 0 -> 272 bytes .../textures/blocks/drawers_birch_trim.png | Bin 0 -> 272 bytes .../textures/blocks/drawers_comp_trim.png | Bin 0 -> 435 bytes .../textures/blocks/drawers_jungle_trim.png | Bin 0 -> 272 bytes .../textures/blocks/drawers_oak_front_2.png | Bin 577 -> 566 bytes .../textures/blocks/drawers_oak_trim.png | Bin 0 -> 379 bytes .../textures/blocks/drawers_spruce_trim.png | Bin 0 -> 272 bytes .../textures/blocks/overlay_diamond_cross.png | Bin 479 -> 0 bytes .../textures/blocks/overlay_diamond_trim.png | Bin 0 -> 602 bytes .../textures/blocks/overlay_emerald_cross.png | Bin 484 -> 0 bytes .../textures/blocks/overlay_emerald_trim.png | Bin 0 -> 664 bytes .../textures/blocks/overlay_gold_cross.png | Bin 508 -> 0 bytes .../textures/blocks/overlay_gold_trim.png | Bin 0 -> 628 bytes .../textures/blocks/overlay_iron_cross.png | Bin 485 -> 0 bytes .../textures/blocks/overlay_iron_trim.png | Bin 0 -> 392 bytes .../blocks/overlay_obsidian_cross.png | Bin 552 -> 0 bytes .../textures/blocks/overlay_obsidian_trim.png | Bin 0 -> 676 bytes resources/mcmod.info | 2 +- .../storagedrawers/StorageDrawers.java | 2 +- .../block/BlockCompDrawers.java | 9 ++++++ .../storagedrawers/block/BlockDrawers.java | 28 ++++++++++++++---- .../client/renderer/DrawersRenderer.java | 11 +++++-- 24 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_acacia_trim.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_big_oak_trim.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_birch_trim.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_comp_trim.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_jungle_trim.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_oak_trim.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_spruce_trim.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_diamond_cross.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_diamond_trim.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_emerald_cross.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_emerald_trim.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_gold_cross.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_gold_trim.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_iron_cross.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_iron_trim.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_obsidian_cross.png create mode 100644 resources/assets/storagedrawers/textures/blocks/overlay_obsidian_trim.png diff --git a/build.gradle b/build.gradle index 63b7909..8685b10 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { apply plugin: 'forge' -version = "1.1.3" -group= "com.jaquadro.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = "1.7.10-1.1.4" +group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" minecraft { diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_acacia_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..8298f609f6dcea6b4db2baf7a91c9ccb9b2598e4 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHFDRGS`aV|o-H#M9T6{T`<%i-hr(ug)8Q zLYxI2k;M!QTpvJ~(P@pz44@!Ox}&cn1H;CC?mvmFAVmQ_A+G&CTGRb>I@~qf=hsvN z1%o_Y978H@>GmFEJYc}Vbdj@3SmQUpq|fhWVS$x>Y(g4d#$rO&J}G&R7h46}To8D& zD59hM{q(|B&9{TBCpOKU9`XNDceUH`^=lTJ$j{Af&r;V9KgOX{$DmaJG@ZfI)z4*} HQ$iB}_bgHC literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..641054c556e4a0f4e5eef5136efebf797310287b GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHFDRGS`aV|o-H#M9T6{T`<%i=>Xivw9Yw z5NCl$WHAE+*9Q=0bXsFF11QLn?&#~tz_78O`%fY(NKt@Kh^wwFuYnw&rWDWNW6^Jb zf-ofE(knX z6wy)setO}m=G#Hm6PxBvkNAJ7yV~ve`ZbG9gTe~ HDWM4fyQxpQ literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_birch_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_birch_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..7c34b293c199be00357c6cda07201ed68c387c99 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHFDRGS`aV|o-H#M9T6{T`<%i^Rz z5NCl$WHAE+*9Q=0bXsFF11QLn?&#~tz_78O`%fY(NKt@Ki0jfR>FZ`>&g)K$>^fcu z6b$loaSW-rrQ3Uu@qhsb(?!lEVU6GXl0Ltig#}jju?cB-8H)*7`=sPOUThU?b3x$A zqKJ<2_tOhkHQx@hp4c>Zdc^-r-PLZ#*RNS@B0o2`Jxg6b{1}H)9fMW@&~ye*S3j3^ HP6p2abd=3`HrS4MN<8`(J5Bq77|dcxbedFpmBGUE*{Yh9pVSG(~1v7D6bB0%aV> zwr%HmKF{;IF640>D1jfKs;YkL&aK1el11lI-S{f-9wdzh7{6g`}kr zzYtpocisn9bS$vIg>KDIyx;Et2Oul444AYKqs7UhM0PaCKTT8DbxZ~jWVq|PMqc;v z9b(g501*HPg)2FolB{;+#Bn`S0^#f^7fDs}kp!(-5>qZSs%_T`Xm4V002ovPDHLkV1ix>uiXFu literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_jungle_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_jungle_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..8d5b98dd8cd8a27d92743e7362134e8eb105b9d7 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHFDRGS`aV|o-H#M9T6{T`<%i?sBr+#Q`j zA-ofE(knX z6wy)setO}m=G#Hm6PxBvkNAJ7yV~ve`ZbG9gTe~ HDWM4fyYW$y literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_2.png index 0454032e50ec2a7ce615d4937a1a2fdd67525dcd..8440a1e83c83c89a5b80e8431b40967ea42ad0c1 100644 GIT binary patch delta 462 zcmV;<0Wto;1hxc_V;%_<7Bn*|+BjtZ000SaNLh0L01EH`01EH{Laa2Hk%1F`jY&j7 zRCwBDQoT;XP!uloLJLI*wv7>GAx0MCqKk1dZax8%lZg-D>NB|c25vrpqZ@-Uu0{tJ z5@G^HptQ85M8E5S;|<>2o}PQocklW6PUhyB;zrHwz>`nZ-<3fp|Xmg_qWiXsV z3PkA+JfO+Vt8SW*oqkUqCO(8EN=P!xiNd#VFL8WyOKaFjdl7-Hlz?fPhz5l$lpf?L zh-J};u-DjTs2X9Bo8wY?bw}%b`m*SU_N&@iZZ7rlN$aXc@gKq0z(%2eoP#n=XMa54 zYc^~K)z1uW<{Vg!1;`$r?aPwNk*DYPf9e^98PZr{;W(z=J1K0+B=w*Sf+9 z+0iAuE+`Gg!ADZPfH(+li7C3IpB^;knOQuKD@8d-EU}HOZsm07*qoM6N<$ Ef&$&xjsO4v delta 473 zcmV;~0Ve*o1i=K5V;%??6BZ(tr3zF4000SaNLh0L01FZT01FZU(%pXik%1F`m`OxI zRCwB5Qaew=P!#4-=q-gpq2(2e34@7|#W-Q&#O~y5^f#FJi`?9Ga&>Ug&BtP56GWlB zN?$ypU%lme!^!RGx#xY(cjFhQZP%U0)|APl!6hMOO&u!p1Wy6K{hdY-_(RVtN)oQu zcQ4GNbGQv9HHjj5eESFk3JP(5mdmV~qfVD+ZSelgHZ&cA@B6!?24Oh%zy(z44z0W* zQZpli5O8zQ4=*ztOct_eGQk>!Ei$kD*j3NwaL{&CfoW+2gb-ANKsB^I@QD+IL!&~g zxy4-h3Q=#GPTMoInAx+#p>OY>`OUKB(mg)Jy1Y`@@OXWY%%iv_T`>t$&)@p|8XGgyvOtEl{} z8<r0Zx(22O2J_GHXan`Jmw5WRvftwrWf2#dmi|fv zD8yOd5n0T@!1V!y8J*Uc%m50qq&xaLGB9lH=l+w(3gln%ba4!+xK%nSkn4~Gk4v^^ zYuJb5mn$UoAMX4sxMo3}#n+c5TXyJV&hjZ!n;k35|GRLH>3mb3?3?>`UH;iL-}{8v zg}mJpm9x}eyChyOrX5Q^_UA0MK^7{AbI$X~_7DaV0w72&^zWjBStosK}hKQY) Ud>#Hi0s4-?)78&qol`;+02bAaGynhq literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_spruce_trim.png b/resources/assets/storagedrawers/textures/blocks/drawers_spruce_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..14c1c35ffaa83042d11f058a28a4ad48e6f4c689 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHFDRGS`aV|o-H#M9T6{T`<%i;VE=@5^d{ zLYxI2k;M!QTpvJ~(P@pz44@!Ox}&cn1H;CC?mvmFAVmQ_A+DYlD*iU=F2;&ql$Aj) z3i5Pu45_%K+k24lfB^^7Mb0K+jor62(+gKM-wv{#*fe)~#Q#g()o#bvuUTv&KR35MOI<(w7>80FgH{31bOujXKbLh* G2~7ZM&`^c| literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_diamond_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_diamond_cross.png deleted file mode 100644 index b9d2ec33157f98a4f2abd50ace3849d630c510a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 479 zcmV<50U-W~P)WdKxlWgs#(AVGC!ATls9G$1fBIx{vpH8~(HFf}kRnBn;700007bV*G` z2i^!81tk{o*o>F}000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003t zNklEvyh@u8BCLkEpAJv0IXJ@DFUPaeHZ^6LO zJ=2e>qUGjXN)Zgf(+b Vc1ICAjN$+Q002ovPDHLkV1jgb#cBWm diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_diamond_trim.png b/resources/assets/storagedrawers/textures/blocks/overlay_diamond_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..1f744464fca44c8f371461b41144b8a5126d7377 GIT binary patch literal 602 zcmV-g0;TWdKuQbRaS?AX8;@!na-rgAIgpT0B?OOrH9x>l@C*Dwkw7QG^|&iZNOo<;yDja? zN}RPlGqxl6{0UFb4|Wn`U6sThm0BgNf|pgp$Iw4riCSJQpS2L^7Iq*| zUO7o=TI)>8`w-bNTW>X8Wh3H@FbTf)!6iLMV&DT319gZj4o!VVNo?E7N$eLd=Fu5C zv;TNqrCRHdvUy8;=ns^GVqHfpYugy+IyGW94TPt>S;BAVchmFvh}#o#!RuXWcnnke zmZ=ZeE&E2x#L34EhK&b|n>D*bW>0s}b0r~s@n+OV$?W|eCkB13*pXpfzBCp0$Ix%E o{Po_3!AN}l&i`{dnIp*m00P_U50XV0;{X5v07*qoM6N<$f|Jbn@Bjb+ literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_emerald_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_emerald_cross.png deleted file mode 100644 index 88d4a296e76d6bbce942daec89a8ab87249c05f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 484 zcmVWdKxlWgs#(AVGC!ATls9G$1fBIy5pmGc+JAFf}kRABiPa00007bV*G` z2i^!81u8YvC*dUk000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003y zNkl2dF}MO1`o$iK-Y$W5J4LY#e4zH@Gry+VVI@>_0!cb{f*<>%AIU3 zMgHvm+$sI~BJr@dn}fC*Vo=tK3jh&9Mk>ma|48U`eDzQywu4M5i1D6Nu^qHs4;bM+ zgG)ZiwB*D3A*F2^_*#6Dm*1rH65EzzLU3zBF!D?(KN3u4#bWdKuQbRaS?AX8;000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0005+ zNkl}?MPTC8g~q;-=>B018XAkeaP z4tdC9{PO)P0Q{D}5Aw_cyW_ZCZ7fkT*grjLQ+D?mZsC>&@N3>%&7)w4g+!k5CWNrpZTIM z453-8TB}r5HPe~!zMbYA>_8dPk_xZW>IBuV3abHl`q1kG0p@PPHAyL`+}o%|zJ~IS0KJGDOTN7cM%ZF)BKgP>Fn2;2i;HOkP$H zyg_kJ2neU#I>ywE2F%Su;3jV(?bf{j26453@?Ue9>eV=}mS^krhvl#usf*e)tE5mr>B~nA(W|0000WdKxlWgs#(AVGC!ATls9G$1fBIx;spGBY48Ff}kR7#JEs00007bV*G` z2i^!81sf#~&Gz#E000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003~ zNkl4E7+qY^fH73uAh1s%CX+<|`(nExs81*gn?SRR$Ff3a zms_oIGW!jr6=)jLD4@6JbB#8p>i&GV_wq#`WX;nAg*2$z?oUo`^PcxJVnoUb^{PI8 zv9=rpP>M*A4&4lwW^3eXp9A`r1Nr_mFQ2a5EiGB+>lu(oXZ!*%JeEDAEvGU70000WdKuQbRaS?AX8;DAgu&nhy!qTuEPz`3IQKGGo60flsAjCt;k8b?Q&JQ z`N#KfWF(1}v*;=1ZIQ%e&fVD9FPo>Nnng2nYJY#GhtHo(4} zG|!Rp@ylBSWLhqoe=9$$w{Eo|Li7eRSu`Mf=MRqn<2)n6)0jX+9Tze4aRTp!7wA(y zeZ_>yGbN~>i070-EO8l#X*UiONnELD;i!MBOi@=ALYiSs!tIYaI+XwCBITL8544_ zFyq&nKKNdx?Z=%#^U(+HE(#XSp~WE{_cgWdKcYZXhx>AVGC!ATls9G$1lFIy5jkH8LPAFf}kRpN!f_00007bV*G` z2i^!811TRMJO_dR000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003z zNkl&Dkj13?f#6h#n*A+6Z|x27G=-HE^55HEkJ8|3Tc{xy0+#u)Q^-YU|E(Tc_huP?L?lN zkF#PX24wWaEXzbb(Fv$=JpaM-H(?~c8|>bm{psY!8+15a;Lcd*`bM!y#$rMq>1fPyUPj=qiz3>*8o|0J>k`S(3t978H@O`R0U*KEM!5*ah? z_x<)@#cxaXeV)1ns;;n4@X1L}E4WvB*MO&T-u`t4#vdx@-4uPW?|o%e7MD=hw_5u? z=c}hTrR+a+t#qjeC-2QziOD-oREwlWT3rj(;+V2(m6wP0yyuoZdpPP%Kg?S8a@xu1 zm$v2F1zmbPv9n|@TbPl$n68X@eO|*gi@y2*rsieyJofGj za-)wYNoZ`8;{VBVu|jJ16Q{|njiN42&X-LtIXsd&P~#Z)Na&hm`uSKc^Ni%V%?yp| g`_%Sv1ynF=U)$8Dv2ON%pjR0@UHx3vIVCg!0FR`R3IG5A literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_cross.png b/resources/assets/storagedrawers/textures/blocks/overlay_obsidian_cross.png deleted file mode 100644 index 2ba3bdf517249edc06d8c978f760121859845428..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmV+@0@wYCP)WdKxlWgs#(AVGC!ATls9G$1fBIx{jlGBqGAFf}kRTyH!700007bV*G` z2i^!81t2h9qWvHM000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0004h zNklQ};=ALGq z4fr@62nqYmOfqv$MB8=M>0uvV<5w($38a*$ly;D$3H)e|)oMj&7UFn;a&ZraA@jU6 zjp=z4&<()EEQcgApvN1} zKIm?s;?(GQh@<^$*aaK^yOZtX0d)$|X$;`l+j)^sns1n9uD9m8aS(ej$Rks4m=|ld z@F&1Ur^jyU%nW+VuL qIjZFvM$;kcyH{{Z#r#L|LJxlcccle@w|zPQ0000WdKuQbRaS?AX8;4_nws-hJD-2H~ZD%#rttxuh!ptcMyVwh|cY`9xFw)Zs^%`E~Iq9 zDy0I)7(Ft2yX)+RNHT{I?9Jk%56*>wMIfoE9*wOZQp(L@l#{yI4;$2{@@Z{0-O3{% z1qQ+^xBU(VdgESIPkOhF5ykn#RQ#osDIpqhRk#ZQ7Q^+cdzqV9=Z3eh?kL&sI$*&e zB4+cuTl!#A5`hzjlhTMm4JK(o6m$R8aPFc2IKhN7@Ia*HY&I`g0TKc@DK(TSaDm4N z5rDgdNJ?CUV&KSvVqBLJ0+3+@Gi1a^iB#$6nPVzp4Hv*&p4}EH;Kgb!L=y!TctfQS zz!N)l0N`QVEbj3Z^0M`?rfCr{rp|q$H>QFU zqzn50jM;lgmuG6gh2!DzGqOPxC_xFSP}LYyR07x97`~i;fcXc(Ky7Yg8rB;C0000< KMNUMnLSTZLcOWhR literal 0 HcmV?d00001 diff --git a/resources/mcmod.info b/resources/mcmod.info index ab7285a..01e98a7 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "StorageDrawers", "name": "Storage Drawers", "description": "Multi-drawer storage blocks for quick storage and retrieval.", - "version": "1.1.3", + "version": "1.1.4", "credits": "By jaquadro", "logoFile": "", "url": "http://www.jaquadro.com/", diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 90732e6..828cd52 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -26,7 +26,7 @@ public class StorageDrawers { public static final String MOD_ID = "StorageDrawers"; public static final String MOD_NAME = "Storage Drawers"; - public static final String MOD_VERSION = "1.1.3"; + public static final String MOD_VERSION = "1.1.4"; static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers."; public static final ModBlocks blocks = new ModBlocks(); diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java index 1e54dec..243cd0e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockCompDrawers.java @@ -31,6 +31,8 @@ public class BlockCompDrawers extends BlockDrawers @SideOnly(Side.CLIENT) private IIcon[][] iconFrontInd; + @SideOnly(Side.CLIENT) + private IIcon iconTrim; @SideOnly(Side.CLIENT) private IIcon iconSide; @SideOnly(Side.CLIENT) @@ -63,6 +65,12 @@ public class BlockCompDrawers extends BlockDrawers list.add(new ItemStack(item, 1, 0)); } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconTrim (int meta) { + return iconTrim; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { @@ -131,6 +139,7 @@ public class BlockCompDrawers extends BlockDrawers iconFrontInd[i][j] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_front_" + i + "_ind" + j); } + iconTrim = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_trim"); iconSide = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side"); iconSideEtched = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_comp_side_2"); } diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index d66a4e7..a83f326 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -49,6 +49,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH private IIcon[] iconFront2; @SideOnly(Side.CLIENT) private IIcon[] iconFront4; + @SideOnly(Side.CLIENT) + private IIcon[] iconTrim; @SideOnly(Side.CLIENT) private IIcon[] iconOverlay; @@ -57,7 +59,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @SideOnly(Side.CLIENT) private IIcon[] iconOverlayH; @SideOnly(Side.CLIENT) - private IIcon[] iconOverlayCross; + private IIcon[] iconOverlayTrim; @SideOnly(Side.CLIENT) private IIcon iconIndicatorOn; @@ -392,6 +394,12 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH } } + @SideOnly(Side.CLIENT) + public IIcon getIconTrim (int meta) { + meta %= BlockWood.field_150096_a.length; + return iconTrim[meta]; + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon (int side, int meta) { @@ -427,6 +435,14 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return getIcon(blockAccess, x, y, z, side, level); } + @SideOnly(Side.CLIENT) + public IIcon getOverlayIconTrim (int level) { + if (level == 0) + return null; + + return iconOverlayTrim[level]; + } + @SideOnly(Side.CLIENT) public IIcon getIndicatorIcon (boolean on) { return on ? iconIndicatorOn : iconIndicatorAmber; @@ -453,9 +469,9 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH TileEntityDrawersBase tile = getTileEntity(blockAccess, x, y, z); if (tile == null || side == tile.getDirection()) { if (drawerCount == 2) - return (level > 0) ? iconOverlayH[level] : iconFront2[meta]; + return iconFront2[meta]; else - return (level > 0) ? iconOverlayCross[level] : iconFront4[meta]; + return iconFront4[meta]; } switch (side) { @@ -491,6 +507,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH iconSideV = new IIcon[subtex.length]; iconFront2 = new IIcon[subtex.length]; iconFront4 = new IIcon[subtex.length]; + iconTrim = new IIcon[subtex.length]; for (int i = 0; i < subtex.length; i++) { iconFront2[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_front_2"); @@ -498,6 +515,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH iconSide[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_side"); iconSideV[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_side_v"); iconSideH[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_side_h"); + iconTrim[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_trim"); } String[] overlays = new String[] { null, null, "iron", "gold", "obsidian", "diamond", "emerald" }; @@ -505,13 +523,13 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH iconOverlay = new IIcon[overlays.length]; iconOverlayH = new IIcon[overlays.length]; iconOverlayV = new IIcon[overlays.length]; - iconOverlayCross = new IIcon[overlays.length]; + iconOverlayTrim = new IIcon[overlays.length]; for (int i = 2; i < overlays.length; i++) { iconOverlay[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i]); iconOverlayV[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_v"); iconOverlayH[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_h"); - iconOverlayCross[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_cross"); + iconOverlayTrim[i] = register.registerIcon(StorageDrawers.MOD_ID + ":overlay_" + overlays[i] + "_trim"); } iconIndicatorOff = register.registerIcon(StorageDrawers.MOD_ID + ":indicator_off"); diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index 9dc8975..ea65238 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -70,18 +70,25 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler return false; int side = tile.getDirection(); + int meta = world.getBlockMetadata(x, y, z); double unit = .0625; boxRenderer.setUnit(unit); boxRenderer.setColor(ModularBoxRenderer.COLOR_WHITE); for (int i = 0; i < 6; i++) - boxRenderer.setIcon(block.getIcon(world, x, y, z, i), i); + boxRenderer.setExteriorIcon(block.getIcon(world, x, y, z, i), i); + + boxRenderer.setCutIcon(block.getIconTrim(meta)); + boxRenderer.setInteriorIcon(block.getIconTrim(meta)); renderExterior(block, x, y, z, side, renderer); if (tile.getLevel() > 1 && StorageDrawers.config.cache.renderStorageUpgrades) { for (int i = 0; i < 6; i++) - boxRenderer.setIcon(block.getOverlayIcon(world, x, y, z, i, tile.getLevel()), i); + boxRenderer.setExteriorIcon(block.getOverlayIcon(world, x, y, z, i, tile.getLevel()), i); + + boxRenderer.setCutIcon(block.getOverlayIconTrim(tile.getLevel())); + boxRenderer.setInteriorIcon(block.getOverlayIconTrim(tile.getLevel())); renderExterior(block, x, y, z, side, renderer); }