From 88aac678c7d39941edd9bd07e3162db8cc7f57a2 Mon Sep 17 00:00:00 2001 From: raptor4694 Date: Wed, 17 Apr 2019 14:57:20 -0400 Subject: [PATCH 1/2] Add Aether mod support + Fixed Immersive Engineering crafting Aether Legacy: Skyroot only Aether II: Skyroot, Greatroot, Wisproot, Therawood --- .../storagedrawersextra/lang/en_US.lang | 6 ++ .../blocks/aether/base/base_greatroot.png | Bin 0 -> 317 bytes .../blocks/aether/base/base_skyroot.png | Bin 0 -> 316 bytes .../blocks/aether/base/base_therawood.png | Bin 0 -> 320 bytes .../blocks/aether/base/base_wisproot.png | Bin 0 -> 316 bytes .../blocks/aether/base/trim_greatroot.png | Bin 0 -> 319 bytes .../blocks/aether/base/trim_skyroot.png | Bin 0 -> 316 bytes .../blocks/aether/base/trim_therawood.png | Bin 0 -> 320 bytes .../blocks/aether/base/trim_wisproot.png | Bin 0 -> 318 bytes .../aether/drawers_greatroot_front_1.png | Bin 0 -> 341 bytes .../aether/drawers_greatroot_front_2.png | Bin 0 -> 354 bytes .../aether/drawers_greatroot_front_4.png | Bin 0 -> 377 bytes .../blocks/aether/drawers_greatroot_side.png | Bin 0 -> 304 bytes .../aether/drawers_greatroot_side_h.png | Bin 0 -> 312 bytes .../aether/drawers_greatroot_side_v.png | Bin 0 -> 316 bytes .../blocks/aether/drawers_greatroot_sort.png | Bin 0 -> 312 bytes .../blocks/aether/drawers_greatroot_trim.png | Bin 0 -> 302 bytes .../blocks/aether/drawers_skyroot_front_1.png | Bin 0 -> 347 bytes .../blocks/aether/drawers_skyroot_front_2.png | Bin 0 -> 359 bytes .../blocks/aether/drawers_skyroot_front_4.png | Bin 0 -> 386 bytes .../blocks/aether/drawers_skyroot_side.png | Bin 0 -> 306 bytes .../blocks/aether/drawers_skyroot_side_h.png | Bin 0 -> 313 bytes .../blocks/aether/drawers_skyroot_side_v.png | Bin 0 -> 316 bytes .../blocks/aether/drawers_skyroot_sort.png | Bin 0 -> 314 bytes .../blocks/aether/drawers_skyroot_trim.png | Bin 0 -> 299 bytes .../aether/drawers_therawood_front_1.png | Bin 0 -> 357 bytes .../aether/drawers_therawood_front_2.png | Bin 0 -> 370 bytes .../aether/drawers_therawood_front_4.png | Bin 0 -> 395 bytes .../blocks/aether/drawers_therawood_side.png | Bin 0 -> 311 bytes .../aether/drawers_therawood_side_h.png | Bin 0 -> 318 bytes .../aether/drawers_therawood_side_v.png | Bin 0 -> 322 bytes .../blocks/aether/drawers_therawood_sort.png | Bin 0 -> 319 bytes .../blocks/aether/drawers_therawood_trim.png | Bin 0 -> 307 bytes .../aether/drawers_wisproot_front_1.png | Bin 0 -> 349 bytes .../aether/drawers_wisproot_front_2.png | Bin 0 -> 362 bytes .../aether/drawers_wisproot_front_4.png | Bin 0 -> 385 bytes .../blocks/aether/drawers_wisproot_side.png | Bin 0 -> 306 bytes .../blocks/aether/drawers_wisproot_side_h.png | Bin 0 -> 313 bytes .../blocks/aether/drawers_wisproot_side_v.png | Bin 0 -> 317 bytes .../blocks/aether/drawers_wisproot_sort.png | Bin 0 -> 314 bytes .../blocks/aether/drawers_wisproot_trim.png | Bin 0 -> 303 bytes .../block/BlockExtraDrawers.java | 5 ++ .../block/BlockTrimExtra.java | 5 ++ .../storagedrawersextra/block/EnumMod.java | 7 +- .../block/EnumVariant.java | 20 +++-- .../storagedrawersextra/core/ModBlocks.java | 80 +++++++++++------- 46 files changed, 84 insertions(+), 39 deletions(-) create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/base_greatroot.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/base_skyroot.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/base_therawood.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/base_wisproot.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_greatroot.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_skyroot.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_therawood.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_wisproot.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_1.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_2.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_4.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_h.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_v.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_sort.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_trim.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_1.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_2.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_4.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_h.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_v.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_sort.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_trim.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_1.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_2.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_4.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_h.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_v.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_sort.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_trim.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_1.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_2.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_4.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_h.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_v.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_sort.png create mode 100644 resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_trim.png diff --git a/resources/assets/storagedrawersextra/lang/en_US.lang b/resources/assets/storagedrawersextra/lang/en_US.lang index 04071f6..ce84b43 100644 --- a/resources/assets/storagedrawersextra/lang/en_US.lang +++ b/resources/assets/storagedrawersextra/lang/en_US.lang @@ -73,3 +73,9 @@ storagedrawers.material.forestry:zebrawood=Zebrawood # Materials (Immersive Engineering) storagedrawers.material.immersiveengineering:immeng_treated=Treated Wood + +# Materials (Aether) +storagedrawers.material.aether:skyroot=Skyroot +storagedrawers.material.aether:greatroot=Greatroot +storagedrawers.material.aether:wisproot=Wisproot +storagedrawers.material.aether:therawood=Therawood diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_greatroot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_greatroot.png new file mode 100644 index 0000000000000000000000000000000000000000..247748df95945414159473e5760672af42871a6d GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=CZFL71_&tjhx^$X?><>&kwgRZ!59Gu73-6DTB6;u=vBoS#-wo>-L1P>`6JSE84f zTB2a0XQ*fP*N^iBP|XTY7sn6_|JsR$d<_OX%)hn5A|z%cKL5X-LGt8_q^P#w%QrHe zGM?{?yKN*oMfkYc^lGKIl@2%7TrPAv|C~`Ow}^4JMVW81;L#Sls`~N=GiIrOHc4#~ zVJ&W|`}poa+P%v@XL+X2U{zl0lW^&XzeoJd#>7DX$A4!oxZbGd*k36ha6!AIZ;9QV z#`7+7U*^iW1}MnP)VTh)S7+J0yRJW3$_jn%&a(Xebr<6g|650oy!lvI6;>1s;*b z3=CZFL71_&tjhx^$X?><>&kwgRZ!59Gu73-6DTB6;u=vBoS#-wo>-L1P>`6JSE84f zTB2a0XQ*fP*N^iBP|b2r7sn6_|JsR$d<_OX%)c$e!qns#wExJbs4VWzl=SmWUe38t z_Ic6T*C7FZZ*IrD>)i63F>$lsaZcO$>=|25vgSOxVcP2|BK+&c-@A>;S@X_Zp28U< za)$HQ(cR3mEB%d4jboC;dbSufdJ5Ys)~2$zx!U%APj8B2pT%PPtk%JC{RPWOzY5sx zgiDuguM}}?EJ#@t^WA*YjH)v6r@}Xm8kS~1vzY#xZR;ty#nOvi`GHPm@O1TaS?83{ F1OSG3ZWsUn literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_therawood.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_therawood.png new file mode 100644 index 0000000000000000000000000000000000000000..cf9fe4e32bdf70e4554c1c8675eda06fd17a9f03 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=CZFL71_&tjhx^$X?><>&kwgRZ!59Gu73-6DTB6;u=vBoS#-wo>-L1P>`6JSE84f zTB2a0XQ*fP*N^iBP|a#j7sn6_|JsR$e60pN&eg6<^b3XC>uW#nOk25N&W->3i~N_|<>#1PYUTH$($--i@pYLxi)LJKfB&3MCirv8 zyk$NU7A5#y(4QxJ<4pCel`|g-ZBAG+mD6X|56+j`)&@GSGWXmU{$h1O<%QvSX0EE% za}%$$TYs3j!g%l5#T;BM%EC`~?Vot`%I4h~^AG6tt&BE4ZZ%(g%gH<&UzVR0KxZ>} My85}Sb4q9e06+6~p#T5? literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_wisproot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_wisproot.png new file mode 100644 index 0000000000000000000000000000000000000000..19e06e242ef1dcb440d5dba7397b1a871c97aabe GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=CZFL71_&tjhx^$X?><>&kwgRZ!59Gu73-6DTB6;u=vBoS#-wo>-L1P>`6JSE84f zTB2a0XQ*fP*N^iBP|b2r7sn6_|JsQMc^eFPn5}J-72FaS%3gT5x*6@7G41%u%r_>A zTkf6T_&(avvM|@8=lWYxda$St_2CcdFF`MQZ%pwElN-^!lvI6;>1s;*b z3=CZFL71_&tjhx^$X?><>&kwgRZ!4UGfq1lsGdQh#5JNMI6tkVJh3R1p&&6cuS72| zwM4;0&rr|ouOH_Npqf>lE{-7<{;v+f7de^O}f~fDLHS} zF+X9a+t+@^)CD_Q7QXpk#(U2$=HO~k7Jj;G|HPwLHt*J$e?YHqWwh~atNG$(+qTrqD{fl}bTxyg LtDnm{r-UW|^lf?o literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_skyroot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_skyroot.png new file mode 100644 index 0000000000000000000000000000000000000000..624eb5e24269a32fe790086d2c32078cf7877fe3 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=CZFK$vm8Va6JuAbW|YuPgg~RzX2a%{c9Jpn3+064!{5;QX|b^2DN4hJwV*yb`^< z)Di^~JwrXSzkZxAfNGX|x;Tbd_}5M}e_UXH4AecbwC9K6}QNldL(9ZkYDEiU|LD@%L_Ha@M>vm#1(B ziJam5b#yoL>`H%QQ{&hqu`^qY8a;*W6>C%3+gz1er9p~HQU5BdpnM-?nwnYnZeW5&t;uc GLK6T;J98WW literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_therawood.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_therawood.png new file mode 100644 index 0000000000000000000000000000000000000000..8af18bc8eb03c1b15c72481939c61c49407c65bc GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=CZFK$vm8Va6JuAbW|YuPgg~RzX2a%{c9Jpn3+064!{5;QX|b^2DN4hJwV*yb`^< z)Di^~JwrXSzkZxAfNEBIx;Tbd_}5N!#|3{&`I~CcfEfc42Ed7`< zYo>|ew&c0zb7yj$>iqj(`@74nzYQBAmp^Wqcb(bf))OYP!Z)*yDRptyeyMwRz|hqH zS>`DgO|EAwe;?g!JiBN4%vq9phTLvZGY>53oIhdTCg#J7<{kTO>$slTw@L1^&4LBt zFJwGxcQDWIw7PuTrfY$Ng;C(T-_nsjw!6DOalUypW0z_1n$MMt^Ubu6_-sxy1v;C- M)78&qol`;+0J{TwhyVZp literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_wisproot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_wisproot.png new file mode 100644 index 0000000000000000000000000000000000000000..c8eaddcc0f44a88585d2a6e1d42cadda45654795 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=CZFL71_&tjhx^$X?><>&kwgRZ!4UGfq1lsGdQh#5JNMI6tkVJh3R1p&&6cuS72| zwM4;0&rr|ouOH_NpqiDQE{-7<{Blu#qLbWd9#lB z2|Gn^e>$f=*wON%{kJ0jC3pEbW|vy|y{NQxSnR8pAbfmXrp}@n7u?@J=aUKkoHB2j z&xAz@ei!uT$=*0qJ!|F6heDeZmQ3aJne~J7rM9(!&a2El_l3V$T~K*pc%GT7s`cE& zEA7@FX09;adv-AgSBtXn(_Q-~9=)=8x5oSfdVMRSjbCq@BVKQOaQDt<%CSI4GkCiC KxvXsM$IHrsTJ46*G=mmGrM>EKjJlKYNo|mrbWw{@F&(wJ%ZC3t!7S4WqvM@hy|6^*<9{}+8R#ixAR!Nc5l=a#)F`)ZKiNDFu@Zo2(-B=4)9)GCP%`_CB(XK(OcIQDFo(D#61hUS0a>9Q9ZG6Hq{=9a=9L!37i)Ub{=_n6)hu8TFnGH9xvXAN`vO&gq<{rPK*ZkSt4dHG$0?Zfxi5qXy_>l{rBn0zO3{W|{l z4#Q861&t?!qvnY;v?NXt_Fz)q;BjRAvE_ocrR>Mt5_n@4`Oaki$|=$jU0{E_IGi`i zK(ykS%TSWlU$nisN7%fz+CC*Z|abcd~cJr!bKT*w#Wr1 z{x@>wm@J)Nc`!*NMVR$x=d6Yom2WhJEJ8CDHSW1=EYBvw;GV?%`poIhe>bMq=SJ>y Uo{%NP0Sqn%Pgg&ebxsLQ06OiI8vp=aPV3=-hn=`p$O z%bouse912(H=pi$)cE-44ZkPRx2Ns1d&hXT^K(V(^PVk%A1b%ky*t0J{`jx-Ifea3 z3l|s(PdKO4b5!F3zoNKt#hukhkMn6w4B*>rY{*r^t{3#E_|WM?)(6f+?1*NcC|J7zP^|6V5d`|+K6Q~%dqRWBr& z($b_a+&v-{#b9r?G~(jqIJ11=GcL2UHcxisKEWAeqH+>%hbWPyuFS^abh>)>nm4NqNji6mQgvqTvw>V1L!dZPgg&ebxsLQ E00V|~V*mgE literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..3f617d8585fad75946ab020996c0fe08c987c7a4 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Hb?Qjv*HQtrIu$H8}{l{8jYM)KM`MF)_RJ z`+t1nKHl>@>f+reb@%MN8EfJDctf22^SKr6(~j4Ezrz*Axc>PTz0bLG?M;_&ZMlvy}CVRfd6r?JMboqGihA6J$TWGk+xKteoseE$$*Qs6YLlN{@MViN`PU>)FLyG#l@0V9gQu&X J%Q~loCIHooc+mg= literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_sort.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_sort.png new file mode 100644 index 0000000000000000000000000000000000000000..0356056c7956296f346e06b1f7eb5052b4f1ed04 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Lyz&jv*HQr4tSLnhgY4J};cI&~u`PAgk}J z3(x7Ti8!`h`JGY-z;B$#Jv33on^aUUoLxM)C`TUDTb{+=7IT>Xm1|Nj8*kv9NBo zJ6LSx!o}0H>OZT>ES+=J%lp+1^RQg346&8|(y*CNipQh>4WnARRR!x-<-a9tS9MCR zU1$DuUn|6>h>dY;`~Hn=E7HqvtXJ@pjaj}<4d^=i4bxAze-1O>0`wSzr>mdKI;Vst E0K-0b)&Kwi literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_trim.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..187dd3f40256b600786e3400a5583ac4efbb6871 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!NZ;|jv*HQwG;R9H8}{h)JkhD40L8s;&)5NG*_{9JhPaP>D%yF z?SuA?_pkMTEMPP8Ev;?NVV7t6-XYbXC>?UX@b7!+7t)F8KfM@uJB5_2HnAUkZTNKm u#rD|mcNfMrGI=~nbl7S#LG4*#g!$jLjW53>Xh#CQ!{F)a=d#Wzp$P!uF?SUJ literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_1.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_1.png new file mode 100644 index 0000000000000000000000000000000000000000..fdaaaee018d8a23847ccc165f38e142b59a1224a GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!4IA;jv*HQwUhU99dZz8sb!vR(>!&8+7hlw z4Pu;1EKFw0d={?V_y1+gjO4Q7h?+a+-}rnByYtmqcGk0u1F|!gO}4CFaI_(HXWP$0 zzQ;F?h>9G&=g_Nd6Iwc<;b&5XZNA`}`}3<=(%%I$-0D~vG{gBYBh#&QG1dtTfs@Ub zpQ}6H!FY?&H8=D^+!0yCKH#{4bV!2RHu|z2eb)FZgg) zT0`eA{R-t$CVwu6sBVaB&fw|l=d#Wzp$Pz@YK+AI literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_2.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3dff43ef40d42ac10bd2ef037efb459ba64451ef GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!9SiZjv*HQrIR*t9SY!a{mU%K^8bKmf#%#U zjTZrejsh_yB^N^f@2?8V+fn>AUjJYkVRsS72%h>!i?Pj?G^F!Cv z!m@9&$~=3RJMXQU-`KO_q-@2eq<~EYyhSWbcf2gb|8FtSNYvS1|BpTJ*;76lGn?7I zO#k_pXfB)lqM$_zf%exl8iv)7iuFX#U&KT(MMmMHSqZ$|v44$rjF6*2UngIRc BlV|_{ literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_4.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_4.png new file mode 100644 index 0000000000000000000000000000000000000000..3b901ba5e2049620951be310516e41e368156bd6 GIT binary patch literal 386 zcmV-|0e$|7P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0T)R`K~y+Tb&|nq z0znW&{ezGonEXIaf*0|$h(dB$2?0UKB_2KKRsVnVb@C>?Lp&7rOjTFc^g8M{i_&$| z0k{LZ-Ewel0T%{`!$;YFzm@U$p-d)^QE#_hna^KCL=E83z|#Z&XRv=C;wI|*pDFO? z%U3xaKjRlv11HcVsbIC9Mb!TW$VUPVM4r&{qyQuggPcGTIDthXu8qG&^wb>~8-X=& zi8f^p)F)6NZo&OMp1W$$f~mkW&k(Jy?f~$OL2NyJ#>_vzJk>KvB0*k~?^B?Gyr8EV zAh0oS*&UGR9v=o-pveD$32Zc_pLxV$6l4{cm0Nt-XEa*-yI#mK)!n{xD~v80-Ak8Sk%ep8H(+pJe)- z#b*KnW^#I@3m#MA`r>@zD39FttdBPwRfSF^mZ>c|Q2szk)lPj+P6hi6Np5rQ>n`?A zsplHKq`9<=&)2bh|69Y#FSNqs*k9QY?Fx?_>{X3Cp%W~Rf8GCHVYZ|8<8G!{36~b0 z=x<63bACz|Gwxci_e-$hwf3sjJ#4Sdw(7t5$ToHA+@mr;FEMz!`njxgN@xNAf`M{Y literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_h.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..912df16f75230bd69d95f426523a43c2bb9219ea GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!E>H2jv*HQxswd}4jBlrR0@=?>ga0{37NR! z6GO(s|BlI-YrdX5I^po{?RM5XZMHp)x&E3Vd&B$f59?XivewkE|NOab-toeG|JPns zFC>}L(xflkJt7swU~jfG;^O2uvwYz*F0->XPj=)!!5L(ta$VtYoArep-psZu3*;F+ zR3~(KX=TpopX{xhf480WvtI)A8H1;*pUXO@ GgeCy9&Uxej literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..4661632c880a8193cc5302bd1b5f5743a66d059a GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Hb?Qjv*HQtrIu$H8}{l{8h--N=j#J73~z2 zU$FMy|C!rQ8XxA|IOEQt*|YDqUN+&+l{qi{kx%z@>gPM$VT|j)@3ocRzHQxgtF^pK zrd1ZD3op<->&LLY({xqCn+XDzTBU8TTd%TI3kcpTUKSuaL0DxAbM}+pJgY?wZeHx> zI=o+$-(IOn_T&79DQe6`tzWKkSuSEq`ey#^%r2%rs|*7L+gH*FMaz`KC%pZ5IRC&* zVGXO-s~NtDa9wJUv1}G7FRxFQS2+Lf6IVc8Y0BJ~Wy>lvO*z%I&p(<}47pdVZH5o8SlUkdE&M{@#^7@h026Is3vohMRNPwbpVM++nF> z{eJgf6Mxo%OCj6MSCoBFEa=Z*lvw5XRp$EteU1Ah%ckiwWq3@PaB-ro#-HOc|J~%v s?v}Tgv2rO)Y-hZB$zj%wZy&3e-wN(J9lFS~1?U$BPgg&ebxsLQ04lzA$^ZZW literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_1.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_1.png new file mode 100644 index 0000000000000000000000000000000000000000..85cf651d824af6d1aaae152a6d9c8eb7c55e02e4 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!C#&(jv*HQwUhU99dZz8sb%%{j(1jRRdC!O zIK?EB#nDB;(I7#wsa4EuTUgk>XD4H36qgC>*u6_HQ>)f4dpFx=&U9twcLz#M&C>a| zNPM{Ce>mBib9<>=_=WeSyjOM{+8oVO$GHCSnGbenm2cGRxw53c3ud_Guu5#(!iNlu zp);?_8Z@jpIs2yMJVE9y%w4xu-D6}sn4ESXNs6(%GwT^=uJaeR^`=a>x+<@!f8d*U zZ2bZ^sW0=S!i<@HuGAltUMXA=#Bk|W&z|5F2S1myMXlLz+Qj8gq6IT=;Eio;2a7e@ zO4&7nF0uzazwTMZWX8}b!Si6A)B?9vM%?k56Z~&{_m&m}h6019tDnm{r-UW|f&he} literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_2.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_2.png new file mode 100644 index 0000000000000000000000000000000000000000..e4a8f019fcdb2872eedea0f777eef306d4f8ba4b GIT binary patch literal 370 zcmV-&0ge8NP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0S8G$K~y+Tb&^2~ z0Z|l%{RMXHuy>BYF zRX;z?yCpb-%c56$PeBU?kL@tOuLt>c*$+=>)~h9?=}FCI(*7De_oEW8<2XS4K2HO@ zD~<-VfvYF}!p#AL!z?R0kb&@`v{;=nMlkRWBzmiU1~Q^1?!c23gOY`75Jw=uEroOO zPYVVqjOF*w{~*%5xC4g`w;Hv8{|C|((@E%njcQ4nFP&eype7pN_N!25jx=iG4rnV) z@?=L{#vh5r;D+cXj@ou3YIf63(E&*=rUugWbrDCPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0U$|4K~y+Tb&|14 zgFz64^9rU*uo3eVA*2X|AlL|zG-(7uBp?C7fQ1MaTBJ#v$||pU@-2MF{)Z`s?A^@H z&h4Mx&-0>uJj^=a4tzb%JLeW~VQ|>qmi^|YTn#SD^{^lH_tT=h+>b*<4dBqg(*s`( zj&FAzAbMR*!T|pCxhlW!%lHM=zzH--D%h>35%s?T@{vFTkteh~DF6w>ASaLnPGFIU zz1N7Ix&vb)um&#Crp$r*1Pa70xIf2pR}ES)6?oYJKm&O}Pc=YbW8ShmAkjHK46;Cx{{s`)Xi7hGkHsj+CJOQsH39Unqe$RXp@|0a pPS1Q8Pyif>4XiUSCwA*;`2*wjI0e2Oei{G(002ovPDHLkV1j}ZpOpXr literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side.png new file mode 100644 index 0000000000000000000000000000000000000000..f0c3242dbb36e4a252be0fbb3a38e9bc10f3fae8 GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!84vNjv*HQwUhU99WoGUtu=GB;%?e}VX6Lu z2MSHz^A}DIjyEpSt9kgOs_=)&*`J=5CLP}8^S08OFT-!o^UELROcZ1N{rZ+&zxVBT z&wr%PDeO0Lc1%@MnCmLht#N^0QQWxV&g!Gd>{C57+HcP6V7lMfJ>|!o51Ss!CZy@y z(TNfM%Q4lGT`N~(#TlF5f_J`u7PawMa7p5OdBEBSiVx*puo{IpK9jlre_wMB+u9y| zu98FnL8F|T-7TA*rk`Pbv2WK4cZPNASFAIVT66l!zGKhgdU;e?B7pv4@O1TaS?83{ F1OPbceLDaE literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_h.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..cd87fff828fc8ffe27d53f074582e5289c3032f1 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!ONa5jv*HQxswdJm<$D6ZD%V)b2n{Gc+9G! z$%E52KBE_9-l4f@r)3QB` zm$3ciaENlvUAFrk^Q5dt)e~Mxzf*9ZJ2&#|F4hT4EZ-~4RpOdMQn_FYnw!}8miv${pD~{5@)`)a`nlo=xz2NABQ_u*KmFVdXK@= L)z4*}Q$iB}x;T4# literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..3078813a90f130c70687631bf208b5d24203cc3e GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Rwwbjv*HQtrHEo4mk+8+Rj#3$$Btq!%0>h z9hVI!CD*Lk^X!y##V6s-5jAC#zJEXOvuWnBg?IgK&#Y*ddw%y#rDg={p7+PU?UK9o zdDHsKw;Zx&s+XrR&bsu5rC@f%Vy+W>oD&xZrSFJ~@ZG>B_|W^D$SS6yrk1jV-kSM| zTbb0Xs{#{$Y)|^GtQ67zpJj=O%&e6iVAGrUwCqj_JZq<&5SPt?=ws`mfhKu z(_6luG2L&$i#6++ZUk$1Fc&@Hak>-xxA!zdW!d!bhEJ=NUq3N2?REam@V_zKao?^Y QP@ph)y85}Sb4q9e0EAJ2OaK4? literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_sort.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_sort.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f4dedf7d3468d74b647a8365c8b2608a86f93f GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7H9Fjv*HQr4tRg4mk+8+Rj#3$$Btq!%0>h z9hVI!CD*Lk^Xyb~#lv);uIV}7{{P%;ebe{x1-a>enZ7+Jwbj|Donianx6StRf3Muz zo?O3s-IDfMt_Nn_WGb1xqfPF>;YA|aRhPU!*ENZJI=8N}TfJHCz_Oz`MivG~@>iaH zCfQKF#lpJT?%-xi7cQQrRsUI4X6c-(Uf!?PEy=Oy^NK377mU%eCK40mW-|MnEBU~c zmHq1(&#K55Yu2+r*&n*1;t3B^R(O3fZ@~F?2Jwz_takXt`YtQXu>YSPx^vF%1wfB7 OFnGH9xvX4IMX literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_trim.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..9265ac4100d37a62bf8ecec572f284a69123873e GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!4sY?jv*HQwG;R9H8}{h)aoT^c=Y%uWMuec zT+tz4{54uZ!1BcI5n_s&%CL!M|s`Dc`ovK4`ikydk5H zdFC}1i#(?NO~3d3YvRvRxEylb{6yIY#e)77j1rq1zsg+yzprthVA-_wEEgtdC@xa2 z7O**%{7<^}M(KUoSE3pXE^=%k-prXvGk?A1%~MlvHWtcB2KtG?)78&qol`;+0MMp; AzyJUM literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_1.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8476779b114b7ef4f8bb65afd72f8f98a36a44b2 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!B3tpjv*HQwUhU99dZz8sTG`Uv$$!gE6NZ70+*oqj`pHDUXNTr&ex3NS(0;S=&FI3iopTR=+hF*B&nBL~_?tsFV{JWe z>~`+by*=6*T{|14!YjgFA2nZ)t9{tuj`EHE$JR~8-!&O>6+*d-Gb|h&u1*PN=TXS| zlvdW3euUv|!=i1g${QR%%#hqL!|g!QqFI$rc^&s2Y@Oc_V|e}-%e{l2KWnd;$hLQR z+to7+!e8S*xV>VTC(^KG&ct#q(~5uR9J)ozX0~{bE^vG zTya_48YPjOnCN_5)|MTqwRx9a z`S;(;v`{1-8GnKCt^yhJ*Busz(BOd=es8KizKR zX%Sy~^i_{xQ)9Wp#ptib69i2Q+2^g1n4%NYY{A5sr#Yv)KFYu&QD=YsKlX{wj>=l( zSe#d9{LjBcbJ^qzjM7&pnZ#S|FLCrWIgq;|Aid8d>k(guw(qAD_t<0dokt(Ey-@4B zRi>Qvt^MtG=1DO=yh~ocR_a?|eKhd|{DGoQ?YRgcBGP44$rjF6*2U FngCbzk+=W= literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_4.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_4.png new file mode 100644 index 0000000000000000000000000000000000000000..491c27c8493f1655d73c4f78c78ac11e1d0aab80 GIT binary patch literal 385 zcmV-{0e=38P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0TxL_K~y+Tb&|1a zLO~Ek{Sg}jV&mT#NNJ%DqG^(VqJ>&WNMT`P=Rf#K8_vL4<}I784^g~9E%FX!_|8I6WzGI@!5wR$aY^I3?f0UR25df=z-YeY}ofw2)- z1D9x1=0JS{1>zRmKjXQp1}&HhJo60E>go;v-x%=z{24PposR37B#|I5$@eMHKwi*O z4G`Fvx9ko`^o$RKEKubCzyvm$($73#F$%JYg8W2H06pv|5;#?8qJg~AGam*N07qg2 f>&(lEZoMdfFWtm1@iMuF00000NkvXXu0mjfvTUPw literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side.png new file mode 100644 index 0000000000000000000000000000000000000000..df41ccae973d9dfd651fa7764eae159b46e11cae GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Q-ATjv*HQwUe#+4jBlz?6mR7%v@yRspaB$ zkg=#;=H$gSU)Frww5Z}ih21vcpWAYZXV3f2c((KVb5oo2C9Vf6>uwjm$&Ho&c;4c% zTxwg>DIW)`ZUeEv1@caMX&-ikcOU1|ni#;h*;tTuAG5gTN6Uw)hpi8siP#ajL+zKK zRxw}5t$=`;mEV+iynn7;F~MP};k)+>q7FJAvc15avZCpX<+}g1>^FI$B;!S198yq9 zxv@!{GxhZO8Qd3YOE2~_#KZ^2rkX@-+Zp>Y=)2Aom6E+cFEMz!`njxgN@xNA{a1HO literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_h.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_h.png new file mode 100644 index 0000000000000000000000000000000000000000..1e6fbe8735576258d82c2c4ceda74e4299dbbcce GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!E>H2jv*HQxswd}4jBlr{Iv1dViGv3g)1=N z1H-=w>a4v>H(pa0cjkM4@7J3ro8FzStdC)jX#W1(^w0VQTN@t#n79A_=R4b?tE0j% zIiD9WFuvXJPVL$SrXL$Mk9N)bvZ-=*g4(T+*>icK9Q-CMQryWVX?CYEE!)F*3EN)| zhbY(FWxMY&Ps(~!J>iw~I|cW-b0g30Vx6$W^1Z@r1=~x^24|#Vy@QsQS8!*pN=r|NITs?(Z4pD}p4`njxg HN@xNAOJaN) literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_v.png new file mode 100644 index 0000000000000000000000000000000000000000..175e973606ae95ad36e494c455c448af2d8e9122 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!AqVljv*HQtrH#jnj8dJ{_atW+bf{=;AF*z z2h2a1{iA{>Pst4HXg|jnl7F6O&aujj>$fYF?=5`(dSm4~*3}KAwcAs7ZqM9xB{NrH z>zT>cvl)Cd%b0fft_fsKX>U0ZxY9UAe~sFW=8g~Zj9XVV%u!e<8=-tZJz{Oc$-cM{ ziGOP=eh3P_>G;pG#6)s}_LB8sCj>bP0l+XkKO}l=z literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_sort.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_sort.png new file mode 100644 index 0000000000000000000000000000000000000000..70a21214222b8c5e5254f4021059784dc44c124c GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!SkLjjv*HQr4tSLnhgY4KL2#_n$336VU>n! zmraBH2Nn0^%nL=0Ne3#ve|z)T=$!Lz`*qegn!i8a`g`4iuMMStx20BY%iQ&K`)jYN z6*pOBX6ia@@63L|Xrtq`agq97llST#itpdd+FoJwf-xuRj9N3Z^Pg$Aa%MADxOZl?n?qDNLXzrJ!cWlsAyX5p5%>+EV9Rsg-m;OXk; Jvd$@?2>{mEh6Vrt literal 0 HcmV?d00001 diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_trim.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..e2d88ff71bab4dba30916783d87d6cdfa6bb8559 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!6Tk7jv*HQwG(amn;ZmO{$3QBCgPE_qQxaS zHC^XN|BUjKb3047RwU-9m%VE~{I~G-xz8&b<@Q`l-`uxgD#L`C>tA(L&#?SOZp?{l0bffz%ak2b1HCKG{q% z=8f?OYvbz=vYSrGT=iNy#rlW94)-ezJU16q^}VjY?{J^P`gAx`hQ}0vixX`*roC4E w-)r|~*L%LNTp|ui{LHJCHkugv9sb4^a(Q=ZsNrE3pnn)VUHx3vIVCg!02UK>BLDyZ literal 0 HcmV?d00001 diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java index 0c4020a..4478987 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java @@ -20,6 +20,7 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.common.Loader; import javax.annotation.Nonnull; @@ -68,6 +69,10 @@ public void getSubBlocks (CreativeTabs creativeTabs, NonNullList list EnumMod mod = material.getMod(); if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod))) continue; + // only add skyroot if Aether 2 is not installed + if (mod == EnumMod.AETHER && material != EnumVariant.AETHER_SKYROOT + && !Loader.isModLoaded("aether")) + continue; ItemStack stack = new ItemStack(this, 1, type.getMetadata()); diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java index 91efa46..c04894f 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java @@ -25,6 +25,7 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.common.Loader; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -87,6 +88,10 @@ public void getSubBlocks (CreativeTabs creativeTabs, NonNullList list EnumMod mod = variant.getMod(); if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod))) continue; + // only add skyroot if Aether 2 is not installed + if (mod == EnumMod.AETHER && variant != EnumVariant.AETHER_SKYROOT + && !Loader.isModLoaded("aether")) + continue; if (group == variant.getGroupIndex()) list.add(new ItemStack(this, 1, variant.getGroupMeta())); diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java index a53108c..ab29552 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java @@ -11,7 +11,12 @@ public enum EnumMod implements IStringSerializable NATURA("natura", EnumVariant.NATURA_WILLOW), BOP("biomesoplenty", EnumVariant.BOP_WILLOW), FORESTRY("forestry", EnumVariant.FORESTRY_WILLOW), - IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED) + IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED), + AETHER("aether", EnumVariant.AETHER_SKYROOT) { + public boolean isLoaded() { + return Loader.isModLoaded("aether") || Loader.isModLoaded("aether_legacy"); + } + } ; private String id; diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java index ee8f6c9..cf66f49 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java @@ -1,13 +1,15 @@ package com.jaquadro.minecraft.storagedrawersextra.block; -import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; +import java.util.HashMap; +import java.util.Map; import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.Map; +import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra; + +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.oredict.OreDictionary; public enum EnumVariant implements IStringSerializable { @@ -74,7 +76,12 @@ public enum EnumVariant implements IStringSerializable FORESTRY_COCOBOLO(ID.FORESTRY, "cocobolo", 57, "planks.1", 11, "slabs.3", 3), FORESTRY_ZEBRAWOOD(ID.FORESTRY, "zebrawood", 58, "planks.1", 12, "slabs.3", 4), - IMMENG_TREATED(ID.IMMENG, "immeng_treated", 59, "treatedWood", 0, "treatedWoodSlab", 0), + IMMENG_TREATED(ID.IMMENG, "immeng_treated", 59, "treated_wood", OreDictionary.WILDCARD_VALUE, "treated_wood_slab", OreDictionary.WILDCARD_VALUE), + + AETHER_SKYROOT(ID.AETHER, "skyroot", 60, "skyroot_planks", 0, "skyroot_slab", 0), + AETHER_GREATROOT(ID.AETHER, "greatroot", 61, "dark_skyroot_planks", 0, "greatroot_slab", 0), + AETHER_WISPROOT(ID.AETHER, "wisproot", 62, "light_skyroot_planks", 0, "wisproot_slab", 0), + AETHER_THERAWOOD(ID.AETHER, "therawood", 63, "therawood_planks", 0, "therawood_slab", 0) ; private static final Map RESOURCE_LOOKUP; @@ -186,5 +193,6 @@ private static class ID { public static final String BOP = "biomesoplenty"; public static final String FORESTRY = "forestry"; public static final String IMMENG = "immersiveengineering"; + public static final String AETHER = "aether"; } } diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java b/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java index ecf6ae9..00c4d89 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java @@ -87,7 +87,6 @@ public static ItemStack makeBasicDrawerItemStack (EnumBasicDrawer info, String m @SubscribeEvent public static void registerRecipes (RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); - ConfigManager config = StorageDrawers.config; ConfigManagerExt configExt = StorageDrawersExtra.config; for (EnumVariant variant : EnumVariant.values()) { @@ -112,40 +111,57 @@ public static void registerRecipes (RegistryEvent.Register event) { slabStack = new ItemStack(block, 1, variant.getSlabMeta()); } - String material = variant.getResource().toString(); - - if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL1.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL2.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL4.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF2.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF4.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) { - @Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta()); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack) - .setRegistryName(result.getItem().getRegistryName() + "_" + variant.toString())); + registerRecipes(registry, variant, plankStack, slabStack); + + // attempt to do Aether 1 skyroot as well + if (variant == EnumVariant.AETHER_SKYROOT) { + Block block = Block.getBlockFromName("aether_legacy:skyroot_plank"); + if (block != null) + plankStack = new ItemStack(block, 1, variant.getPlankMeta()); + block = Block.getBlockFromName("aether_legacy:skyroot_slab"); + if (block != null) + slabStack = new ItemStack(block, 1, variant.getSlabMeta()); + + registerRecipes(registry, variant, plankStack, slabStack); } } } + + private static void registerRecipes(IForgeRegistry registry, EnumVariant variant, ItemStack plankStack, ItemStack slabStack) { + ConfigManager config = StorageDrawers.config; + String material = variant.getResource().toString(); + + if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL1.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL2.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL4.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF2.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF4.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) { + @Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta()); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack) + .setRegistryName(result.getItem().getRegistryName() + "_" + variant.toString())); + } + } @SubscribeEvent @SideOnly(Side.CLIENT) From 62e1d0f234e79981d71d4de119d1d6f3d3fe1518 Mon Sep 17 00:00:00 2001 From: raptor4694 Date: Wed, 17 Apr 2019 16:07:01 -0400 Subject: [PATCH 2/2] Fixed localization issues --- .../storagedrawersextra/lang/en_US.lang | 126 +++++++++--------- .../block/EnumVariant.java | 4 +- .../item/ItemTrimExtra.java | 14 +- 3 files changed, 73 insertions(+), 71 deletions(-) diff --git a/resources/assets/storagedrawersextra/lang/en_US.lang b/resources/assets/storagedrawersextra/lang/en_US.lang index ce84b43..6b4473a 100644 --- a/resources/assets/storagedrawersextra/lang/en_US.lang +++ b/resources/assets/storagedrawersextra/lang/en_US.lang @@ -8,74 +8,74 @@ tile.extraDrawers.halfdrawers4.name=Half Drawers 2x2 tile.extraTrim.name=Storage Trim # Materials (Natura) -storagedrawers.material.natura:eucalyptus=Eucalyptus -storagedrawers.material.natura:sakura=Sakura -storagedrawers.material.natura:ghostwood=Ghostwood -storagedrawers.material.natura:redwood=Redwood -storagedrawers.material.natura:bloodwood=Bloodwood -storagedrawers.material.natura:hopseed=Hopseed -storagedrawers.material.natura:maple=Maple -storagedrawers.material.natura:silverbell=Silverbell -storagedrawers.material.natura:purpleheart=Amaranth -storagedrawers.material.natura:tigerwood=Tigerwood -storagedrawers.material.natura:willow=Willow -storagedrawers.material.natura:darkwood=Darkwood -storagedrawers.material.natura:fusewood=Fusewood +storagedrawers.material.natura.eucalyptus=Eucalyptus +storagedrawers.material.natura.sakura=Sakura +storagedrawers.material.natura.ghostwood=Ghostwood +storagedrawers.material.natura.redwood=Redwood +storagedrawers.material.natura.bloodwood=Bloodwood +storagedrawers.material.natura.hopseed=Hopseed +storagedrawers.material.natura.maple=Maple +storagedrawers.material.natura.silverbell=Silverbell +storagedrawers.material.natura.purpleheart=Amaranth +storagedrawers.material.natura.tigerwood=Tigerwood +storagedrawers.material.natura.willow=Willow +storagedrawers.material.natura.darkwood=Darkwood +storagedrawers.material.natura.fusewood=Fusewood # Materials (Biomes O' Plenty) -storagedrawers.material.biomesoplenty:sacredoak=Sacred Oak -storagedrawers.material.biomesoplenty:cherry=Cherry -storagedrawers.material.biomesoplenty:dark=Umbran -storagedrawers.material.biomesoplenty:fir=Fir -storagedrawers.material.biomesoplenty:ethereal=Ethereal -storagedrawers.material.biomesoplenty:magic=Magic -storagedrawers.material.biomesoplenty:mangrove=Mangrove -storagedrawers.material.biomesoplenty:palm=Palm -storagedrawers.material.biomesoplenty:redwood=Redwood -storagedrawers.material.biomesoplenty:willow=Willow -storagedrawers.material.biomesoplenty:pine=Pine -storagedrawers.material.biomesoplenty:hellbark=Hellbark -storagedrawers.material.biomesoplenty:jacaranda=Jacaranda -storagedrawers.material.biomesoplenty:mahogany=Mahogany -storagedrawers.material.biomesoplenty:ebony=Ebony -storagedrawers.material.biomesoplenty:eucalyptus=Eucalyptus +storagedrawers.material.biomesoplenty.sacredoak=Sacred Oak +storagedrawers.material.biomesoplenty.cherry=Cherry +storagedrawers.material.biomesoplenty.dark=Umbran +storagedrawers.material.biomesoplenty.fir=Fir +storagedrawers.material.biomesoplenty.ethereal=Ethereal +storagedrawers.material.biomesoplenty.magic=Magic +storagedrawers.material.biomesoplenty.mangrove=Mangrove +storagedrawers.material.biomesoplenty.palm=Palm +storagedrawers.material.biomesoplenty.redwood=Redwood +storagedrawers.material.biomesoplenty.willow=Willow +storagedrawers.material.biomesoplenty.pine=Pine +storagedrawers.material.biomesoplenty.hellbark=Hellbark +storagedrawers.material.biomesoplenty.jacaranda=Jacaranda +storagedrawers.material.biomesoplenty.mahogany=Mahogany +storagedrawers.material.biomesoplenty.ebony=Ebony +storagedrawers.material.biomesoplenty.eucalyptus=Eucalyptus # Materials (Forestry) -storagedrawers.material.forestry:larch=Larch -storagedrawers.material.forestry:teak=Teak -storagedrawers.material.forestry:acacia=Acacia -storagedrawers.material.forestry:lime=Lime -storagedrawers.material.forestry:chestnut=Chestnut -storagedrawers.material.forestry:wenge=Wenge -storagedrawers.material.forestry:baobab=Baobab -storagedrawers.material.forestry:sequoia=Sequoia -storagedrawers.material.forestry:kapok=Kapok -storagedrawers.material.forestry:ebony=Ebony -storagedrawers.material.forestry:mahogany=Mahogany -storagedrawers.material.forestry:balsa=Balsa -storagedrawers.material.forestry:willow=Willow -storagedrawers.material.forestry:walnut=Walnut -storagedrawers.material.forestry:greenheart=Greenheart -storagedrawers.material.forestry:cherry=Cherry -storagedrawers.material.forestry:mahoe=Mahoe -storagedrawers.material.forestry:poplar=Poplar -storagedrawers.material.forestry:palm=Palm -storagedrawers.material.forestry:papaya=Papaya -storagedrawers.material.forestry:pine=Pine -storagedrawers.material.forestry:plum=Plum -storagedrawers.material.forestry:maple=Maple -storagedrawers.material.forestry:citrus=Citrus -storagedrawers.material.forestry:giganteum=Giant Sequoia -storagedrawers.material.forestry:ipe=Ipe -storagedrawers.material.forestry:padauk=Padauk -storagedrawers.material.forestry:cocobolo=Cocobolo -storagedrawers.material.forestry:zebrawood=Zebrawood +storagedrawers.material.forestry.larch=Larch +storagedrawers.material.forestry.teak=Teak +storagedrawers.material.forestry.acacia=Acacia +storagedrawers.material.forestry.lime=Lime +storagedrawers.material.forestry.chestnut=Chestnut +storagedrawers.material.forestry.wenge=Wenge +storagedrawers.material.forestry.baobab=Baobab +storagedrawers.material.forestry.sequoia=Sequoia +storagedrawers.material.forestry.kapok=Kapok +storagedrawers.material.forestry.ebony=Ebony +storagedrawers.material.forestry.mahogany=Mahogany +storagedrawers.material.forestry.balsa=Balsa +storagedrawers.material.forestry.willow=Willow +storagedrawers.material.forestry.walnut=Walnut +storagedrawers.material.forestry.greenheart=Greenheart +storagedrawers.material.forestry.cherry=Cherry +storagedrawers.material.forestry.mahoe=Mahoe +storagedrawers.material.forestry.poplar=Poplar +storagedrawers.material.forestry.palm=Palm +storagedrawers.material.forestry.papaya=Papaya +storagedrawers.material.forestry.pine=Pine +storagedrawers.material.forestry.plum=Plum +storagedrawers.material.forestry.maple=Maple +storagedrawers.material.forestry.citrus=Citrus +storagedrawers.material.forestry.giganteum=Giant Sequoia +storagedrawers.material.forestry.ipe=Ipe +storagedrawers.material.forestry.padauk=Padauk +storagedrawers.material.forestry.cocobolo=Cocobolo +storagedrawers.material.forestry.zebrawood=Zebrawood # Materials (Immersive Engineering) -storagedrawers.material.immersiveengineering:immeng_treated=Treated Wood +storagedrawers.material.immersiveengineering.immeng_treated=Treated Wood # Materials (Aether) -storagedrawers.material.aether:skyroot=Skyroot -storagedrawers.material.aether:greatroot=Greatroot -storagedrawers.material.aether:wisproot=Wisproot -storagedrawers.material.aether:therawood=Therawood +storagedrawers.material.aether.skyroot=Skyroot +storagedrawers.material.aether.greatroot=Greatroot +storagedrawers.material.aether.wisproot=Wisproot +storagedrawers.material.aether.therawood=Therawood diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java index cf66f49..1014733 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java @@ -122,7 +122,9 @@ public String getPath () { @Override @Nonnull public String getName () { - return resource.toString(); + // good practice to use dots to separate domain and path instead of + // colon in unlocalized name, to support future versions + return resource.getResourceDomain() + "." + resource.getResourcePath(); } public EnumMod getMod () { diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java b/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java index eba02c9..5966b90 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java @@ -17,30 +17,30 @@ public class ItemTrimExtra extends ItemBlock { - public ItemTrimExtra (final Block block) { + public ItemTrimExtra(final Block block) { super(block); setMaxDamage(0); } @Override - public int getMetadata (int damage) { + public int getMetadata(int damage) { return damage; } @Override @Nonnull - public String getUnlocalizedName (@Nonnull ItemStack stack) { - return "tile.extra_trim"; + public String getUnlocalizedName(@Nonnull ItemStack stack) { + return "tile.extraTrim"; } @Override @SideOnly(Side.CLIENT) - public void addInformation (@Nonnull ItemStack itemStack, @Nullable World world, List list, ITooltipFlag advanced) { + public void addInformation(@Nonnull ItemStack itemStack, @Nullable World world, List list, ITooltipFlag advanced) { Block block = Block.getBlockFromItem(itemStack.getItem()); if (block instanceof BlockTrimExtra) { BlockTrimExtra trim = (BlockTrimExtra)block; - EnumVariant varient = EnumVariant.byGroupMeta(trim.getGroup(), itemStack.getMetadata()); - list.add(I18n.format("storageDrawers.material", I18n.format("storageDrawers.material." + varient.getName()))); + EnumVariant variant = EnumVariant.byGroupMeta(trim.getGroup(), itemStack.getMetadata()); + list.add(I18n.format("storagedrawers.material", I18n.format("storagedrawers.material." + variant.getName()))); } } }