From fbbb539b484472634ff6eb3464a2a8b4c056d332 Mon Sep 17 00:00:00 2001 From: kitsushadow Date: Sun, 5 Jul 2015 06:54:17 -0400 Subject: [PATCH] Fix more Renderers --- .classpath | 118 +-- .../2.0/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .gradle/2.0/taskArtifacts/fileHashes.bin | Bin 73320 -> 73320 bytes .gradle/2.0/taskArtifacts/fileSnapshots.bin | Bin 20945 -> 20945 bytes .gradle/2.0/taskArtifacts/taskArtifacts.bin | Bin 22574 -> 22574 bytes .gradle/gradle.log | 2 +- .settings/org.eclipse.jdt.core.prefs | 2 +- .../kitsumedievalcraft/models/StoneTongs.png | Bin 2016 -> 665 bytes .../kitsumedievalcraft/models/TongsEmpty.mtl | 12 + .../kitsumedievalcraft/models/TongsEmpty.obj | 720 +++++++++--------- .../kitsu/medievalcraft/block/ModBlocks.class | Bin 8648 -> 8858 bytes .../block/ingots/DamascusIngot.class | Bin 2086 -> 994 bytes .../block/ingots/IngotBase.class | Bin 3726 -> 5046 bytes .../block/ingots/IronPlate.class | Bin 2063 -> 1062 bytes .../block/ingots/LapisIngot.class | Bin 2079 -> 987 bytes .../block/ingots/RedstoneIngot.class | Bin 2091 -> 999 bytes .../block/ingots/RefinedIron.class | Bin 2083 -> 991 bytes .../medievalcraft/events/EventHandle.class | Bin 16421 -> 16421 bytes .../item/craftingtools/SlottedTongs.class | Bin 4378 -> 4378 bytes .../renderer/RendererRegistry.class | Bin 8952 -> 9337 bytes .../ingotsplates/DamascusIngotIR.class | Bin 0 -> 4506 bytes .../ingotsplates/IRLapisIngot.class | Bin 4120 -> 0 bytes .../ingotsplates/IRRedstoneIngot.class | Bin 4132 -> 0 bytes .../ingotsplates/IRRefinedIngot.class | Bin 4128 -> 0 bytes .../ingotsplates/ItemRendererDamIngot.class | Bin 4145 -> 0 bytes .../ItemRendererHotDamIngot.class | Bin 3877 -> 0 bytes .../ItemRendererHotIronPlate.class | Bin 4162 -> 0 bytes .../ingotsplates/LapisIngotIR.class | Bin 0 -> 4495 bytes .../ingotsplates/RedstoneIngotIR.class | Bin 0 -> 4510 bytes .../itemrenderer/tongs/IRSlottedTongs.class | Bin 7505 -> 8323 bytes .../kitsu/medievalcraft/block/ModBlocks.java | 4 + .../block/ingots/DamascusIngot.java | 11 - .../medievalcraft/block/ingots/IngotBase.java | 33 +- .../medievalcraft/block/ingots/IronPlate.java | 6 - .../block/ingots/LapisIngot.java | 10 - .../block/ingots/RedstoneIngot.java | 10 - .../block/ingots/RefinedIron.java | 10 - .../medievalcraft/events/EventHandle.java | 5 +- .../item/craftingtools/SlottedTongs.java | 1 - .../renderer/RendererRegistry.java | 7 + ...ererDamIngot.java => DamascusIngotIR.java} | 82 +- .../ingotsplates/IRRefinedIngot.java | 154 ---- .../ingotsplates/ItemRendererHotDamIngot.java | 149 ---- .../ItemRendererHotIronPlate.java | 149 ---- .../{IRLapisIngot.java => LapisIngotIR.java} | 82 +- ...edstoneIngot.java => RedstoneIngotIR.java} | 82 +- .../itemrenderer/tongs/IRSlottedTongs.java | 72 +- .../kitsumedievalcraft/models/StoneTongs.png | Bin 2016 -> 665 bytes .../kitsumedievalcraft/models/TongsEmpty.mtl | 12 + .../kitsumedievalcraft/models/TongsEmpty.obj | 720 +++++++++--------- 50 files changed, 1027 insertions(+), 1426 deletions(-) create mode 100644 bin/assets/kitsumedievalcraft/models/TongsEmpty.mtl create mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/DamascusIngotIR.class delete mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRLapisIngot.class delete mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRedstoneIngot.class delete mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRefinedIngot.class delete mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererDamIngot.class delete mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotDamIngot.class delete mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotIronPlate.class create mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/LapisIngotIR.class create mode 100644 bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/RedstoneIngotIR.class rename src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/{ItemRendererDamIngot.java => DamascusIngotIR.java} (70%) delete mode 100644 src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRefinedIngot.java delete mode 100644 src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotDamIngot.java delete mode 100644 src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotIronPlate.java rename src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/{IRLapisIngot.java => LapisIngotIR.java} (70%) rename src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/{IRRedstoneIngot.java => RedstoneIngotIR.java} (70%) create mode 100644 src/main/resources/assets/kitsumedievalcraft/models/TongsEmpty.mtl diff --git a/.classpath b/.classpath index c3151cc0..770a4f99 100644 --- a/.classpath +++ b/.classpath @@ -4,63 +4,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index 61aba48d795a01946bd06f9f5c2d2d80705484c3..fbe8c07ba2897948b5cff95624ec3fa484927506 100644 GIT binary patch literal 17 VcmZS9*&j0BY(s> l0(=)Ys|o4!V*4d!c_(aMn8l}OxYmyi)#XtJOLtdAL#%9 delta 107 zcmaE{hvmf{mWC~iWwIjS4fPKgz`!ROMCG6IJvzNhmN5!RhA|N&!=39AH2sGxqpP-( lAj6U6SF`?K_*={MbQ6QPka7h7R!hy*Sk_rM}GFQ1-HKw0} zs`i>(AQ>Q_Xj!+<^|b0-h+x3G$vY%11gt(9g_d-=?}uv7ocu!4aD7 delta 252 zcmcb(nDOFb#tAY;J_i^W7$krg2m)pRi7+se!6y?)heOx_?|^h6hfm^?#@hebSTp4sFHQX(t|UggdKGc1*!*@4`=G2yW2<^YdI FP5`AXPOJa` diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index 87d37a73555bc7fc95e7e4924849324571da7c62..42184ee10daafc74c95df2a315a2a4351c793c97 100644 GIT binary patch delta 164 zcmZ3tfpOgi#tm13gqAUXT9m*LtvJtj#k?(>jCAdvPyQe5KDpN4bn~?!Nk&ZuAmBX5 zBwBjLn1O-uH4r}r;z!K)taWywJ%#Lz1y}b>W(?7r%9vY7JYYPAX0wzgB zK~y-)1;Gn)+%^zE!8ad(M^ zgx~-COP7QJfdj!b!OJMy(Q$Nw1vFMdtIoKCO*dv3Qi?1iVuQA5;cQ|YZ^x@pTPFgf zH6Aso?FKqsUnmz=#@7<67r7QSoK)q#Pf7ms$It3ZSMg4r5WvLP@O&Cc|s z;$nHHm7%f%)LC0c8%Sx4V;P+^b3N<|Eo2G*bka3n*Z zwZZo^G>hkM$R(`J$s^IjU)-g*E^ZS{h1fe1M!q^qW0~+!CmzPIn|FuN0%DlD<7Hc}IlD-s1r*|P2giLg{NzZR;d$3Tf75F03Y34kJBco8AWItK^ z#kzLd4MF0MNKQR4-CzV4$yys)3-c4ni|@Zdug39GUM?JxTrP<2=vjZkk@VLjwRmQu z(dcbZcjt5KY@eN_9c=ND%J4-q$G;2xFzC~$htO0w{laV#2K2$6#<_tCOj(@S*i;c& zY(E@-*`(e@*OTRi+?_h0M(0zCt~Z-Mneji0BXUw%R0bh|w!7Fp$W@HjfdT6cdIvw% ziK(lT)A>o=o%> zo`6L$p9;0;l3exVcR3wngkcDp1L3BaxODyidU`|z#4RDU00000NkvXXu0mjfo!K0i literal 2016 zcmV<62Os!}P)=pz06~Bt8)Q{=Rk!@>ufFOE7zacqA7B47hG89~!TkPr0H_-4@4kb&2%HYZrjprc z2g90{iR1?03ggp{|Bf|W+UQ8GuYPsciiEA?NW4YxQ>hiG41RLR>taIhX8h?tap3yJ zzp!?qTIepioigZg*BJ7kau8p^`vmp{0LhX&d8YBD`Vc9ILA{G6;$Le)Tg(6ca_xEv9|dSVrLtuGq5 zRH$6YG%|vU7XWhdXa%dEYCxpHpqFtJq};r;G`kD2Mr0!~F)7j#(c-CK)$|Ky|KazL zLF*u;IHXyohzeSZVTy|4)J3Kt9=s#`&(Hn|7uccXOswWj%K?Le3ZjIrX8FdLz~b1& z6JfrLBc)*sWD6$ELU9G#n{1(^&=CA%7-t!Rvb#tv48Og>nkZpPQ)_`wb{MV3#T#B_xZscfymgCusq?aD+00 z3Jx7?zuhupU=n|0$7zL@V0O2S^~7aUI;rW z8q7X!5y^z!RKi<1)PVOSLSPF)ft+|3Qu}XWc)k(4+#pczpdG)(3KYpiie=5HXTX7Kk{+?FlNy zmM3Bd?st0nGmwJAoQUGtaLY;b=DHFcLW?rhA(S$QCD4IdQOClrLA?cgZO}&Au@51J zGLB{(&F6k&w6S;dERa#O!?Y&zj^km4`!d=ViPN*$Gtp?IjW)Hi*$jvqv*yei>@26*-%{oSj1X1)WT5b|%*=j`dOj4SX~nn~_i! z2r$+=zJU@#jJIs0z|Us!eC-Q`bmGzYR+c79lhQ(8@675Jx)%WYSU; z#Z!_jr5mmaVmGBqR&%*QLqwyZsL0Lh;YbFb|NJ4*yfs|jG@I2Ec{V(QEr$8shD75g zN!5Th4oebeCm4mzCS;(p8CjGRTNByJ5J$NXpHv2WICCf_>$Ns0Z&#B(IDJt)2nRLc zs{RtkUXo}VVvF4ekG^nmWGLPWY!HQ^>>6|{?oGr-%jm77ow#kFZifVhI$?q8rlr{S zU~Xsq{O<{$jD4f49+O82$s1VnGZZ}riE>#Ganf696G9&x1(C`~Av;Llm_5mDq#N3W zcF`Rmg{1S$BJCZKMW*5(d+0H6}^p yAd^dsdQ<96QFX!u(T%F1k(8bo3di~q$Nvl5)*mr)%kjYg0000A$t`+r|Mv?MTUd0}}MMHrD5BxH#YbWwpFylYWRVQMrlx?6Nrch)*A zld{N^EZH37N{S$Y(be44HV?V7!=RINVs;_@wVRjs_wfGU;WmE&fYJwnoHCWW;d5< z;0o6e=oE881MBNKIjfU>OMZ{=M;37&w7q8#>rQ+o^NIc v-^~Gjm?nOjv-~mC>GjEFgUGm|v<<^*|GQ(Qij!52~O5Xkh-{P0G delta 386 zcmX|-J4h8^7>1wkzj(m}1Cb*R>83751}cbo$FV`gQJowV92(qCIMpDYJd#Jr3*PdE zor6~#BoN``;_)bIMqz29S#Z>dCh>Q1`QGn+pY7?d3Rfg=-mIbv zP(hPtK0p1T$|<74(FcgTmP)Ezrc+IcTb@DOHRg`lPxGxAVe1V!tSASGqs;wXq~W8O zH?DP4i=P+t;N>mv>1B=p>-2F3bUk+SXTep(kVoAHru+CsIF&6x3Q~V zv8RXG*DD<82%q&ChX%eF4`0n=zL^@nn+ATEc8-mY6En$A^N~|?z`2R>%O-GPGx==` n`D33Gvw6*2+Lv6}0M|CiUmND%y})AIDG?{n$&u|lPZGTa$T4T6 diff --git a/bin/com/kitsu/medievalcraft/block/ingots/DamascusIngot.class b/bin/com/kitsu/medievalcraft/block/ingots/DamascusIngot.class index fc1813636ca2de30cf62579a6619aee2909a7ab4..d13e8c813fde9a094df25ed9281a67a43be31616 100644 GIT binary patch delta 307 zcmZ9FPfo&65Qo1<+t){_P=yLb1pJ$*ghiuQAR+Mr9>Bdf@C>AhM_@&a%7O$EcWgX{ z2O&;h8y94fncvL(=9_u+>jyu(^*4}mJqxzW2X~;{SaCm#I@ycYH!a#B9-ZvXd#nyQ z_c>GC}^cG*DJW z;;D!}qAA&z*+lvrYc{l=RvdqbF1Xs>#3l3Dn*O1NgswFhPUuUmYP3wzZfj` QfL#j=i+#ycTw2%F9|UI`00000 literal 2086 zcma)7ZF3V<6n<_Sx=Fgwvb4p5B3cSb3Ry*bfz(u!HV{pV(wJD^Z<0%0yV=d`ZUWU` z0^j`ZFv>XT49xHY9Q{j<=iW_dOcSLuy}NhsInO!Ixz9QI8m zS%Kd+o1$Tf4!7$bzZ;k}+pX`Jmb2>yzPZku+^@I&qTFhTFr;6|Pub_VFBqm)EyoJ7 z46BLK54^)on>)MacHmKnOvw>}*|Z!n7`w>>;aS`^H+wIcWQ8G;cN-#(NyKyI!@yyhG^i1R2k+H$s;ag%Wy`=S-eaM`y$B6>X*g+pzVn*-lY1OBV&)MoAS-X za1Q4+yvlHK+*P#$%Qo|EKX996Ueoa!UT2uy?8zW6WkBB<5<}Nh_XH2DjtF?o%=g~O z&{r%j=vc-@h7-hM;E-YCg<+CI@j@wvv}BU;b?DU0Dvo!a9qhM5q*BmAHwI>KgH7;y>3WFq(s!heyEWYcp$ zMY2ENd=yzL{rOiUyZGQ?WbOKchmvkiM;`0pjj1B%WL8wsSfZf*WZTV@s5`gX&6@D& zs%;XaQF80tu5fBm+V?(2g6}QzyjB{gxiI%pV}*#%v>nntx2+#VBUHU{v{k5?`jdg- z(#YcW&krXDb(K=B*b?{3mMu1%zzX&m^24>g=X!R-tjaZ094;yKixA4wJOs&T_=Fgb zBi!@x`=eAk_Qz=)w{b^~p>2lAge>zh6`$ek5U;_s7??%>Mbh!E)UiX8PU=lz6l3@j zUu*b^AvrE3Pq_%s41J3Y9p9izaLs+oa~*X#MG{1u1nAX8fikA+?kBBgdRk6gQfkq0 zgqOFu?+af;ondM0L^_nJ2Etn$Ye>R--WN2Jh!*``fmSLHrfAh@_dBif`&Me@@&Tf$ zr-<(u`Tq_=ujHWKkgN^I=A~iCeUz z+)$)*rrthAiI5rDZuJ-xXfGK=pW^n;0Y3ee-ox0EBM9vfGx{7eiZVV^=TTHpRhXY+ or-zxQr}T|H#uvW~;VmmXJv{H>P2gK)^&L1phyVZp diff --git a/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class b/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class index 2c08b31872eda3b37cef89539b6bbb776217bd4d..f8a56b236abbc498fa857e93a081eecbc4f492dd 100644 GIT binary patch delta 1775 zcmcIj`*Raj6#j0qZL*sswrVM%O-o^vw3(8DNJ~YUR)^p!NTJY5eUvp_nb34oleJ_0 z!8jr^VoTNaMMdz5poo^1fS~w5>4@+5-lRY^uW++LT*Cvv&-qx5E zAJ8qMhheQnZAG*Gj4^%h|?;@ zaD>6B$5W(^l=$Z!#Dt2Y$Wo=WVTm+`1p!UdxX_TM)pl{I$5p(I6AW`G>AXJf&2>rB zA`8F-{ARa4`V#_ophi+7E*W6_IGmd%Ja z@wm=pIJfF_zbc_-K~9YuXBeb}KA;yzrs&T>KZU$JtKw69X76+FWk1->azOft?6X^C zpS?|vFvUJCKd`t0MVO5eRMP545LF1H8cmpo2x_nr^RWh3pdD9Y6Mb*RLVG}IV?ldT z>0}|h+Ovi&wfj8xmR>_IUJ?^^};5LXX}n*^M2Hy#GXxc$MC|{9uf6#-CXT5tpHZp22c#T{rv z0_$)O)+0l{3=^}HSPu&B2yP~y_-_PT(VL;GbGV&KIs|%%kW-)?gd~AZ;vE_S&wH27 ziUm4__sA}O_C6uEKpzm2DPuc6q*Wnl^Kcp;!9#*-^5|j8bir{B8(AY98EhkAIs4P_ ziY~teFa5Z3$K{xe`Ndi$iI3Oo&Ek{)IF|W8ivEk5tNwb!F*3*@rd>xC0$ud-Z^1Hp z*&A>h`f)pk(2WDwOvdV%qIsV~%pRJx!udJAuv@$}zAa+jsu-;!KW~OF@s)@s3P!)q bMeFY>5Ov@iq3K(EM_+~NevcpVGvq%2$mPdo delta 608 zcmchUUrUo=7{-5(duDUId#C&3cxzkE9GT+6?7&g(1)*lnje(*KA{d=Y1wsdTFz6&m zo7!W4wrVx#z@x#acHlur9hH6ukA=QLgpaQ$eS$p)*N=;f`?=x1I+v?4@2`LRKY(jA z+uoNlk_xTMOf%b(_QJuT%viO$w9~cv*OvV5ihI})$kp>f@W-&!Ri7>T)Fa=sNeee2`Z>=a7Z@kX6fx4ovAM`ChRAb? zMMfxT-Xp1o&7!!X*31==Qoqf-xUMY!(}5fKxJi&15@bj+tG@UP>fu17@*?^?#O8yT zqhaa5G|djx@jw@{O1BsOx38@`ne1U%V@#I=xAlFqOf$z4cX-S^o8;JIfuH)$M-=!= zQGE-{xORE1Qo)2+QpI4{^@g{OD>?4nnVY!JivH6;Xzk&yZs?RXN9(-T^y=&b4L;L% E0uMEcm;e9( diff --git a/bin/com/kitsu/medievalcraft/block/ingots/IronPlate.class b/bin/com/kitsu/medievalcraft/block/ingots/IronPlate.class index df4e786889d0b124bec6bac9bb44dff371047376..52791ca855263533576c9059d7a4752ec3cb8435 100644 GIT binary patch delta 377 zcmZ8cOHRWu6dX4{leiF^7D@{(rR9?}us}j$g~Wyx7huDRdt}8Dp~!b&#e$F2N>t(i z+y)MS7&j3}$nyKl%$sN5#}Bgk@%{D=;24Ji8s&Lv3RjkAcjnVc{AGm|#IK=yD%?$h zlQQm@Yi}TX=qq>_m|O31X&-5T1A)}CUtZ#57#Zp31%?oC=nY0ez0Vl1yJ58WS~kgN zkeLo69qLFc9Zk`ECey&GXrkMd1CbUxt8Md&MYWC&9SVUBbnBHD z1nf#VNAGHettZyi68k7n`DZGBO(oaZPjC)97;!>ijNRJvh}m-P3-%uW`Sqc@gj6M{ K4Fx6(S^fi2_#xN; literal 2063 zcma)7+j1L45Itin*2SCH+1L(FAPLw>BstLr%r&wdkZciwBtoo6nEOaOn8mAI)$T}1 z_z9lFH}C){O0FVRJn+c>@Ji9ME7?MpAg=Q4T>A9%={eo{^Y7n&2k;t16jKbDrrR5=ajB)Y<8SQ_&P#Z)a$pf@zUiMJGQx8s=A z$8Axj1QF)yWHzh21KS{V?`XJL*r2ewIuddY2ayT++7Y2Dw9 z$Zst|-YQK}S{U(YBO$7D9fy?8ZR>kshC0_z76+BjpcgP)ADhm>`EjqHItp|uD&k?) zvc--gE%}%sKbp;lu4kJ@U5(k|XcDPHgb0wvv6E~R6?*VVWcwI@&^Q(FsCgz(#y!<} zK4zFssvMsR0${i}LTorL24>NJk)*q?r0Y;~QxXe&6yw;#XHk60keU>e7eIt(gxI2~ z;d4Bo60!zey|~SgAjNr2QJ{cH7)LQ@RC^^^79B@;d7Jyb@S~uem5J@=SeH>W8I~s+ zlHQJrfEo}Hq8}#ENQuD=jZs?tN~7AZq}Og7B9?xJ#GbAl;>=nPXM0%eVY!}uikEs= zsi(Cbt_R~hMulMjaEjMQM4SiGJ(l>j!^9y;LLY~G9W@((K`_57e*0Dl; zKZOMtSfrv}!WNdXjSKjIzGbr5ChIFMe`3)>N6P3RDrR{HP?T(S)gU5)%{0ZbsLDU4R>K;Lm_W69x>~0((JE zUmHT4oO{nZ=YH=sTKd6a^*sYd3?{++YgA5*iPHz~);2i^@o1$l-u-r$zE96EoJ6hk z*K3qcNz%A-^GpvzNdTlq{fg9=yOYn}{fo=1DfUC_7J)R-gqn&GJKDN=jgVbA9Z*$j z+!nE?wxLd=z>eiJto@<+IOS>oT_y)-KSR6$wQH#5khaS$M2;XNopDO*I<5eBkq~mdN zyf1vq54h73Q5Xzb$7*f!N2Dx<>pIoO8w`mMe@FO1MeGQh;navrD5vW&a(YY04ZJOR zyIseu?RLaEC5U`3jc2p8v2UwVcT>kLd?cTp`yrD5 z@y^r8YUR(rBKd{KPa>-~A3u?F3p$Fp9p0EqazRE#8I7e%>L<%CQK9OrcH2$i(N)_d z$YjNBal6i`L}}fB8413%$n$z-oaVyVkMtB`o#;9wdTv|a3p12_@@SnaWhf3O_Mz+9rqPgNt~{JiDi$G>r*R09)9?|)jd5)I zKK_0am5zsvG>&_?FT2nN!(>Wk`Iw4;;oK0j!N3@pMgKC%cuUIIp++a=rZCDee2yx*GTxP!a2qS#QT zeWqp~qC&`wY^!|+C0a`c(dW3gxrdK`rg?a_FSXMp45jYCnoP8Vd7MZ1yp; k^pw7lXZY-=A-pApr-%D}ya{}*tiA!Kr)&gGn0SELKSkgh($ diff --git a/bin/com/kitsu/medievalcraft/block/ingots/RedstoneIngot.class b/bin/com/kitsu/medievalcraft/block/ingots/RedstoneIngot.class index 10c90a593d41fb4047e36454436894c0a76ac9b1..f4a3a37a689629db402da7403a665ca227effcf8 100644 GIT binary patch delta 322 zcmZ9FOHKko6h%)#e=1F@ts&vljxkQ|ySLtbr=F5c7=7|uBaRE~T-jmmC)L{(_q7*=9PECE+8?O>g<4KI%l4KgtqgijyMT^0-L3aV T=lLJ6nepO$U+@gWtTp-pOp_Wj literal 2091 zcma)7ZF3V<6n<_SnwKuLEN!u%h?YW#zkR^U;HY}pZk(X<@VAG^r|;aS`^)_X76RFxr8a7~fGIN};kU?Pf1 zhO>i!`L<=7!i(V~!x_cy2)UaHBrqlYrx|942CI_5&Q4CgeQ$IFzkFM_YpOPX+}k1NzR89Jro_CwO3WM8NAtq4!RP zzG87n!y+y-oFW!|hYV{k43ip&7fLatB@30*kV2Yal0w|&p6LkRXSk3o{-5Jj4cDaO zNpjp2zU2qpX^0pMhG@%b?DB`CEQU8VYLB-Vrb7IV@Po4G2%BMU$R(6g)i^o5t>GQK zD|x$Z$E@tN#5xs-d=^KuxwLg)t4g=5;U=;S8pYiTL`$7A?%ZfM>%ya} zwn>nB*==yU%Be+Z-}@K|zO%^lMtPLx!rX_A6(T;>c1ZW!wtf(1sCxZ)t57o?Oa_K4 zLyLQGemFU(tCVWRhIml1Y_aA9RtHG*sIS)S{t8!C}15~M<}A&QhX-T9HsGji;bTuY84 zyn@YrU-(fp7#2p3r9-_&L3r~c4M}~^n}Y@u(V`zM&`RaO1g%lp{Z6a=zL8$Kx{p}; z84}yNwvSUwU7YS>wu|{%`Uzg?VxgASy11g&rCM6gjCb({9o^{SJ=(5J>hJ40eO3RU zi(9`D;uzLw&0vz&X^MB6Mzf9u`aMWt1_oxS+2@eMJZ|G0KBVV5Srp0oVwe%`;4bYb zH3xhCVym9=9xr>E+qC@XyV-{IPM$yTEtTr4X z4B|WttPB#9r?UERDljOqGbl1LXoA#FW?~a&R%VcyEWu_lc{Q74y(a@R5Hc{ZYia9j zXW-ZfWHK>u0ZA?(&A`CVz{ViJzzt+6K$J1?Fz^C-Kn)ChKv_mGOMpQTsG5;Mh(Q=g zvIE83fP9d#9J?7rBDXV$Z2+<%=CXnHh(gUw1uKFZ%E2JXAO%*y!63~b12$BaK@MuD e9*_oE$g+t+ehr#|QeXplAo5W27#UQ+s#F1*WFFxF literal 2083 zcma)7ZF3V<6n<_Sx=Ff_lD0rW0d0XKg)HI=LTaiB4Xh?X+n8A2Z?d;_?PfQ#yD3zE z34HUr<0#{#GcdysaP%)Zp1YgUm?lbRdUx;M^E~G~=bm%&$KOw%1Gs^01rrR{TTWZs zF@3MAwS{4dU2e5pzU6C8%W3UsroHX>p0+NwOj{Vb>(~k+4B3}L=@MMvo?w_-F>TY& zGpwY_-}7CrS=`>%Hhh;HI&>u8lH1qNeXW zCn-*;IE^z5QQrxrGR&pYM<8U&a8|`Ryg~tc!Y|0&*Th4=>xwFGQ~tD(zDMOPz~*8& zkBbT}FkBvYRbAh-v|`uuopy~kRlJ7R8D=W|A}GotpzjQ+q3db6g8SyK@Oe`!_TS0S z3sfwrxP;3LCrHJ>A;a2B)1-&|g@qW(l8H*GNF&2AO)lF`Q48{ttLn#We{$ zPQZ2HnV!$>mWV=QP&#I7hd-psVt7NP=6I7K5%TW}&o7HzVKJN9MJVK{LE`50jMFY%FlcJ9YW z{-?XYL{`gx{uRkDJbD~iz4hp^lv_|y#GUZQf+QDYRFu(JsucXmwo8<$JFDGxQ@C{1 z78PW&?6kO5=hULK?|+Q=-|mhFo*{a6+kDgb0w@AxTcb#|$^e z$?apjgE1d$^!MI>qF%tFH)wfQ{qID>t t8Ug2L*z9v==_#?1C;0s5A-<)6PYuued=vO4u=*C9o^lp6VPFffe*i&9I}ZQ= diff --git a/bin/com/kitsu/medievalcraft/events/EventHandle.class b/bin/com/kitsu/medievalcraft/events/EventHandle.class index 442035228a3b59f725a91fcc2ee972a9c26fa052..afecafd3ca188030d71ef454910e9c520c2ffc67 100644 GIT binary patch delta 351 zcmWO2%`3wJ0LJm>dCEn3nVG#fh#578p}cI;BFy_+$ZHV}lB;r{=B7|ThL$1;W!@$( zE=uA+Ik-6~XMcc;-}PIc%lCMN$1A*=tj;yy7m;|*d=;EuO=*CrdfCw~2d3o2oLpE?p0OTSwRn)E0$5cDn>@&q*Kh|T z7N1#5%vuVEeDJ6|aUZm5xyDQZWGe`_>QJl@D%5};HNsF6_SKAcwct}>e5n;bYQwKO z@TV@Os+&&r(5+q;sgITFXGjAa(jccb%tehbqET*Wj5`|VfhHK&EbIVgkPMhh97eeQ F>mN1dCEnR8MfI$j1e|llwpX-YcelUY(%6aSLHy>O`(37mr)djnzwm5 zIXFlhl!Mz&%Gn>_;&=Vl=kh&W<>@M~rvioBC}#|Q?x2CY=;I#3+{ZHGi17f&JV{0a zUi#0F!E@MnfdVE>a%qw)lUyUh8!Ye^>r5ifJ3R0n&wMhz>kch1rg}v_-%!kV`1oOL z)qi@jkS+_dWragIC{->z%0sPeXqFwla$s8dn3ofaav2*9YZf=sR0^xgkSjNeRAIP+ zQH$5CRc7_UE-y+{oqP;hwNh`UAe?H1OHHU$E2`CoklJCW1BdFwhq~~kZlu(MANAr_ zefU#9GZmsk19WMS6&hlVhS{PKj%t)M8sn128C95@if~60Jklf+nu86%EYbmUi{0pI GPW=OQb4e`# diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/SlottedTongs.class b/bin/com/kitsu/medievalcraft/item/craftingtools/SlottedTongs.class index e983f8c486bc543916f9d49d9192836fc211ceea..e7e0bdac4bb6e5bfad39c0db2d0c05e952dbe932 100644 GIT binary patch delta 35 rcmbQGG)rkiDnFyoNeAUe~RGwZkh>%aCsYwvR| zP3x{O4_`fS5WpyE(V-CvMc5W@KWy$T^Q5?v>mw^8%}dra>-b8X@a2gOF1L6(#XVwb zZ@x0t5O1lhb>K@F1{!eGg|D%KU^FJ;v6`kxOH{`AY;dY@J`#C&<1hdu*p%_(|H_iD-RuOFS0sb)LC-SLwAki_(1>hK^svo|GE; zRZwcR^DGPpe#dzoe~7uMBW-`;FR>+cJzWqUN2aLp4-ge*fG%-uvDjw%?H6T(%VJ@M z6b-S?>lJ5A7yT=CC*_Hcy{Te|$8W#FMFjChFi(uka*8XSWXIIT$jW%EUMEeYc#FhG z9#bcticbA*Dl;|GS)Sq`yObP+i6WdG=2dbua*5BghKXEHviQvF*U2d>Qu%Frb~)JR z=|>(yg@~AAMT^g?lPN3weeZGD7oaq*pJfE35F}Kq<^^U@B>ZWVsowDuzuyQ+J%>=$ zr-uT5%4Kh{Xbc35{!+i?#^$`@K)_7{#q9JVaXH{K@}xe5P^A3h()>xc62|hzhKSZQ zkA0|=M~JOy6R1G6XJrc0V~PuDK6}0tMv2t)G8)az%8eqK7)vPbor2e0-k69kj<@PG zo-j#u%=H+-o@8w_Rv%476Al_DeYX=v_4-`NYG|#%x)4w;WD5d$<^$>85-5{0qg3OrJ4FYI6yrrRKc; zed%-`--AMNE;HSjCo2{b#whoMEGI>jyEV&aUnI499`8h2%7zMiR3;jE>OFUIX0|Jd zKc7er^70j||Hp86??y_hO!@UaXESkqKU%>*47BMVVu*9M$LxX~47AO>n4Xr)DQ zrqwL%<&)9i07yeA#}T-(7$MYSFrpZZr6}Y7ay6D=9+va732P9;M#QldtFavk?BdLR z+>b+O#Zjz97al-2){%kr6vTrx6m2vf8>kWwQ5`n6Q6nCvwRnU!;Zb@KkI^nXPW!Qm z4q-DL#go*9E!2&tGy_|;AlkKoct$J4vswwB(<<@2HV50ZC3s0&g_pJU*seW+9oh?c zMcav2wY_*vJBZh{Pw|F!1aE4muv0sax3p_`+vdVMwjc_2*#_ZVTM^!~mEwKdOzgJJ X#U5J&I&3ZY5Kc7@9tS04M9u#Ja`E9} delta 1526 zcmZXUYiv|i6ouEmL+|aK>CovsI-O~!<0w#|C=`l7p_D?w7O=EMh01fF6PyS$Qi=f- z8bPB%w1Mpd6a$!`5~Bt+BAlfDhG>jGG!`F-3R--C@(>ikeJ&3%{<&G-+3W1P&$^Eb z_2(!14qZCX4PZDevS1J@IN?fcKIGe5ThP~Mr`xlcrlrY_l!ea-Q#jdoEL-_r`%~B! zdI;0FIhNq2V1$SI0`vv%EU4nOzM$tYY&X8fHx`cYcHc19QGClE`_|I;T;ML|e827N z*;o*w|dfl>p1Zi$sk$6PK51}$9BhQE1v;kAJV z=ioA-o{t6wa>kd>?*;u9E{Thb|BRg%3Q-@~SH*KfA={-57NPNa6z_%#$#$a1DGZvq zx}L}J!e;6#n`YQvy-@J)V1B+>=%oPra;_aYm#f18+pm3vgb_|-Pu$Iy!#U>kbely* z+!Y>YhP9!XKM9Ye7$@T8Jh~`gmgvQsxVfm7ZoZ*qv6;|?{(PjUhRP%%9fTc8x2G0m zSGA-vZK?KDyPF1R(_q5ztD)uPPRX_}Nm(>Rp3OwFT$hJR%ra>-lsi57KzfBm6j zW%SNsH!p~W&0*SCdG&Eh6wy+;T>>d*Z8#H+m?O1e%=JdIve}L`7LC23QNpg$p7Gam zlKb(IVmD2Y46pQwmqg7P?U}?iCF5wa9IArfC<)kgda<5RDTf&1sY@LeWTpQ4Wk&R3$J@Lnl=$su8MnN)r{; z2~2U|4n++D(;S$ts8OKFfo4TB1@3m>9!0YS?sZ^}qIm)f1oleG2HbKzhibXbhZhSF zMG|FLgi0(%E!sNKh!o~v3GPE0D{(*8V=20j!FFV^2g|V^?Kp@I^hmWA56Yio71>x# z5v-v>c!@faP%&Y{Co1R=jBJ#&+XvykvZU9ma>) tY4l*1aU3rjr?Fe!s8?KGyy}YLHCGw-xGM3ws}^s<<75C3E!2vV{{Vrqp#A^= diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/DamascusIngotIR.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/DamascusIngotIR.class new file mode 100644 index 0000000000000000000000000000000000000000..f4834834d0e11e176bc405534bd8a419f1d02fb1 GIT binary patch literal 4506 zcmcInTW}NC8UBtfTeiHGFW3pU1Og_J4Y6YE0>K1)lR+R^MwaaulDKPWk!4o9Mp^+$ z8VX69G^Cfwr0FG1n)E_QQ`&Mzv>hf-=}f1YzV)pSoxXM2=}c$((stT@XIH|k$55KI zTCL9Yzn%X(|NrZk|NQ9<0Gn~$iwc3gNi!QfoU!tSU{*_Iw405UQ`P_WN20} zn=v$-_aQTv)`CerqZw8(947yGNtl2?8XF2lrU&EWgW-WlNMJ+6MH?(w89f-+@@65I z)FNh5wKAsBE8tCp9#4$NNl{bkbqQ4JW>TOkYo;_^pwrFDrG~vF7>>%FgN3|hX32A? zZEP}}7~C_R=%+4iRHV&qM4Mwoo6Cr{1&b0-&uan|2gB5A2lpBoYbUh|v`+|l1}V#n z7J>D5VPOsK5!hrq%H^l+w&M9=7@Y#OI!E@jz<9t7kJ})v-MwoGaV`+a^La#pf_i$~n$6?|B9Z^yog+vaXH_Gm zYt9vN05`SR6nTe(5|(3@nmpWl2NUju&13X-`)*( zVya*V9^>^jbE%A>@|N;;@Va=U$^!ShRkefBEr!T5wXfJV_db_b?j)V(S8tz5RGlxO zt~Ebv7WCA3zI3E}G<{yn3B11OQ14!bTernFxL5CrtCn+=qC;vij6GiL7TEsZpMRN; zf-v?nL=8k@gZrkthXi(f60M|85d~4n(;wPD9v&SH4Ncq3jG#Uo#FJh;A<)X?7SxZ;rS+gWuNiE1N4mNcJcT9!C9RJZ^0QHuk@t9Y-^58~ zVlez2#EgO@QjADxJ#Jb|uk3pRL;SQ)RDaN8?}KMopR+roU=D}rv9vzM5UCyFAq0kp zhubGSyI$+=mJAIArrbi2iJWTWWy(I}!x7}YAevXZ(6R`V3M_di>(iPg&r*i%v?e3j zQ3Z9V@!>e0@#1M-PdArRN{^Nky@F@)8L5J1-JBCx7g!WS%ca20J-xM*a6-Xnagx-I zQ$t3YY#C+`+HtFp(}D@7jj9H9&-ME7JU-{e3j#e$>ii$*6?`5q3e?SH zj8uuUKwuHVZkI78>hJ}e_Tpt`aF=k`Ww#T#s{&E*iUduqqg%hOOTT_e!I$N19ie2- zmytAl(nd&i-_8EUpEEHOPAijT!c()F&@5BjkSE&@on>*bDqj`997zCucY9+=(xU-Whk8sAJwI!6K z%YQgKvCHPZ8GVoj4Upc8s(|2!3xgQquRO@#a#5;~qIw%|QSSif%IfvAzn1StzFQu? zh|s&J@|>$Y$L_v`?#M!S{~0XfV&V)Gx%~{PDrwX$20cip13{|aWgpc}Y-Jwa&g9sO zNmfNqu|Go-q;VaNem9Lv*(OQdQnr~Dc5f1Ud05iSI@AVggnan7;S?Unlw)eeTSQP5 ztvcd1Rm_s8WUAQ2{#w2#`2L}Y11*^LH~5QCTc9=gWv4kUpCV@K>YDW;vh?Zv8}Jb* zYp$RmN1k`=;d%~>ICdG&bzDZ_Do(KpUdKxUMSSrr{?we_=CLJwWs!syyz2KiP}IF1 z`A}5zYsx2*b&7JD>VH?nS3j<{yU5|=(pJi=;{f?XdJ!yW0`&GqdaMWg@E9VTiSiji z0x<^e{j3M#%<>5w!#GZ|_IZJ*co7G1T4n(}!MOe;-X==k!!$17)3^>59}qFWASQkd z4ZlGezsD^8hz$NrPJe-pzaopj!w?lPMJ|60~MRlDl literal 0 HcmV?d00001 diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRLapisIngot.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRLapisIngot.class deleted file mode 100644 index d31efa1c0f49aa2f4c4c66479c4a67e56d7420f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4120 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 T8#wEt2Cw%vQ&uH@(A)ekmUcYO diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRefinedIngot.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRefinedIngot.class deleted file mode 100644 index dcf51836bb8e996ace2e866903d9f73fffe44ebd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4128 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 SXI<3b_1Tm`oBsv$=t2Vk diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotDamIngot.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotDamIngot.class deleted file mode 100644 index f966d51668dd7d8cb61234ee95d5ed8800c784f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3877 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 V<{Y?+BR#%&EPsQm)2YQ{{{i;uPg4K@ literal 7505 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 diff --git a/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java b/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java index 266b033a..47e4e615 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java @@ -25,6 +25,8 @@ import com.kitsu.medievalcraft.block.fluid.BlockSlackedLime; import com.kitsu.medievalcraft.block.fluid.BlockSmoke; import com.kitsu.medievalcraft.block.fluid.BlockTannin; import com.kitsu.medievalcraft.block.ingots.DamascusIngot; +import com.kitsu.medievalcraft.block.ingots.Diamond; +import com.kitsu.medievalcraft.block.ingots.Emerald; import com.kitsu.medievalcraft.block.ingots.IronPlate; import com.kitsu.medievalcraft.block.ingots.LapisIngot; import com.kitsu.medievalcraft.block.ingots.RedstoneIngot; @@ -243,5 +245,7 @@ public class ModBlocks { GameRegistry.registerBlock(redstoneIngot = new RedstoneIngot("redstoneIngot", Material.rock), "redstoneIngot"); GameRegistry.registerBlock(lapisIngot = new LapisIngot("lapisIngot", Material.rock), "lapisIngot"); + GameRegistry.registerBlock(myDiamond = new Diamond("myDiamond", Material.glass), "myDiamond"); + GameRegistry.registerBlock(myEmerald = new Emerald("myEmerald", Material.glass), "myEmerald"); } } \ No newline at end of file diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/DamascusIngot.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/DamascusIngot.java index f158aa43..489fe1e3 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/DamascusIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/DamascusIngot.java @@ -14,21 +14,10 @@ public class DamascusIngot extends IngotBase { public DamascusIngot(String unlocalizedName, Material material) { super(unlocalizedName, material); - this.setBlockTextureName(Main.MODID + ":" + unlocalizedName); - this.setCreativeTab(CustomTab.MedievalCraftTab); - this.setHardness(1.0F); - this.setResistance(1.0F); - this.setHarvestLevel("pickaxe", 0); - this.setStepSound(soundTypeMetal); - //xmin, ymin, zmin, - //xmax, ymax, zmax - this.setBlockBounds(0.17F, 0.0F, 0.315F, - 0.8F, 0.15F, 0.725F); } @Override public TileEntity createNewTileEntity(World world, int i) { - return new TileDamascus(); } diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java index 61b21232..338900d7 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java @@ -4,8 +4,10 @@ import java.util.Random; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -32,8 +34,8 @@ public abstract class IngotBase extends BlockContainer { this.setStepSound(soundTypeMetal); //xmin, ymin, zmin, //xmax, ymax, zmax - this.setBlockBounds(0.17F, 0.0F, 0.315F, - 0.8F, 0.15F, 0.725F); + this.setBlockBounds(0.25F, 0.0F, 0.35F, + 0.75F , 0.15F, 0.7F); } @Override @@ -42,7 +44,6 @@ public abstract class IngotBase extends BlockContainer { } @Override public TileEntity createNewTileEntity(World world, int i) { - // TODO Auto-generated method stub return null; } @@ -61,12 +62,31 @@ public abstract class IngotBase extends BlockContainer { parts(world, locX, locY, locZ); makeParts = false; } - - + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_){ + int a = player.inventory.currentItem; + if(player.inventory.getStackInSlot(a)!=null){ + if(player.inventory.getStackInSlot(a).getItem()==Item.getItemFromBlock(this)){ + ItemStack jar = new ItemStack(this); + player.inventory.addItemStackToInventory(jar); + if(!world.isRemote){ + world.setBlock(x, y, z, Blocks.air, 0, 2); + } + } + } + if(player.inventory.getStackInSlot(a)==null){ + ItemStack jar = new ItemStack(this); + player.inventory.setInventorySlotContents(a, jar); + if(!world.isRemote){ + world.setBlock(x, y, z, Blocks.air, 0, 2); + } + } + return true; } private void parts(World world, int x, int y, int z){ - world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); @@ -76,7 +96,6 @@ public abstract class IngotBase extends BlockContainer { world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); - } @Override diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/IronPlate.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/IronPlate.java index d5a239db..66126614 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/IronPlate.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/IronPlate.java @@ -14,12 +14,6 @@ public class IronPlate extends IngotBase { public IronPlate(String unlocalizedName, Material material) { super(unlocalizedName, material); - this.setBlockTextureName(Main.MODID + ":" + unlocalizedName); - this.setCreativeTab(CustomTab.MedievalCraftTab); - this.setHardness(1.0F); - this.setResistance(1.0F); - this.setHarvestLevel("pickaxe", 0); - this.setStepSound(soundTypeMetal); //xmin, ymin, zmin, //xmax, ymax, zmax this.setBlockBounds(0.3F, 0.0F, 0.3F, diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/LapisIngot.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/LapisIngot.java index 75f8bfc5..f77b884e 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/LapisIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/LapisIngot.java @@ -13,16 +13,6 @@ public class LapisIngot extends IngotBase { public LapisIngot(String unlocalizedName, Material material) { super(unlocalizedName, material); - this.setBlockTextureName(Main.MODID + ":" + unlocalizedName); - this.setCreativeTab(CustomTab.MedievalCraftTab); - this.setHardness(1.0F); - this.setResistance(1.0F); - this.setHarvestLevel("pickaxe", 0); - this.setStepSound(soundTypeMetal); - //xmin, ymin, zmin, - //xmax, ymax, zmax - this.setBlockBounds(0.17F, 0.0F, 0.315F, - 0.8F, 0.15F, 0.725F); } @Override diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/RedstoneIngot.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/RedstoneIngot.java index 69920f13..d45a83e2 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/RedstoneIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/RedstoneIngot.java @@ -14,16 +14,6 @@ public class RedstoneIngot extends IngotBase { public RedstoneIngot(String unlocalizedName, Material material) { super(unlocalizedName, material); - this.setBlockTextureName(Main.MODID + ":" + unlocalizedName); - this.setCreativeTab(CustomTab.MedievalCraftTab); - this.setHardness(1.0F); - this.setResistance(1.0F); - this.setHarvestLevel("pickaxe", 0); - this.setStepSound(soundTypeMetal); - //xmin, ymin, zmin, - //xmax, ymax, zmax - this.setBlockBounds(0.17F, 0.0F, 0.315F, - 0.8F, 0.15F, 0.725F); } @Override diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/RefinedIron.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/RefinedIron.java index 1b9eb041..8d99a9de 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/RefinedIron.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/RefinedIron.java @@ -13,16 +13,6 @@ public class RefinedIron extends IngotBase { public RefinedIron(String unlocalizedName, Material material) { super(unlocalizedName, material); - this.setBlockTextureName(Main.MODID + ":" + unlocalizedName); - this.setCreativeTab(CustomTab.MedievalCraftTab); - this.setHardness(1.0F); - this.setResistance(1.0F); - this.setHarvestLevel("pickaxe", 0); - this.setStepSound(soundTypeMetal); - //xmin, ymin, zmin, - //xmax, ymax, zmax - this.setBlockBounds(0.17F, 0.0F, 0.315F, - 0.8F, 0.15F, 0.725F); } @Override diff --git a/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java b/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java index ccbc4d5c..01534995 100644 --- a/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java +++ b/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java @@ -400,15 +400,14 @@ public void splitLogEvent(PlayerInteractEvent event){ if(!event.entity.worldObj.isRemote){ if (event.entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.entity; - //Block test = event.world.getBlock(event.x, event.y, event.z); - //Block isEmpty = event.world.getBlock(event.x, event.y + 1, event.z); ItemStack itemStack = new ItemStack(Items.diamond); if(player.isSneaking()){ if((player.inventory.getCurrentItem() != null)) { if((player.inventory.getCurrentItem().getItem().equals(Items.diamond))){ - if((event.action == event.action.RIGHT_CLICK_BLOCK ) ) { //&& (test == ModBlocks.testForge) && (isEmpty == Blocks.air) + if((event.action == event.action.RIGHT_CLICK_BLOCK )){ if(event.world.getBlock(event.x, event.y + 1, event.z).equals(Blocks.air)){ event.world.setBlock(event.x, event.y + 1, event.z, ModBlocks.myDiamond, 0, 2); + //event.world.setBlock(event.x, event.y+1, event.z, Blocks.bedrock); player.inventory.consumeInventoryItem(Items.diamond); } } diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/SlottedTongs.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/SlottedTongs.java index 9abb5b78..8985b030 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/SlottedTongs.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/SlottedTongs.java @@ -73,7 +73,6 @@ public class SlottedTongs extends Item { } } } - return true; } diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java b/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java index baf29619..79cc87cd 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java @@ -40,8 +40,11 @@ import com.kitsu.medievalcraft.renderer.itemrenderer.crucibles.empty.IRTanninCru import com.kitsu.medievalcraft.renderer.itemrenderer.crucibles.empty.IRWaterCrucible; import com.kitsu.medievalcraft.renderer.itemrenderer.crucibles.empty.ItemRendererECCrucible; import com.kitsu.medievalcraft.renderer.itemrenderer.crucibles.empty.ItemRendererSECrucible; +import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.DamascusIngotIR; import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.IronIngotIR; import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.IronPlateIR; +import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.LapisIngotIR; +import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.RedstoneIngotIR; import com.kitsu.medievalcraft.renderer.itemrenderer.machines.IRBarrelLid; import com.kitsu.medievalcraft.renderer.itemrenderer.machines.IRFirebox; import com.kitsu.medievalcraft.renderer.itemrenderer.machines.IRForgeAnvil; @@ -110,6 +113,7 @@ public class RendererRegistry { MinecraftForgeClient.registerItemRenderer(ModItems.itemModelArrow, new ItemRendererModelArrow()); MinecraftForgeClient.registerItemRenderer(ModItems.itemIronTippedModelArrow, new ItemRendererITModelArrow()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.emptySoftCrucible), new ItemRendererSECrucible()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.emptyCookedCrucible), new ItemRendererECCrucible()); @@ -133,7 +137,10 @@ public class RendererRegistry { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.crucibleRedstone), new IRCrucible()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.refinedIron), new IronIngotIR()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.damascus), new DamascusIngotIR()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.ironPlate), new IronPlateIR()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.lapisIngot), new LapisIngotIR()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.redstoneIngot), new RedstoneIngotIR()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoftEmptyCrucible.class, new SECrucibleRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEmptyCookedCrucible.class, new ECCrucibleRenderer()); diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererDamIngot.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/DamascusIngotIR.java similarity index 70% rename from src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererDamIngot.java rename to src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/DamascusIngotIR.java index 902e0b31..84e6c579 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererDamIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/DamascusIngotIR.java @@ -4,15 +4,19 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -public class ItemRendererDamIngot implements IItemRenderer { +public class DamascusIngotIR implements IItemRenderer { public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/IronIngotBlock.obj"); public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/DamascusIngot.png"); + public static final ResourceLocation TEXTURE1 = new ResourceLocation("kitsumedievalcraft:models/HotDamascusIngot.png"); + private ResourceLocation loc; public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); @@ -38,8 +42,7 @@ public class ItemRendererDamIngot implements IItemRenderer { } @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item,ItemRendererHelper helper) { switch(type) { case EQUIPPED: { @@ -67,23 +70,19 @@ public class ItemRendererDamIngot implements IItemRenderer { switch(type) { case EQUIPPED: { - GL11.glPushMatrix(); GL11.glRotated(90, 0, 1.0, 0); GL11.glRotated(-20, 1, 0, 0); GL11.glScalef(0.75F, 0.75F, 0.75F); - - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - //GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F); - //GL11.glRotated(90, 1.0, 0.0, 0.0); - GL11.glTranslatef(0.0F, 0.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); } break; @@ -94,55 +93,42 @@ public class ItemRendererDamIngot implements IItemRenderer { GL11.glRotated(-20, 1, 0, 0); GL11.glRotated(30, 0, 0, 1); GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - //GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(-0.2F, 1.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - case INVENTORY: { GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - //GL11.glScalef(8.0F, 8.0F, 8.0F); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - //GL11.glTranslatef(1.0F, 0.0F, -1.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - case ENTITY: { GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - default: break; } diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRefinedIngot.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRefinedIngot.java deleted file mode 100644 index 2afb4995..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRefinedIngot.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class IRRefinedIngot implements IItemRenderer { - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/IronIngotBlock.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/IronIngotBlock.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - GL11.glRotated(90, 0, 1.0, 0); - GL11.glRotated(-20, 1, 0, 0); - GL11.glScalef(0.75F, 0.75F, 0.75F); - - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - //GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F); - //GL11.glRotated(90, 1.0, 0.0, 0.0); - - GL11.glTranslatef(0.0F, 0.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - float f = 0.75F; - GL11.glPushMatrix(); - GL11.glRotated(45, 0, 1.0, 0); - GL11.glRotated(-20, 1, 0, 0); - GL11.glRotated(30, 0, 0, 1); - GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - //GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); - - - GL11.glTranslatef(-0.2F, 1.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - //GL11.glScalef(8.0F, 8.0F, 8.0F); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - //GL11.glTranslatef(1.0F, 0.0F, -1.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - - - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotDamIngot.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotDamIngot.java deleted file mode 100644 index beef15d4..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotDamIngot.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class ItemRendererHotDamIngot implements IItemRenderer { - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/IronIngotBlock.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/HotDamascusIngot.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - //GL11.glScalef(0.75F, 0.75F, 0.75F); - - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - //GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F); - //GL11.glRotated(90, 1.0, 0.0, 0.0); - - //GL11.glTranslatef(0.0F, -0.5F, 0.5F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - //float f = 8.0F; - GL11.glPushMatrix(); - //GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - //GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); - - - //GL11.glTranslatef(5.0F, 4F, 0.5F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - //GL11.glScalef(8.0F, 8.0F, 8.0F); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - //GL11.glTranslatef(1.0F, 0.0F, -1.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - - - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotIronPlate.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotIronPlate.java deleted file mode 100644 index 5f435527..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/ItemRendererHotIronPlate.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class ItemRendererHotIronPlate implements IItemRenderer { - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/IronPlate.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/HotIronPlate.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - float scale = 0.75F; - GL11.glScalef(scale, 3.5F, scale); - - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - //GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F); - //GL11.glRotated(90, 1.0, 0.0, 0.0); - - GL11.glTranslatef(1.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - float f = 2.0F; - GL11.glPushMatrix(); - GL11.glScalef(f, 8.0F, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); - - - GL11.glTranslatef(1.3F, -0.2F, 1.7F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - float f = 0.66F; - GL11.glScalef(f, 4.0F, f); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - //GL11.glTranslatef(1.0F, 0.0F, -1.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //float f = 0.8F; - GL11.glScalef(1.0F, 3.0F, 1.0F); - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - - - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRLapisIngot.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/LapisIngotIR.java similarity index 70% rename from src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRLapisIngot.java rename to src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/LapisIngotIR.java index 35e25ce8..ede2b9a5 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRLapisIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/LapisIngotIR.java @@ -4,15 +4,19 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -public class IRLapisIngot implements IItemRenderer { +public class LapisIngotIR implements IItemRenderer { public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/IronIngotBlock.obj"); public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/MyLapisBlock.png"); + public static final ResourceLocation TEXTURE1 = new ResourceLocation("kitsumedievalcraft:models/MyHotLapisBlock.png"); + private ResourceLocation loc; public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); @@ -38,8 +42,7 @@ public class IRLapisIngot implements IItemRenderer { } @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item,ItemRendererHelper helper) { switch(type) { case EQUIPPED: { @@ -67,23 +70,19 @@ public class IRLapisIngot implements IItemRenderer { switch(type) { case EQUIPPED: { - GL11.glPushMatrix(); GL11.glRotated(90, 0, 1.0, 0); GL11.glRotated(-20, 1, 0, 0); GL11.glScalef(0.75F, 0.75F, 0.75F); - - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - //GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F); - //GL11.glRotated(90, 1.0, 0.0, 0.0); - GL11.glTranslatef(0.0F, 0.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); } break; @@ -94,55 +93,42 @@ public class IRLapisIngot implements IItemRenderer { GL11.glRotated(-20, 1, 0, 0); GL11.glRotated(30, 0, 0, 1); GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - //GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(-0.2F, 1.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - case INVENTORY: { GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - //GL11.glScalef(8.0F, 8.0F, 8.0F); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - //GL11.glTranslatef(1.0F, 0.0F, -1.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - case ENTITY: { GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - default: break; } diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRedstoneIngot.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/RedstoneIngotIR.java similarity index 70% rename from src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRedstoneIngot.java rename to src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/RedstoneIngotIR.java index 9d660bc4..3f28f2af 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IRRedstoneIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/RedstoneIngotIR.java @@ -4,15 +4,19 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -public class IRRedstoneIngot implements IItemRenderer { +public class RedstoneIngotIR implements IItemRenderer { public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/IronIngotBlock.obj"); public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/MyRedstoneBlock.png"); + public static final ResourceLocation TEXTURE1 = new ResourceLocation("kitsumedievalcraft:models/MyHotRedstoneBlock.png"); + private ResourceLocation loc; public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); @@ -38,8 +42,7 @@ public class IRRedstoneIngot implements IItemRenderer { } @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item,ItemRendererHelper helper) { switch(type) { case EQUIPPED: { @@ -67,23 +70,19 @@ public class IRRedstoneIngot implements IItemRenderer { switch(type) { case EQUIPPED: { - GL11.glPushMatrix(); GL11.glRotated(90, 0, 1.0, 0); GL11.glRotated(-20, 1, 0, 0); GL11.glScalef(0.75F, 0.75F, 0.75F); - - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - //GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F); - //GL11.glRotated(90, 1.0, 0.0, 0.0); - GL11.glTranslatef(0.0F, 0.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); } break; @@ -94,55 +93,42 @@ public class IRRedstoneIngot implements IItemRenderer { GL11.glRotated(-20, 1, 0, 0); GL11.glRotated(30, 0, 0, 1); GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - //GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(-0.2F, 1.0F, 1.15F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - case INVENTORY: { GL11.glPushMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - //GL11.glScalef(8.0F, 8.0F, 8.0F); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - //GL11.glTranslatef(1.0F, 0.0F, -1.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - case ENTITY: { GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); - GL11.glPopMatrix(); - } break; - default: break; } diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/tongs/IRSlottedTongs.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/tongs/IRSlottedTongs.java index 0cccce8b..91f35466 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/tongs/IRSlottedTongs.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/tongs/IRSlottedTongs.java @@ -29,12 +29,17 @@ public class IRSlottedTongs implements IItemRenderer { public static final ResourceLocation DAMASCUS = new ResourceLocation("kitsumedievalcraft:models/HotDamascusIngot.png"); public static final ResourceLocation REFINEDIRON = new ResourceLocation("kitsumedievalcraft:models/HotIronIngotBlock.png"); public static final ResourceLocation IRON_PLATE = new ResourceLocation("kitsumedievalcraft:models/HotIronPlate.png"); + + public static final ResourceLocation MODEL_PLATE = new ResourceLocation("kitsumedievalcraft:models/IronPlate.obj"); + public static final ResourceLocation PLATE_TEXTURE = new ResourceLocation("kitsumedievalcraft:models/IronPlate.png"); + public static final ResourceLocation HOTPLATE_TEXTURE = new ResourceLocation("kitsumedievalcraft:models/HotIronPlate.png"); public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_TONGS); public IModelCustom modeltc = AdvancedModelLoader.loadModel(MODEL_TONGS_CRUCIBLE); public IModelCustom modelti = AdvancedModelLoader.loadModel(MODEL_TONGS_INGOT); public IModelCustom modelC = AdvancedModelLoader.loadModel(MODEL); public IModelCustom modelingot = AdvancedModelLoader.loadModel(MODEL_INGOT); + public IModelCustom modelPlate = AdvancedModelLoader.loadModel(MODEL_PLATE); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -99,7 +104,7 @@ public class IRSlottedTongs implements IItemRenderer { } //Crucible Renderer if((stack.getItemDamage()==1)||(stack.getItemDamage()==2)||(stack.getItemDamage()==3)||(stack.getItemDamage()==4)||(stack.getItemDamage()==5)){ - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); modeltc.renderAll(); GL11.glPushMatrix(); @@ -130,6 +135,19 @@ public class IRSlottedTongs implements IItemRenderer { modelingot.renderAll(); GL11.glPopMatrix(); } + + if((stack.getItemDamage()==10)){ + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); + modeltc.renderAll(); + GL11.glPushMatrix(); + float scale1 = 0.6F; + GL11.glScalef(scale1, 3.0f, scale1); + GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); + GL11.glTranslatef(8.6F, 0.0F, 0.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(HOTPLATE_TEXTURE); + modelPlate.renderAll(); + GL11.glPopMatrix(); + } GL11.glPopMatrix(); @@ -149,7 +167,7 @@ public class IRSlottedTongs implements IItemRenderer { } //Crucible Renderer if((stack.getItemDamage()==1)||(stack.getItemDamage()==2)||(stack.getItemDamage()==3)||(stack.getItemDamage()==4)||(stack.getItemDamage()==5)){ - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); modeltc.renderAll(); GL11.glPushMatrix(); float scale = 0.6F; @@ -177,6 +195,18 @@ public class IRSlottedTongs implements IItemRenderer { modelingot.renderAll(); GL11.glPopMatrix(); } + + if((stack.getItemDamage()==10)){ + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); + modeltc.renderAll(); + GL11.glPushMatrix(); + float scale = 0.6F; + GL11.glScalef(scale, 3.0f, scale); + GL11.glTranslatef(8.6F, 0.0F, 0.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(HOTPLATE_TEXTURE); + modelPlate.renderAll(); + GL11.glPopMatrix(); + } GL11.glPopMatrix(); @@ -198,7 +228,7 @@ public class IRSlottedTongs implements IItemRenderer { //Crucible Renderer if((stack.getItemDamage()==1)||(stack.getItemDamage()==2)||(stack.getItemDamage()==3)||(stack.getItemDamage()==4)||(stack.getItemDamage()==5)){ - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); modeltc.renderAll(); GL11.glPushMatrix(); float scale = 0.5F; @@ -226,6 +256,18 @@ public class IRSlottedTongs implements IItemRenderer { modelingot.renderAll(); GL11.glPopMatrix(); } + + if((stack.getItemDamage()==10)){ + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); + modeltc.renderAll(); + GL11.glPushMatrix(); + float scale = 0.6F; + GL11.glScalef(scale, 3.0f, scale); + GL11.glTranslatef(8.6F, 0.0F, 0.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(HOTPLATE_TEXTURE); + modelPlate.renderAll(); + GL11.glPopMatrix(); + } GL11.glPopMatrix(); } break; @@ -240,7 +282,7 @@ public class IRSlottedTongs implements IItemRenderer { } //Crucible Renderer if((stack.getItemDamage()==1)||(stack.getItemDamage()==2)||(stack.getItemDamage()==3)||(stack.getItemDamage()==4)||(stack.getItemDamage()==5)){ - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); modeltc.renderAll(); GL11.glPushMatrix(); float scale = 0.55F; @@ -250,15 +292,7 @@ public class IRSlottedTongs implements IItemRenderer { modelC.renderAll(); GL11.glPopMatrix(); } - /*if((stack.getItemDamage()==6)){ - float scale = 1.1F; - GL11.glScalef(scale, scale, scale); - GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); - GL11.glTranslatef(4.7F, 0.15F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(LAPIS); - modelingot.renderAll(); - GL11.glPopMatrix(); - }*/ + if(stack.getItemDamage()==6|| stack.getItemDamage()==7|| stack.getItemDamage()==8|| @@ -278,6 +312,18 @@ public class IRSlottedTongs implements IItemRenderer { modelingot.renderAll(); GL11.glPopMatrix(); } + if((stack.getItemDamage()==10)){ + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE_CRUCIBLE); + modeltc.renderAll(); + GL11.glPushMatrix(); + float scale = 0.6F; + GL11.glScalef(scale, 3.0f, scale); + GL11.glTranslatef(8.6F, 0.0F, 0.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(HOTPLATE_TEXTURE); + modelPlate.renderAll(); + GL11.glPopMatrix(); + } + GL11.glPopMatrix(); } break; diff --git a/src/main/resources/assets/kitsumedievalcraft/models/StoneTongs.png b/src/main/resources/assets/kitsumedievalcraft/models/StoneTongs.png index d5af2925e5336f30d901f83c29457a61be3a6f6e..312ebbdd386ae6f295b965a9a5b21049fa50a6e2 100644 GIT binary patch literal 665 zcmV;K0%rY*P)9vY7JYYPAX0wzgB zK~y-)1;Gn)+%^zE!8ad(M^ zgx~-COP7QJfdj!b!OJMy(Q$Nw1vFMdtIoKCO*dv3Qi?1iVuQA5;cQ|YZ^x@pTPFgf zH6Aso?FKqsUnmz=#@7<67r7QSoK)q#Pf7ms$It3ZSMg4r5WvLP@O&Cc|s z;$nHHm7%f%)LC0c8%Sx4V;P+^b3N<|Eo2G*bka3n*Z zwZZo^G>hkM$R(`J$s^IjU)-g*E^ZS{h1fe1M!q^qW0~+!CmzPIn|FuN0%DlD<7Hc}IlD-s1r*|P2giLg{NzZR;d$3Tf75F03Y34kJBco8AWItK^ z#kzLd4MF0MNKQR4-CzV4$yys)3-c4ni|@Zdug39GUM?JxTrP<2=vjZkk@VLjwRmQu z(dcbZcjt5KY@eN_9c=ND%J4-q$G;2xFzC~$htO0w{laV#2K2$6#<_tCOj(@S*i;c& zY(E@-*`(e@*OTRi+?_h0M(0zCt~Z-Mneji0BXUw%R0bh|w!7Fp$W@HjfdT6cdIvw% ziK(lT)A>o=o%> zo`6L$p9;0;l3exVcR3wngkcDp1L3BaxODyidU`|z#4RDU00000NkvXXu0mjfo!K0i literal 2016 zcmV<62Os!}P)=pz06~Bt8)Q{=Rk!@>ufFOE7zacqA7B47hG89~!TkPr0H_-4@4kb&2%HYZrjprc z2g90{iR1?03ggp{|Bf|W+UQ8GuYPsciiEA?NW4YxQ>hiG41RLR>taIhX8h?tap3yJ zzp!?qTIepioigZg*BJ7kau8p^`vmp{0LhX&d8YBD`Vc9ILA{G6;$Le)Tg(6ca_xEv9|dSVrLtuGq5 zRH$6YG%|vU7XWhdXa%dEYCxpHpqFtJq};r;G`kD2Mr0!~F)7j#(c-CK)$|Ky|KazL zLF*u;IHXyohzeSZVTy|4)J3Kt9=s#`&(Hn|7uccXOswWj%K?Le3ZjIrX8FdLz~b1& z6JfrLBc)*sWD6$ELU9G#n{1(^&=CA%7-t!Rvb#tv48Og>nkZpPQ)_`wb{MV3#T#B_xZscfymgCusq?aD+00 z3Jx7?zuhupU=n|0$7zL@V0O2S^~7aUI;rW z8q7X!5y^z!RKi<1)PVOSLSPF)ft+|3Qu}XWc)k(4+#pczpdG)(3KYpiie=5HXTX7Kk{+?FlNy zmM3Bd?st0nGmwJAoQUGtaLY;b=DHFcLW?rhA(S$QCD4IdQOClrLA?cgZO}&Au@51J zGLB{(&F6k&w6S;dERa#O!?Y&zj^km4`!d=ViPN*$Gtp?IjW)Hi*$jvqv*yei>@26*-%{oSj1X1)WT5b|%*=j`dOj4SX~nn~_i! z2r$+=zJU@#jJIs0z|Us!eC-Q`bmGzYR+c79lhQ(8@675Jx)%WYSU; z#Z!_jr5mmaVmGBqR&%*QLqwyZsL0Lh;YbFb|NJ4*yfs|jG@I2Ec{V(QEr$8shD75g zN!5Th4oebeCm4mzCS;(p8CjGRTNByJ5J$NXpHv2WICCf_>$Ns0Z&#B(IDJt)2nRLc zs{RtkUXo}VVvF4ekG^nmWGLPWY!HQ^>>6|{?oGr-%jm77ow#kFZifVhI$?q8rlr{S zU~Xsq{O<{$jD4f49+O82$s1VnGZZ}riE>#Ganf696G9&x1(C`~Av;Llm_5mDq#N3W zcF`Rmg{1S$BJCZKMW*5(d+0H6}^p yAd^dsdQ<96QFX!u(T%F1k(8bo3di~q$Nvl5)*mr)%kjYg0000