From caeb17d4ac27e11870202714f753e32efd8b87c9 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Mon, 25 Aug 2014 00:44:55 -0400 Subject: [PATCH] Multiple wood types, recipes, fixes, rendering, etc. --- .../assets/storagedrawers/lang/en_us.lang | 29 +++++ .../blocks/drawers_acacia_front_2.png | Bin 0 -> 478 bytes .../blocks/drawers_acacia_front_4.png | Bin 0 -> 520 bytes .../textures/blocks/drawers_acacia_side.png | Bin 0 -> 393 bytes .../textures/blocks/drawers_acacia_side_h.png | Bin 0 -> 403 bytes .../textures/blocks/drawers_acacia_side_v.png | Bin 0 -> 410 bytes .../blocks/drawers_big_oak_front_2.png | Bin 0 -> 451 bytes .../blocks/drawers_big_oak_front_4.png | Bin 0 -> 473 bytes .../textures/blocks/drawers_big_oak_side.png | Bin 0 -> 367 bytes .../blocks/drawers_big_oak_side_h.png | Bin 0 -> 387 bytes .../blocks/drawers_big_oak_side_v.png | Bin 0 -> 395 bytes .../textures/blocks/drawers_birch_front_2.png | Bin 0 -> 499 bytes .../textures/blocks/drawers_birch_front_4.png | Bin 0 -> 545 bytes .../textures/blocks/drawers_birch_side.png | Bin 0 -> 406 bytes .../textures/blocks/drawers_birch_side_h.png | Bin 0 -> 421 bytes .../textures/blocks/drawers_birch_side_v.png | Bin 0 -> 422 bytes .../textures/blocks/drawers_front_2.png | Bin 472 -> 0 bytes .../textures/blocks/drawers_front_4.png | Bin 499 -> 0 bytes .../blocks/drawers_jungle_front_2.png | Bin 0 -> 484 bytes .../blocks/drawers_jungle_front_4.png | Bin 0 -> 520 bytes .../textures/blocks/drawers_jungle_side.png | Bin 0 -> 384 bytes .../textures/blocks/drawers_jungle_side_h.png | Bin 0 -> 404 bytes .../textures/blocks/drawers_jungle_side_v.png | Bin 0 -> 405 bytes .../textures/blocks/drawers_oak_front_2.png | Bin 0 -> 577 bytes .../textures/blocks/drawers_oak_front_4.png | Bin 0 -> 596 bytes .../textures/blocks/drawers_oak_side.png | Bin 0 -> 452 bytes .../textures/blocks/drawers_oak_side_h.png | Bin 0 -> 481 bytes .../textures/blocks/drawers_oak_side_v.png | Bin 0 -> 477 bytes .../textures/blocks/drawers_side.png | Bin 489 -> 0 bytes .../blocks/drawers_spruce_front_2.png | Bin 0 -> 479 bytes .../blocks/drawers_spruce_front_4.png | Bin 0 -> 501 bytes .../textures/blocks/drawers_spruce_side.png | Bin 0 -> 385 bytes .../textures/blocks/drawers_spruce_side_h.png | Bin 0 -> 391 bytes .../textures/blocks/drawers_spruce_side_v.png | Bin 0 -> 407 bytes .../storagedrawers/StorageDrawers.java | 7 +- .../storagedrawers/block/BlockDrawers.java | 96 ++++++++++++--- .../block/tile/TileEntityDrawers.java | 12 +- .../client/renderer/DrawersRenderer.java | 110 ++++++++++++++---- .../storagedrawers/core/ModCreativeTabs.java | 19 +++ .../storagedrawers/core/ModRecipes.java | 22 ++++ .../storagedrawers/item/ItemDrawers.java | 2 +- 41 files changed, 255 insertions(+), 42 deletions(-) create mode 100644 resources/assets/storagedrawers/lang/en_us.lang create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_acacia_front_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_acacia_front_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_acacia_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_acacia_side_h.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_acacia_side_v.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_big_oak_front_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_big_oak_front_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_big_oak_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_big_oak_side_h.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_big_oak_side_v.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_birch_front_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_birch_front_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_birch_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_birch_side_h.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_birch_side_v.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_front_2.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_front_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_jungle_front_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_jungle_front_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_jungle_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_jungle_side_h.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_jungle_side_v.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_oak_front_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_oak_front_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_oak_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_oak_side_h.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_oak_side_v.png delete mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_spruce_front_2.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_spruce_front_4.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_spruce_side.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_spruce_side_h.png create mode 100644 resources/assets/storagedrawers/textures/blocks/drawers_spruce_side_v.png create mode 100644 src/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java create mode 100644 src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java diff --git a/resources/assets/storagedrawers/lang/en_us.lang b/resources/assets/storagedrawers/lang/en_us.lang new file mode 100644 index 0000000..c22a950 --- /dev/null +++ b/resources/assets/storagedrawers/lang/en_us.lang @@ -0,0 +1,29 @@ +itemGroup.storageDrawers=Storage Drawers + +tile.fullDrawers2.oak.name=Oak Drawers 1x2 +tile.fullDrawers2.spruce.name=Spruce Drawers 1x2 +tile.fullDrawers2.birch.name=Birch Drawers 1x2 +tile.fullDrawers2.jungle.name=Jungle Drawers 1x2 +tile.fullDrawers2.acacia.name=Acacia Drawers 1x2 +tile.fullDrawers2.big_oak.name=Dark Oak Drawers 1x2 + +tile.fullDrawers4.oak.name=Oak Drawers 2x2 +tile.fullDrawers4.spruce.name=Spruce Drawers 2x2 +tile.fullDrawers4.birch.name=Birch Drawers 2x2 +tile.fullDrawers4.jungle.name=Jungle Drawers 2x2 +tile.fullDrawers4.acacia.name=Acacia Drawers 2x2 +tile.fullDrawers4.big_oak.name=Dark Oak Drawers 2x2 + +tile.halfDrawers2.oak.name=Compact Oak Drawers 1x2 +tile.halfDrawers2.spruce.name=Compact Spruce Drawers 1x2 +tile.halfDrawers2.birch.name=Compact Birch Drawers 1x2 +tile.halfDrawers2.jungle.name=Compact Jungle Drawers 1x2 +tile.halfDrawers2.acacia.name=Compact Acacia Drawers 1x2 +tile.halfDrawers2.big_oak.name=Compact Dark Oak Drawers 1x2 + +tile.halfDrawers4.oak.name=Compact Oak Drawers 2x2 +tile.halfDrawers4.spruce.name=Compact Spruce Drawers 2x2 +tile.halfDrawers4.birch.name=Compact Birch Drawers 2x2 +tile.halfDrawers4.jungle.name=Compact Jungle Drawers 2x2 +tile.halfDrawers4.acacia.name=Compact Acacia Drawers 2x2 +tile.halfDrawers4.big_oak.name=Compact Dark Oak Drawers 2x2 \ No newline at end of file diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_acacia_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..e891b3bfea5b680c28f290349437521cd8d7cb0d GIT binary patch literal 478 zcmV<40U`d0P))Y0?m zUHXK|4^58w0rT6d89al=Wjj%VY^zE{)`s9Es+fM;Xj$tj9IM&2fA6cBoM2A<6?;p}wjk4hQcEA7C0spDaBj|iuE*@V}9pIbs7)-hi1K$Cnv=dj# z_3A<1=1t(bEvmJ#uVRp1BQK4=>mN-L4!{yl=M7La5`vuf=?3OkNjgwB7>S#qKQ*%c z)YLQ4P6XCrAk$lbGce$FNR!Ito&W#< literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_acacia_front_4.png b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_front_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c4e4a9464281966126bbdaf6dbe66aa41a98eb2c GIT binary patch literal 520 zcmV+j0{8uiP)*zU46B%Qyrm zIaIm*&1KAoP$=VdhzX~D5~@%sp-ynv=Y|4MB`>SFma9d?!Ta7+MaTVQ#X-6FwpoFi z5};!n#T(4_iXDmg8o3H4%+F9EatD+?re*5jjb^}say8UUZdy1~m7y89Dtbdx zH1!AE?ZF;y0I4WFu--aA0Is{@o9BQOgW^h>-egTqdgH;43^D%|l;YtaJsjW$X9o)K z9PFe)gM-lw%>iS^D0BcfI1h8Mzcf^zc_bYwFkYK7Yw$NXT=^FtJ>)7X3A7IY0000< KMNUMnLSTYoC*6Ml literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_acacia_side.png b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_side.png new file mode 100644 index 0000000000000000000000000000000000000000..764991fcc51590d3cd854c19bb183e40d54547c4 GIT binary patch literal 393 zcmV;40e1e0P)udl3000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP0003PNkl3^b9`QdJcL5jD{E$G-Z`v9F#U zPfOaUo;C*9>kvMdRegVeWPBd(Zz-+QB@Io)6%OnjH3~woq#{4Rey~Orq}F~L`c86b zElxfRmg(zTa4ss>D77?2TBz?JGMG^0O1k3g3QnO-Yhkdc3V>E&gA$EYsikQ!m{yAH z8A_qP8*03b^AS-iSwCK<2Kg^yZ`@Q>29ad1wEqchc`W|L43m4P&1t0rw7!I4*w5&f zTssy=b@pjE$f-RHG4F+V9P$?&>nsOJ0!E)8%87a00000NkvXXu0mjfiW{8e literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_acacia_side_h.png b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..b2f4eaea55cff2169d8d15d9fdfb51e41402f308 GIT binary patch literal 403 zcmV;E0c`$>P)0wSQl~u=p{Sd;>yy)34Fd3i6yIV@ja7tYjam4}qkt!tt%%R9H@87Jbl61Gf zb!{WDwB*CK7%Ic>pYR+i*C@F(M4G5=U^19d#B#Xs>)8^1_s45*K#Mcq3aZJs zuW_rP6sI-psHGFeVLzjDANMmc9NF22RoV>fbhJ_Z#Hh?q+V573nB07V%;`9~RH#PgWJ*ROvtz8wghJO)EvD1O7f6)K{002ovPDHLkV1g*3vk3qI literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_acacia_side_v.png b/resources/assets/storagedrawers/textures/blocks/drawers_acacia_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..c94de4b1794bf2f08a895acdbc97ce28c6e8afc5 GIT binary patch literal 410 zcmV;L0cHM)P)jfs^^Za;k!Zxj8I5_;`@cupH@Nm~-2UtRmUO#?_uL6=C zvD=PNVK^OAEYw3@geueJFYy$*#K?L$WH{032#`dmzJ@Ho3p>~3Ql-Kkbtwyc7o#XGl<)?;cW)(I-`CM@SA{nKvpLVsA5s@%HNZicP5E7~g3AxSvd zLp8^lzyo{N3E>n5OOiC=VW%^_gATAu>^_gizjt68<3i}Selp%mg*sZvO!fmZVG4Bn z^njS`wWT-abIkAX_BF~#8#80_cr+OIVV>4F94uG90s%t8h8aN8p8x;=07*qoM6N<$ Ef)i}6UH||9 literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..2870a42e8b2f44e8f2c588a1e8a2d0abd1ac9b39 GIT binary patch literal 451 zcmV;!0X+VRP)eZ7FR_&n~rsMfzZ?VQ2!{WuiF)1iY?LZtNP&##rhs#5FNV*m2s zVFB`v+Q!6``o_T%CXQNE8RiJI&)%~7hG2(j&Zo#wMQGBLMiIM&H(WXHEa8W?w+h9} zsZt_iPz@XLaC-|^2y-496%O7NXk9@TF8jvhjT*zuLw|gaHM50W;qgmNwbR}r$~CA# zmi=*EuR7p=-#6C=9K9XSwGQG0lh~ZbiD!T)ZO$Y!2uRkx+veU|3d?$umY|VHBeULW zB7U%h>{cokLJ$*MUjV--ZdGEIFd6z=RFtf>1<@ix)*+$-zy=J64z31~o=RQJ z@A9tU>zZaPv+nN~k(R%=3yUWSUD4r!kP(co;bb6+s<=R+$MHFYub`)Q|}HrUZy za=PGBv>csj*o>1@@!Znqnu0lXL6dRRWzl~6DN85VRK0P4c54)$y0uq9a@Aw&9ahb9 zyJ185)_K;^nVV*kmvTdq%rQ$Lk58K+)LG%cMR63fFwam-7ef~X@1nVmxq;TLhX-;W za0UH85p?C&mf+w|2Y&Z_t0shkr|7Y-?+mUnQkvR2T>IK7-{(H7aIE9bfwLiCEX&0h znP$i`?moI=sxnIz4B-@Cr>}$wF5?HM^&o@?NMQuI%?XB!smTYvPpzfkK=G z9+AZi3|t>Tn9*sC$qb+%OS+@4BLl<6e(pbstU&%hPZ!6Kid(5cj(mpVitc^-&C6rbH$#Y=D#Md{;E5_>8FXzlZ^k%nxEWNd+hT;|E+F3*PqEJ z4lUeb)TgskP9VfJ;HmauTlSvsbLP28`6XXGU$*yHc;@UQa(3N6cU=0o_p3cHBp5th L{an^LB{Ts5c0!Qi literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_side_h.png b/resources/assets/storagedrawers/textures/blocks/drawers_big_oak_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..0798dab74635f06bcb3558684f4bb70e5a3032ca GIT binary patch literal 387 zcmV-}0et?6P)-D<-y429!Z{educ)yu(NVDJAryVzZzWw4GliIaWqNi?yV){!My=N!rD?d54I zOS3J@i9M%un`YT@k!gHhPhFYkpQ#)zbHs>AI2Fom``%woUL|SwYu$c_K`j|81yHWT zh!wr}W6Q1(x0C?M)`=3^!fT!%!Q=`_G|jaB`1AL#%8PInJMfCgx6%g&QeW(a$bspFA6Qj9-e?{ith z{^b-oQ;hd{k?lX2ncw$kUzX*6F0VOp#Tc$5#>d+WC!k!Z>wbq@Rw$62_|CbbLVv0O zQYqCc98k2vrf(r8wI#x5TA`X_4y$;0 z`%}X&Y06%YwAyf?f}1eq&HmydgKA2Zul$^nMOJNbW~?S1Nye!?SaZq*5B6aa#>rwx z(lgE8!$D_#2k%gqoI@EsPkT|P6eeP#f3h};t%9xA)=be-X12hO&o2mB0WE#4@Ha)) pyScZO#?a>3%G5F5OMgzP`~Z#5!QDJlN6`QP002ovPDHLkV1m7Er8xiq literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_birch_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_birch_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..1f1afac49de5ab872ce6844279d739b22257be10 GIT binary patch literal 499 zcmV(y*000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0004kNklB$gI3blOu<@uFU!1k@k4`_dWb_@&9j_3#xva*i77@j1_U^%MHleb6&p@>vkAx+FA zC`)GYP!>&qqe)9QikJ$oarzi~J|48KDzMNdZ$Qr^k`WtR|OuWNd6Y`9H*DR<*qi+CvRDkh!bX*RKwEyS;6lyT9MP zy16%Xkc^2An3U;g28a^JjR;Mz1fn(Q_Y~Fr-gKHz*gL23NgA52&Hra}@npP6sh#+++i+Pd*Y=HsN!Bko;&jD1*3@Jne7{E#g p{Y!)OcHo%*_M#f6py-ve06ouVTLX!~EDy~`~@edLMyaG?a2s^OwLc9VSBO@CV5@LY`5I+(FjYvg9 zX+xp>eC`cVEX%n*IoH1DT$c_H_6O;w`X3XH&FYk`PWMCN;(%%KSy`J|UTB=2KQL#S zwQ69)1}9*ioL)1*XO|j)Wl6O?Yin~|0$+IpfA|>nR&-74VAt_Vo=p(PiAms=xA-;G z{^IJqB*!XATR)A^Ax`2pM<_KUfJ~8AUMSEA&1z-kAlU}4$NcSmW;dw77S#Oge~5H+ z`;I4I((kc$(;j4VOI8e2x58JumD{VQfl||RHK>6OgAq>9Np6hji?f@ev$?rs8pl|iZGsa(czNkY>fI9g$gR)S$1}f8h0G~k6P#9{9vYz0V19_-IwXN@)OwOW za75;~TlrGuP7+xt<44{ya`GFBeSiQBvV{ZEhrH9skYtK6eW1;>LWj^Gmw4W}iPJ#ND=424xkX#9h~0i3C4=moO%Hn~u)(0g<%vUJK+ptF}4uu)XDizLXSDA9Bx z7_>}2ksnPxz3+Ep|8L@2X3wyhP1@gq_j*BT@!Gz<8aH(AugnX4VgvgUMR0~to_>BD zEqhtSR*sdMiehdE8^0{7bf<=N%IlA%bj*hgC)!kiOav6M5RN+eL`^E|hEPGg3;G4*bpJmb?Ywce8D~30G~v(j5Otw*#H0l07*qoM6N<$g1B9( Avj6}9 literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_birch_side_h.png b/resources/assets/storagedrawers/textures/blocks/drawers_birch_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..0fb0846e8451c7c61d3ae03edfc18daa2af72e3f GIT binary patch literal 421 zcmV;W0b2fvP)!?&o0SXWHheYpDSokmJT`V$g=(Dg=f%stdwKXRWC(9KfT({YI7OVxz2+AfbrfBi~5**Orx4h?BVBc zFA49(>P%x_UbQSvbyF2ZzO1`gLoSXrOsKgN%JFta`#w%*qBx>^>t<>dFv-J4z4acI z*-2Zg#fZqL6XXINP(25M5tY|YMiC#7(;W0lqw9-#Y47%K=r-Y(y$1LX$7Hh1ociQs P00000NkvXXu0mjfe>=4d literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_birch_side_v.png b/resources/assets/storagedrawers/textures/blocks/drawers_birch_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3c3c33d8c59ab05c870cf690fe0d05947fbcd4 GIT binary patch literal 422 zcmV;X0a^ZuP)Wb#i+on$95%>u_chS>2S~x+&Fyv35BvU5R~Pt%^Sph7v)MGT2&Pn3 zK0R)QR}nIc-1@S7eLvJ~yntHC(Ie=x|L7vlMUOv!S51f|G*z%r+km7PQGX3p5Kn0B z$yTYuJX)1NLwAZ~s!23*#uZRYj3%jV>KtE%PCTC?S0Yb95ub=@UGX2&O&-jLtX$`5 zO4H4L2=a-CGwPsZ7}b!)u@Z1V&n96QA%c{wjA@whjPKwRR0%ukYMi_SWxRBPdHW}$ zO&#)TMKP)e;3c-e_?(PLC2{TIQ|J%i1=gEct~4BMp5JYZao7K@t21`~2YX+=?$3m` Q9{>OV07*qoM6N<$g7g!w8UO$Q literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_front_2.png deleted file mode 100644 index 68274cfa217474d152d8c97534fa56cbeb3ca3ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmV;}0Vn>6P)WdKxlWgsy*AVGC!ATls9G$1fAIx{vpF*qPCFf}kRcSfef00007bV*G` z2i^!60yi19)j!k#000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003m zNkly=nqc5QSH{k;K2oNGhMfCXHa}8(0d~mVz(hOQf_Gt27~HDnU$RAqe88 z(PUYyJl7A0A>QILbN1|Q_;5WeK1=* z9(#GIMFsibsnfTQdmk7z4jqNuij0Jn_~0iA-Zk8?q5YO`NE-g}Y|HS3BLx`OYW|xp zf@p#$MzB$@1kl#C5(eo9{coM{Olaxn_*c;L2G!G5P8kAw;aa~I3he?nzqw+pa7{D- O0000WdKukZXhu?AVGC!ATls9G$1lEIx#XjGB+SCFf}kRBDVl_00007bV*G` z2i^!2106F-5$~k{000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003> zNklKT88a5XCRY8Z>$~CI~_b8-pMy7J_0U2qKo(Tig5L{04pkLA0?52y&Ok z#Pd)Kf4eUk1|9Zb_RXKS^X59Y*T+rsm1SA4*Uc6NqN_qOkd?5M1C{6dM+aL^FB8t* zPXF>`R~h((#&1*3)#>Q$aQpM;J192n4{pjre%rP*qtRfkz%MUGfYoeD4o)yepv)OH z9#Jt)uD6cs%3|u|Q$d!K%^8$Uz@DUWK_H1diHa*=;Io#bs*S`Ul_Vi%k>T$C(aUG{ z@LV^|tDg$Fa#P*!!PesO_?FEg79cj-vjiI8Be^mFJ$+~I}rpJ5+ zGNcUlXGE`ZDyzf)JiilgaSCLNT)fY^<*awHc;PT9CcLXsgBIChs2| pes7`ty4-PSBgg)5R6~5k-s{29JE5-4&UaO{_FhVQ3JP-S1 zH-e_wU6P*qkJ?jkDh#=x2PLM%V(6pq`8-h=5>|76SrHi~W@WAgPm=YhA=s?EXigQJrR zlLv8vB*x9{Al(5{DsGXp>>x=Z?dFO$-bb)BP#H%C>VG*AKPXXMNkcshs$cOO&0000V~j?l#G<7o($Z?w zuTH6ig*U@x?wOf;XU=Kv^1L4ev9er-p|O|L!rN>v{^}w#&)>=M!QgQJX6#`{d+oMu zkqwT64R0L`yx;2rs#5y(9i9!k;#4=Rx*1T@sM%G^;HYUj&eRW*0$zD>9jmPMI=fO# zApHE0e#Xu-`yvX*j#tzxfcdOZViJ~K*||uLHLHfjag@H0q3lt#kkOf&W-4ZhqwBlu z{yZjGB__>~s_R7@T~A&Jl$d#3KWy4947{l*500OM)~ts$a@TMH)qgVRs$>>$;NVXO zeyeZ*s3lf zPnhKv4B-U-o!%u4FqwgX+y@&Ja2(xFM2AJB3FA~2{Q#C!+Lb`co!vrd;XqpD?o0=g zRTw~rOlArgLms3VK)HUY!!Xq$`=oK|W_k77hOWog+0LdZv;6=DTqd literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_jungle_side.png b/resources/assets/storagedrawers/textures/blocks/drawers_jungle_side.png new file mode 100644 index 0000000000000000000000000000000000000000..66df934a04a034796a1e3a05d651edd3990822a9 GIT binary patch literal 384 zcmV-`0e}99P)O=?0x5QJ4a{=9$@BY_C+yn+YF4LnOumK%5gmma`{BmqqX1^<#P@=0mY_=d;4 zo|>Aj>Y1*-jz|0bPvts_qR!lkyYKBzaUL*(-}q&8Ivv-Wb@!pml7M+w>4*fVtwy8y zHkpP{ku>|*^HZOITnaP-mCxk|QAWMgmJv+WY?M83EASFcKBO)RMr8o6BqI=FtCylt zuve&A!A|V9n6IMD$n|8O0;A0EF}t$z*^+O`C*kQ?GHA}Z1{bGHnd+Oka^54q(T!aX z<7AJ#E$M8)Iuf68OY~WO={)PD(6>p*arpaH%5sB{70~IWP^GwbkdUacv$H1Degi&>pUm3EnphD-O<_(G|Byf;3Rw6f!;LTM z=5Fup?7KHJZ?|?e>@Sz=tQvXVU~Z-Q+u~hu9AqXw!^{3^^*Ni*ItLw=1kC5zp^^Z# z)okux-`*vmO497#j(aBr)KZ|4V0n6eB#Nk)+A@O3Jqu;e+X}pdlLx9DgHZ`UE5!(e zSnAF+4Ax3&WUvye&8IJ0(>J4W?5vxslG&t;VEQMc8k|O}s1tmAZGI&24lYik0GYFH zff6~Ilv@urCl4{zov3ok6wkyph8ow~e{-b?j*51?+qCiFb#c}$ zyy@3n-BsPw-OJguX*QkRsj7YMe(b%iK4s?vGWg6crt9_h@?$wX9P-4txnE$MPsZFh z73%d4uC8xGsknR-8`bYHoE)F>q?QbwfaU4=5i5JYet)D#AsqlX!$NZ!Rqz`vsZg~H zg%_=$>02I4ZJQ=$tw0@UIve4LT5a|45?N0%TyXduQd;CkkqM_%W#<1WITKtzwqvz) zQMF@*-OZ^IIMBr;c9=y7AxSRd9txe?|BwTs=GJQD{~+=^ro_DSFVigsua=tu9Be@z zUtSQZ;&gd2bXjj_tJhII$h*xL=dY`?qgu>=aYw@GTaBr#00000NkvXXu0mjfWCEy) 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 new file mode 100644 index 0000000000000000000000000000000000000000..0454032e50ec2a7ce615d4937a1a2fdd67525dcd GIT binary patch literal 577 zcmV-H0>1r;P)WdKxlWgsy*AVGC!ATls9G$1fAIx{vpF*qPCFf}kRcSfef00007bV*G` z2i^!66BZ(tr3zF4000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0004) zNkl(Ns9fI%syQBtTIQGB=ROt?_ zydqLFBZCldbI=bjGaF16vS>2F8ig$~ul?9n&*pH@c2t3BX#<21RD(b@v_0^N6NE#f zLaVvOT=@!7Z<gRYA1t52`qN@22GCITgNs9%rx$9+VH1T@he=}H)Q>&=_ ztQ(k6J+_4GVL-iDVt%ku&Ih0lipzqBEhRe#%~gC6tb%+-hK+F?F_DzhqC21COkH;{ zwio_S0vn(>@JLfaRzQaIArzVpH#o=fyx9`*q#=|PnSa~ZjQM5LT|@Z`*PzNjk|U0S P00000NkvXXu0mjfDCzVf literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_4.png b/resources/assets/storagedrawers/textures/blocks/drawers_oak_front_4.png new file mode 100644 index 0000000000000000000000000000000000000000..667d5812dfa8197ee296dd06bacf780276af4c5a GIT binary patch literal 596 zcmV-a0;~OrP)WdKukZXhu?AVGC!ATls9G$1lEIx#XjGB+SCFf}kRBDVl_00007bV*G` z2i^!61}-Rj0zN7L000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP00052 zNklMH=I4r!0hK8D`(SnVo&J$*YUQ$>cXN|8luBtiY%2ZthuGb?|u$K=*NK(c?nH&tWm_`aMUX-3enb-@>tWUAD_Tb zSl{<)i+k&$s7V6+L3F~{or28cgjT&uRO&S{3EVqaQ$R(lRs>l_qT6$lkd^hYBJK)K zAiu(Bzt~nO&$<%i6dY*4^20lniy`Cs<`wq*bQhQFk6g4Q7c&e$IjY48s9i565E#Q;v_M`N$|;e;*OuDf2+7OKxXtQ2%AK{!+b&QpMR5Ck!7+Z~(c;075| z9GN2TK_w11Lx9z0^F}eufrbNdK>!V84hqm5*rf4(CWdKxlWgsy*AVGC!ATls9G$1lFIx{djGc_PBFf}kR1r8Wp00007bV*G` z2i^!66BZRN7_VCZ000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP0003S zNklR2fWz`FIiv-tM#C zD4_AkTIsFyq*ZS*|2Ut2vrh8-8T!SZ_Jl^9 u&k8-PHxFEC7~|oq-|aZYpSqk3*uxE6jJ?IUJyECt0000WdKxlWgsy*AVGC!ATls9G$1lFIx{djGc_PBFf}kR1r8Wp00007bV*G` z2i^!66BY?N8S@kX000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP0003v zNklBr5IoFc9*1Hfgv8`3Dl4r_ptiBL_fPn{tZl3*s5Bul+E|#77>-6h zyr_lqZtjK+zQD3?cA1^sw~gDI;b!xl)F(~%VO!Q*e6H#HgG|HE_2pSn6!X=xcW{U+ z9N0l}#3XdFSca042ni6mC!vT{;W|%O z)Wip+stQ6W09ru?hlr$BO{0RehEj&-rjo42r)eIWz8^pP$!fTyoFp?3+D^vH+al{% zO7I%3P7}`8@6T2ez8B{w;=UT4vN`FdDvF#u&SDR0jy?EPO+q>5-$=dgyoqqIn-8}iwO2awswEb?!W&2oi)&Tzi XLY=zv3*7kA00000NkvXXu0mjf#$dw1 literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_oak_side_v.png b/resources/assets/storagedrawers/textures/blocks/drawers_oak_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..bebe20f06f1dcc50535effc7660693f607caa7a3 GIT binary patch literal 477 zcmV<30V4j1P)WdKxlWgsy*AVGC!ATls9G$1lFIx{djGc_PBFf}kR1r8Wp00007bV*G` z2i^!61}ZY*3<6XD000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003r zNklyYpA&s+Kngyy>04D*#qY8I+`$#jakWbFJ_m8zO6(K$G)_r+eeeGtwKCY;h1&1bJ*^~u58~wZfkB412d`dzg03cFS zs7*r^#A|fmBvsAOh(as-W<;gdO`}p4wGv9hl!~Y%i}5@y#p+37CF%qeaTUh8VlVg1 zVBn-GW%iPEN}35=TfSA24?3q9--9;CO27f#n1o`42ujj2+CxL9{}1+oUE<_w*#AKC z{Ie9y+x{|5R;l3k&4hjc7HokXpIs0ade!n|Xkop1;Y!27=Goo$W85FJL5H+A0XM|D T>Hk;b00000NkvXXu0mjfeS^Kg literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_side.png b/resources/assets/storagedrawers/textures/blocks/drawers_side.png deleted file mode 100644 index 79d5b75958eb0b08dbd4f192a1dbb87565e51e73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmVWdKxlWgsy*AVGC!ATls9G$1lFIx{djGc_PBFf}kR1r8Wp00007bV*G` z2i^!210ezOHOJZj000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003% zNklc!E5#;Y6D+m1xAu>-Oqaq!ECj*ELI_CC z#%MTF`P+MDvbo`InS1l~=Iu4^Zcfdt)!O8o&lk2dA+i(?yw{f}Wm%4%-mfkW`JDdD zEV1rR8-z2zD#JKePj7|=&C^crHDP4XrFXp=Z0ed#Z7hkzFp{iz?(J@`R8q54F-hqv#d~<3H12QD^syB-zP^9e2FHJI fXdr*y`xoX9v`)qF-Eg)=00000NkvXXu0mjff3(HT diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_spruce_front_2.png b/resources/assets/storagedrawers/textures/blocks/drawers_spruce_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..81b4c7943dfb628377eedec2a96d037196e97b2d GIT binary patch literal 479 zcmV<50U-W~P)N000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP0004QNkl4qwH?GU1wGtMq2KayqMW7Ju(OfGMz0JsN0o&(-6SNpUz5lkU$W92a;N${0LZ`t zg|Bh%;{5SQ#*m_7O$Bcy07=A94I8o$Jm_^{UDK#AJL&q+c7+C;iU}T5Y?&1ujFslq zZouRGJ8}L`1lWLJv#IQ!2Yf2s&u27{kIz4Ns8PvR?Pi)$52uGRttq1(?yiSE!S}6t zQs*YqrGxZQm}4c{z5e2a?3fa6cM0QE_&E4Tw-ZnY#WgpWQh0Sf1iHd*dx=Z-8X^KN z1*)&CM>C{pkbK<})2c*ZpX*%2>lr5PAwWI2+dNW6J`+=>~v` zx8Ecc=~k%=l$$)+tFCbyY4$(Vx-2XP@lgKVRK%)v~W`y(;b36&T9k3|wujEee9*#j`hmz=J>FfBOqwy$FH`f?%mu3(j`x7;PxqJZ6(gHoeVi z@qE_dBZEPLGqt2BE9zc=H2l`f*}V#v@-fYaFrhTjj377}%F?jiosC|Cc5cyAO5{g& z^I<56@$?tC7tNFk!=Cw<_9tHo^&`nrI0z4P}(4ez!5k f+x<1pj6J*o5e={|sAsH600000NkvXXu0mjfNw%F= literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_spruce_side_h.png b/resources/assets/storagedrawers/textures/blocks/drawers_spruce_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ff8668f4aa23e9ef35ac3f357981adf1d9f337 GIT binary patch literal 391 zcmV;20eJq2P)%aqG=V=w%Xj{cSw( z25QmZ5}+I|KF@mnG4V%+T<(|vk}V~QSO~xK^axBmfC>oeB>`|nF&Ok1RgGvMC|9If zgurdkAw8_!F^X?B)Q#Ry#^IW4K`If zL1RlwIwRHkH52uty4WzGm4L+|`0jWY$g-2RyNdB7^UwxC2Uzm=f}kp#TAm1D4tk|w lbhE_XZM5-LRJ~NF;RUkHtUJ&*irxSK002ovPDHLkV1m4Op(_9Y literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawers/textures/blocks/drawers_spruce_side_v.png b/resources/assets/storagedrawers/textures/blocks/drawers_spruce_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..0eeca0b566b6591481759e792fa1f9c113cf690d GIT binary patch literal 407 zcmV;I0cie-P)-)j zlpee}RRRZkG6@+wNdh5BUdDTv=q&FL1L~4ns}bKp 0) // world.markBlockForUpdate(x, y, z); @@ -202,9 +210,14 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH if (tileDrawers.getDirection() != side) return; - int slot = (hitY > .5) ? 0 : 1; + int slot = getDrawerSlot(side, hitX, hitY, hitZ); + + ItemStack item = null; + if (player.isSneaking()) + item = tileDrawers.takeItemsFromSlot(slot, tileDrawers.getStackSize(slot)); + else + item = tileDrawers.takeItemsFromSlot(slot, 1); - ItemStack item = tileDrawers.takeItemsFromSlot(slot, 1); if (item != null && item.stackSize > 0) { dropItemStack(world, x, y, z, player, item); world.markBlockForUpdate(x, y, z); @@ -218,7 +231,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @Override public boolean removedByPlayer (World world, EntityPlayer player, int x, int y, int z) { - if (world.isRemote && player.capabilities.isCreativeMode && !player.isSneaking()) { + if (world.isRemote && player.capabilities.isCreativeMode) { TileEntityDrawers tile = getTileEntity(world, x, y, z); MovingObjectPosition posn = Minecraft.getMinecraft().objectMouseOver; @@ -251,24 +264,79 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return tile; } + @Override + public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < BlockWood.field_150096_a.length; i++) + list.add(new ItemStack(item, 1, i)); + } + @Override public IIcon getIcon (int side, int meta) { - return drawerCount == 2 ? iconFront2 : iconFront4; + meta %= BlockWood.field_150096_a.length; + + switch (side) { + case 0: + case 1: + return halfDepth ? iconSideV[meta] : iconSide[meta]; + case 2: + case 3: + return halfDepth ? iconSideV[meta] : iconSide[meta]; + case 4: + return drawerCount == 2 ? iconFront2[meta] : iconFront4[meta]; + case 5: + return iconSide[meta]; + } + + return null; } @Override public IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side) { + int meta = blockAccess.getBlockMetadata(x, y, z) % BlockWood.field_150096_a.length; + TileEntityDrawers tile = getTileEntity(blockAccess, x, y, z); if (tile == null || side == tile.getDirection()) - return drawerCount == 2 ? iconFront2 : iconFront4; + return drawerCount == 2 ? iconFront2[meta] : iconFront4[meta]; - return iconSide; + switch (side) { + case 0: + case 1: + if (halfDepth) { + switch (tile.getDirection()) { + case 2: + case 3: + return iconSideH[meta]; + case 4: + case 5: + return iconSideV[meta]; + } + } + break; + default: + if (halfDepth) + return iconSideV[meta]; + break; + } + + return iconSide[meta]; } @Override public void registerBlockIcons (IIconRegister register) { - iconFront2 = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_front_2"); - iconFront4 = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_front_4"); - iconSide = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_side"); + String[] subtex = BlockWood.field_150096_a; + + iconSide = new IIcon[subtex.length]; + iconSideH = new IIcon[subtex.length]; + iconSideV = new IIcon[subtex.length]; + iconFront2 = new IIcon[subtex.length]; + iconFront4 = new IIcon[subtex.length]; + + for (int i = 0; i < subtex.length; i++) { + iconFront2[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_front_2"); + iconFront4[i] = register.registerIcon(StorageDrawers.MOD_ID + ":drawers_" + subtex[i] + "_front_4"); + 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"); + } } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 39fba34..a2e4633 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -66,7 +66,7 @@ public class TileEntityDrawers extends TileEntity } public int stackCapacity () { - return drawerCount * drawerCapacity; + return level * drawerCapacity; } } @@ -113,6 +113,13 @@ public class TileEntityDrawers extends TileEntity return data[slot].meta; } + public int getStackSize (int slot) { + if (data[slot].item == null) + return 0; + + return data[slot].item.getItemStackLimit(null); + } + public ItemStack getSingleItemStack (int slot) { if (data[slot].item == null) return null; @@ -133,10 +140,11 @@ public class TileEntityDrawers extends TileEntity ItemStack stack = new ItemStack(data[slot].item, 1, data[slot].meta); stack.stackSize = Math.min(stack.getMaxStackSize(), count); + stack.stackSize = Math.min(stack.stackSize, data[slot].count); stack.setTagCompound(data[slot].attrs); data[slot].count -= stack.stackSize; - if (data[slot].count == 0) + if (data[slot].count <= 0) data[slot].reset(); return stack; diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index bb7c9bd..be5b467 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -2,6 +2,7 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer; import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; +import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -15,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; public class DrawersRenderer implements ISimpleBlockRenderingHandler { @@ -22,7 +24,32 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler @Override public void renderInventoryBlock (Block block, int metadata, int modelId, RenderBlocks renderer) { + if (!(block instanceof BlockDrawers)) + return; + renderInventoryBlock((BlockDrawers) block, metadata, modelId, renderer); + } + + private void renderInventoryBlock (BlockDrawers block, int metadata, int modelId, RenderBlocks renderer) { + double unit = .0625; + int side = 4; + + boxRenderer.setUnit(unit); + boxRenderer.setColor(ModularBoxRenderer.COLOR_WHITE); + for (int i = 0; i < 6; i++) + boxRenderer.setIcon(block.getIcon(i, metadata), i); + + GL11.glRotatef(90, 0, 1, 0); + GL11.glTranslatef(-.5f, -.5f, -.5f); + + renderExterior(block, 0, 0, 0,side, renderer); + + boxRenderer.setUnit(0); + boxRenderer.setInteriorIcon(block.getIcon(side, metadata), ForgeDirection.OPPOSITES[side]); + + renderInterior(block, 0, 0, 0, side, renderer); + + GL11.glTranslatef(.5f, .5f, .5f); } @Override @@ -46,6 +73,17 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler for (int i = 0; i < 6; i++) boxRenderer.setIcon(block.getIcon(world, x, y, z, i), i); + renderExterior(block, x, y, z, side, renderer); + + boxRenderer.setUnit(0); + boxRenderer.setInteriorIcon(block.getIcon(world, x, y, z, side), ForgeDirection.OPPOSITES[side]); + + renderInterior(block, x, y, z, side, renderer); + + return true; + } + + private void renderExterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { double depth = block.halfDepth ? .5 : 1; double xMin = 0, xMax = 0, zMin = 0, zMax = 0; @@ -68,8 +106,34 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler break; } - boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, zMin, xMax, .5, zMax, 0, ModularBoxRenderer.sideCut[side]); - boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + if (block.drawerCount == 2) { + boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, zMin, xMax, .5, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, zMin, xMax, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + } + else if (block.drawerCount == 4) { + switch (side) { + case 2: + case 3: + boxRenderer.renderExterior(renderer, block, x, y, z, 0, 0, zMin, .5, .5, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior(renderer, block, x, y, z, 0, .5, zMin, .5, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior(renderer, block, x, y, z, .5, 0, zMin, 1, .5, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior(renderer, block, x, y, z, .5, .5, zMin, 1, 1, zMax, 0, ModularBoxRenderer.sideCut[side]); + break; + case 4: + case 5: + boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, 0, xMax, .5, .5, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, 0, xMax, 1, .5, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior(renderer, block, x, y, z, xMin, 0, .5, xMax, .5, 1, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderExterior(renderer, block, x, y, z, xMin, .5, .5, xMax, 1, 1, 0, ModularBoxRenderer.sideCut[side]); + break; + } + } + } + + private void renderInterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) { + double unit = .0625; + double depth = block.halfDepth ? .5 : 1; + double xMin = 0, xMax = 0, zMin = 0, zMax = 0; switch (side) { case 2: @@ -90,33 +154,37 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler break; } - boxRenderer.setUnit(0); - boxRenderer.setInteriorIcon(block.getIcon(world, x, y, z, side), ForgeDirection.OPPOSITES[side]); - boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, zMin, xMax, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]); - boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); - - /*TileEntityDrawers tile = block.getTileEntity(world, x, y, z); - if (tile != null) { - ItemStack item = tile.getSingleItemStack(0); - if (item != null) { - EntityItem itemEnt = new EntityItem(Minecraft.getMinecraft().thePlayer.getEntityWorld(), 0, 0, 0, item); - itemEnt.hoverStart = 0; - RenderItem.renderInFrame = true; - RenderManager.instance.renderEntityWithPosYaw(itemEnt, 0, 0, 0, 0, 0); - RenderItem.renderInFrame = false; + if (block.drawerCount == 2) { + boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, zMin, xMax, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, zMin, xMax, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); + } + else if (block.drawerCount == 4) { + switch (side) { + case 2: + case 3: + boxRenderer.renderInterior(renderer, block, x, y, z, unit, unit, zMin, .5 - unit, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior(renderer, block, x, y, z, unit, unit * 9, zMin, .5 - unit, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior(renderer, block, x, y, z, .5 + unit, unit, zMin, 1 - unit, unit * 7, zMax, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior(renderer, block, x, y, z, .5 + unit, unit * 9, zMin, 1 - unit, 1 - unit, zMax, 0, ModularBoxRenderer.sideCut[side]); + break; + case 4: + case 5: + boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, unit, xMax, unit * 7, .5 - unit, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, unit, xMax, 1 - unit, .5 - unit, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit, .5 + unit, xMax, unit * 7, 1 - unit, 0, ModularBoxRenderer.sideCut[side]); + boxRenderer.renderInterior(renderer, block, x, y, z, xMin, unit * 9, .5 + unit, xMax, 1 - unit, 1 - unit, 0, ModularBoxRenderer.sideCut[side]); + break; } - }*/ - - return true; + } } @Override public boolean shouldRender3DInInventory (int modelId) { - return false; + return true; } @Override public int getRenderId () { - return 0; + return ClientProxy.drawersRenderID; } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java b/src/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java new file mode 100644 index 0000000..af3f483 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/core/ModCreativeTabs.java @@ -0,0 +1,19 @@ +package com.jaquadro.minecraft.storagedrawers.core; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public final class ModCreativeTabs +{ + private ModCreativeTabs () { } + + public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storageDrawers") { + @Override + @SideOnly(Side.CLIENT) + public Item getTabIconItem () { + return Item.getItemFromBlock(ModBlocks.fullDrawers2); + } + }; +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java b/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java new file mode 100644 index 0000000..06c51d8 --- /dev/null +++ b/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java @@ -0,0 +1,22 @@ +package com.jaquadro.minecraft.storagedrawers.core; + +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.BlockWood; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +public class ModRecipes +{ + public void init () { + for (int i = 0; i < BlockWood.field_150096_a.length; i++) { + GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers2, 2, i), "xyx", "xxx", "xyx", + 'x', new ItemStack(Blocks.planks, 1, i), 'y', Blocks.chest); + GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers2, 2, i), "xyx", "xxx", "xyx", + 'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', Blocks.chest); + GameRegistry.addRecipe(new ItemStack(ModBlocks.fullDrawers4, 4, i), "yxy", "xxx", "yxy", + 'x', new ItemStack(Blocks.planks, 1, i), 'y', Blocks.chest); + GameRegistry.addRecipe(new ItemStack(ModBlocks.halfDrawers4, 4, i), "yxy", "xxx", "yxy", + 'x', new ItemStack(Blocks.wooden_slab, 1, i), 'y', Blocks.chest); + } + } +} diff --git a/src/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java index 350fc46..c925edc 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/item/ItemDrawers.java @@ -24,7 +24,7 @@ public class ItemDrawers extends ItemMultiTexture TileEntityDrawers tile = (TileEntityDrawers) world.getTileEntity(x, y, z); if (tile != null) { if (side > 1) - tile.setDirection(ForgeDirection.OPPOSITES[side]); + tile.setDirection(side); BlockDrawers block = (BlockDrawers) field_150939_a; tile.setDrawerCount(block.drawerCount);