From 720b1b43fed10e34de48c1b6d972409eb09341ab Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 18 May 2013 02:52:00 -0400 Subject: [PATCH 1/2] Added some of the Origin block textures --- .../textures/blocks/originbricks.png | Bin 0 -> 590 bytes .../textures/blocks/origincobble.png | Bin 0 -> 669 bytes .../textures/blocks/origingravel.png | Bin 0 -> 800 bytes .../textures/blocks/originlappis.png | Bin 0 -> 728 bytes .../textures/blocks/originmossycobble.png | Bin 0 -> 718 bytes .../textures/blocks/originplanks.png | Bin 0 -> 331 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/originbricks.png create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/origincobble.png create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/origingravel.png create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/originlappis.png create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/originmossycobble.png create mode 100644 src/minecraft/mods/BiomesOPlenty/textures/blocks/originplanks.png diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originbricks.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originbricks.png new file mode 100644 index 0000000000000000000000000000000000000000..8507036a0c4bfb065c03330f0e2ac3b779a85199 GIT binary patch literal 590 zcmV-U0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005KNkltwAek`3CO?pL$Uw*<3CW*$+KNp-ircsA zz3O*wRVyzGy$>^8psK3i>tf&ibl1nq0Q`G>=x)l9&1T`Bt1ggGP6peFt1)Y(Qu*0% z!w;M-JN72XQNQ_ev{MSshC9fd4z+6qx0Ck0Zj*82u(uVIAb;Vua4nn*l~^nmi9`Z{ zKt7)j{V%`Y4@RR=uv9AjK!sMYWo@_~x8jx5wyhB?7K>kNE;5+Lx|}95nT#U(Sl9>#gQ8pa zgKiSAl$atD_Lf)4L!W(X5UI@urTP0Gd)Z=Wo{>o(N2Y!;tB&X3Vd96!4crTaB zY``}y^&pd>{SZ1Mc|HNwJb1lc;~eybu|lDMH^wEyQTTa~%Woq>2}Y4fB#?(_$%r>j zR;$(89MB3%FbxXG8Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0006ENklcNn@*=oBoc$cK=61x zxDbUx@$~d0qRZv7N~MxWB+X`%kXEZbSM+)-m5Pu`rOamY-Q6Ab@pz0xB4T5J$mcZ} z41^Yo#o=(kBW$-@u>l0--$g{wbUGalhy8y4@$s=xC@hytoI*OC22m^)F><+FqtSp~ zqtQV5^Yep;F~Z?6-1N*O!nys6kih8lfUu}wFxYCfCX)#vNO@mgUR*BMH9@IVI-O36 zitRZZ4xi6wv)L#mE((@VDD?gPEzr#E?Jc0MuP@NVVzC&?d_ITL@Aq3Q7NgO4b8|z7 z_yraR8jZU^c7K159*suHXZ@W{hbYzHzO+&ju(>hAi8kveq1)|>X0=+S8R`J*^?K(! zpdsV&nBL;?IAL)7h4=S&6int>tyUro^ZGT={)8n0eRz0KtJQ=?qtUt6WsQiyb@Tar zGMVI%47%U%MJCctrxUjWDpsr4>re=pOa{$lGJSr2@`V_N<%nbmI7a81{1?s-k&w-1 z$>B71yIm%eNu^S}K-cRvlepb(Rz!PNt5vVpheDxWePv(_lr4#700000NkvXXu0mjf D>|HYP literal 0 HcmV?d00001 diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingravel.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingravel.png new file mode 100644 index 0000000000000000000000000000000000000000..c2ad500bfb93620969f0dc416a81c498ea261089 GIT binary patch literal 800 zcmV+*1K<3KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0007yNkl;^~Qr zC(JK0fXEF~)!?^M7Qq@?+h}P>syg}^$7BsvrLa&iWCcneCKFs$yurvICX`P7ZvZyA z-)p1L=7z1GNx8g%5QUCdE|rFgxqCJDTr8`L@AqoC0+G<>I+Mvf|M?A2_(O;QC?w0J zvIwlEu5W2794Zw{kZ3e#rW#ozc&h)o~R zffdTRyd3w>#ga%G4YS#Fh%Qy7sqN|=%&}P{mg$$P0IW2Tik2GS11x^c0e9Xt#@N7G z5ah-aj;3Hm1_$mSmu4!}TAt-7Hl2xt!~Zo9P3g*?{n2HuS~Uh%YCj6qu$h^E1CHL( zVu=*htv8p$9A`ALl?o3&Fb2?TE45PrZjVdEYTPHY*9qir+e=P;f98+r^?;8X z(O2uK@!jxzIJo~YjR$GU>T2TAA@lwNsubZ|UDu^z z0cbouKEmU}a@Et%6`{aJ--_9kR5+$W^ouT1gR3h}kLaxy^hAQe9;!nR09NaCl-c$5 eQmQ6d#^4`N+Jr~_cwfi>0000B3L literal 0 HcmV?d00001 diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originlappis.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originlappis.png new file mode 100644 index 0000000000000000000000000000000000000000..682f681769ebef18baf99d528c1fee2a0eeeaa62 GIT binary patch literal 728 zcmV;}0w?{6P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0006M>Po7w7!6M>i*h7CKQi9iv_2>9 zPN;cJ)3fcjb;rxmqW=$7+e-3MPBf(b-h+)XikfAjm62uumk^%Xmh9;;&kU+kADxz|$h{9Z1iY2^~T zRMd>TRR^$bcSxw_2o{k>z-gQ#jWEX^n3L$4xcO%3>@#fviUj)EvyfD&o%!f?+j)Y{UZP-&mB5tfSLt&;0>FL^vs%5 zs}@$rkTCdVY*%V-KCSCV@9;-hrDqsbgiw~ji&JGMwu()i*8dAQ1PR>{dneTZ0000< KMNUMnLSTXw9zcQs literal 0 HcmV?d00001 diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originmossycobble.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originmossycobble.png new file mode 100644 index 0000000000000000000000000000000000000000..21d4f0e583b5d65a3eea61008812a4f093c77edd GIT binary patch literal 718 zcmV;<0x|uGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0006#NklUJjIrpA zjgV@jV&fw!Z6_^lQ)ma(g2918(GIi(1jWZiwBlpn12d8+Boa(!qNtfUaOR)tXRqz$ zaM|bVwbou|?<0)|9;G8+Erk5jwdzWr>wUayndHSdyQl}aVS z^xdR!X?9FI?C0~j@rzM5=5o0>0qXOut35nC%w{tJVLToqiA6R9zyE$R$R)XYz1~^+ zO!r2Y&1N4TAAt#1S63i%xg3a-&`GUULtbT8otMs+%Vj#9w*It6B9UM)h-YphtnEvZ zIbw!j{A$DlW@wanA=(nQySqD5h^{eVv)}LE5R}JC-CG^1xPp23`q1#fp!H~-PN&?c zwaSIKSS$q0Z0WWDJv}|qBJ_^G9YY%qhe#Se8V=kCdoTAyQN$tV0*#Yr#9Xk8OX658 z2H*C})@rrT3WY*w%U%S~?t+`k$$Q!l;rjZTm}=#688g%Y*6nuJb3lOQ%sKHEkH<*^ z7m4d@) zv|g>kpit-)oC5V$z1$=a2rv-r(Ok7v9S(>801@CJ<#EWaxBvhE07*qoM6N<$g8C3d AIRF3v literal 0 HcmV?d00001 diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originplanks.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originplanks.png new file mode 100644 index 0000000000000000000000000000000000000000..f562db79c5c6d392b400ec138d23ef6e5807839d GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvR?Sx;Tbd_~%Zv<~w8{z*=kZOQgi)<)tDPD;Ia~c9-M2lG$sHpXxN( zxF_E}f9;m{zyH<5Fe}!?ZNH;^d)F7X1xi=y0v;}TQ)JiMw(`)HD;vx|aF$h1@;&%b z+9Nzxxb~LH%1Z%LOAb{qM`%UN?i0FI7alODWa@tB6A#u*3CX`;wPc;v1KIiS41B#b zRaEaDbiJD&Wgb#n#~f_w`KDGU<4#C#YvP=1OL;lkomHG=7Nu|N`Ogp;!uK^dwyya~ Wt$pbg Date: Sat, 18 May 2013 03:09:19 -0400 Subject: [PATCH 2/2] Gave berry bushes the use animation when right clicked. Tweaked the apple leaf textures. --- .../biomesoplenty/blocks/BlockBOPFoliage.java | 9 ++++----- .../textures/blocks/leaves_apple1_fancy.png | Bin 1412 -> 694 bytes .../textures/blocks/leaves_apple1_fast.png | Bin 631 -> 677 bytes .../textures/blocks/leaves_apple2_fancy.png | Bin 631 -> 680 bytes .../textures/blocks/leaves_apple2_fast.png | Bin 629 -> 673 bytes .../textures/blocks/leaves_apple3_fancy.png | Bin 642 -> 677 bytes .../textures/blocks/leaves_apple3_fast.png | Bin 610 -> 641 bytes 7 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java index 9472600f6..1830dcf31 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java @@ -245,16 +245,15 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable @Override public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - if (world.isRemote) - return false; - int meta = world.getBlockMetadata(x, y, z); if (meta == 8) { world.setBlock(x, y, z, blockID, 4, 3); EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(Items.berries.get(), 1, 0)); - world.spawnEntityInWorld(entityitem); - entityitem.onCollideWithPlayer(player); + if (!world.isRemote) { + world.spawnEntityInWorld(entityitem); + entityitem.onCollideWithPlayer(player); + } return true; } else diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fancy.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fancy.png index 86a55f4e5c201ea292a24edd01021268302f8857..ce41177e459580dde0f09cfa35a7c8b7758a0767 100644 GIT binary patch delta 603 zcmV-h0;K(f3$_K283+ad001BJ|6!3KE)xI=a7bBm000ib000ib0l1NC?UQ;0D1QPL zNkl|D6;&zFc@*MFui5WM`fAxr%2zbG*F6}URX-8h{=8IbihoEuZv$#s zmCrNfht?Ol;xm!1RNtu<+}x|q-c1z2s%_0Sb8$HhUFs6YSov;?P4v9VH#UMxO`}1_rfPhIBy`N60iQSad=$;7Nf7n>+H{ib#PT-=;JQf4e6mibOOe- zO^|Z3BYNPxnrF79mt^MtFMpcx1yzJp2SO$Is259q#YjVCU8dQ^>XFy*olZ4<0r}Kl zs!W1uV4PIaW*3@jcFp9L<}!Njnv3fv4k%mN#QP~FcmI5`=!G^DEFPrPNkTD^U}gdxEr6m7AvyZU7AxV`+fM4xa!3002ovPDHLkV1mAj93cPz literal 1412 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Lb6AYF9SoBDg#49GXulV|3LaB z14F3+1H-EX1_rAc3=HD=lj4uMF)%PQ1o(uw0`)k13%mM>xCe-O1d4hFiF${K`G$%4 zhKu_}hzCT82S!T-#Ylw4ONJ*&My5zbr%4soE0(n=mA5HZv@2J2Dpz-@)O4%V^{UkO zt2RtfZJemqG)b*xidySb^|tBi9WymLXKD1#)9hQI*}qV0!Xm9nOSC30)t<6Ud)f-^ zX)AT6uhN;ZT4&}O-P!AO=d9PAyFqW>CcOn)^cQW@U$Vns*=~c`vvZz2dGhq>)925h zzkT}_=-^Q>8UoY`f$#sDr!g=vGL!`Q1^*w}fFbxhJFwhf;4JWnEM{QfI|Ravq8eTe zKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShH1A{L`3xTT6c)B=-XatM)zYc0P z5NYYZ;LvospIyek`JH$eE&Q=@cD$`G^hO!=PcJaJSqE~YiP@?ZyebH zR#U%qKVGrB>AUB`9TVTnF6-iB4P^`#_Lf^v+;e}6dYS5`S=H-J)VY5#Jt}y-W~bEa z-~N*fuk2uyTRHFC!PQe#RP&=F0$AsZ?QB)KTXEj%j`5VJTb2hFFVdQ&MBb@02343dH?_b diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fast.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fast.png index ce5cc844f59087590a7f7fd1b7ffee4c1987a1ba..79ff2a3fe83d9392215a7dcd7c5819cc5981ef0e 100644 GIT binary patch delta 564 zcmV-40?YmP1f>O#SPH=a01m+cxRGn^kzy!+0tHD#K~y+TO_JG8Q&AL#_pNYc02yu= z?18qY=adKF4iyxcQ3NC;M!CToV7DNV_9e|MdI&FH@cko**(vYm2 z^Y69xzlMKp6Nyz-1#;JpotX_^OLrky?MXTE91@{DySPH@b01m|*<=HVAWW|UOvg5u8ag2jgv9IE^2+a!?{bi((e?4nf9B4dbIrnj zRh2&{_Ta1^ds_Pnz>06-k}M{gy7D;>?)+wKu?%$iTD=r?0~$MQL0^1q&I26(4V?Uc z3)Z%}R5dDxH!3*m+FXZ^PUOrBUQ2lPZ~dKvMTy^mxt&TfN52C01`!nLbeh?|uatwS zEyvt7EqSzvLs1aEKfnWOtHj<` z>B6%IvBcV_C3X^thzDYOL2R|}VkxCfi8M5}ga{(>SNsI==ymj)W3KWgH+R-^X6Bot ztsdu+7J>iHK|5!8)XhsKy;bBeR+8M9@aS%2fpK9W=A0szl4ML)I4dEqpVQ17RZ{P*!VT=eplY zb2};t5P9*yqPMJ_L`v)%P2)s-1LNs`RNtY7S<{rL-&EJ8Y>izh{2yP=CJvCkN~#T1 zS+54R7s{u@u#IJ)qc2sLk>hSprl#)5K?n@J6tEKsm@=H`7p=kWyRuREt&oriUH)yo zM$#@`3(2!D;5GyJR*_3mo|Ol0C^jpT@w{o#?$txmAsev%HP%h%P$TAw-c-CMgevJ z4`}5`y%Xm)M1CEM&dK?-4k0$DkR;`+_y}_8cIhJJAENf?FdP!Hi*CA=`4am_$xkR^$)Q_zl7)bp1 zjLF-3fz(A(WPGVWF9}+Vm1q|fo>+E%M#hirt)7XU`RSNdjBul6j}sUE!U}pum!iW&iDc0rAdXDg_2`&??pg+gm7$fF2q5D{bIzv7=jSi1H%9&$tS zW#*eR^Ua+3&QTNVfq-=_@in-xRaDpJfeT(mZaW;*G-WYve74lU@dnLRk;gH+Ui zyPXqd;Y`TZslELpR9>g!)lagNZ1)W0b-lO&Mx%wZNrT9Is%ZVlYV7c)PVBK&KatIE zwthhb9KHCP_;c>73}^Jc%_qX%bi#O4o0&Wg4$bPvNt=ik3@`f;a5|CpB6v{cA~+Q{ z-p%WCK*(s+Pug0rab$JA%;hNP?!P5}U$1O%b04IpSug9`vl;ux3RKl&x1@Nl!bJj* zrJdrn0}}$;p63WbU)$vY7c`@D#>T84<7)0%C{eR6Ky!iVun3yeOZ$O#OeQ-Y@C9#PQxi?ViGaX(k5` zt6gLTi5*%v3%TkzONF~kjFc1NfC$b)t~!phN;)F--Ine6mms|$nm5zBYx;)r#qrYn z*J%QUh$!BVtY{M5H>IvX`YN*MyIX#9ZqtbF7qe9DU6)Ry!RFT!`c^?}XAV6#zNXum y6u6P^spVa*b08MsJwK)(Vn4tedP<%=4*mmm#M?plQYg>>0000nyP?w_dGJiH=MmYz_s9zh;Of_R_~SFD+-DnE z%ppQ`Q}9( z?yvP0DAA-}RI3^b#l z9&Y4#EKyC`y2lQz(A|AxT6*R5(vvQ&~?_K^UD^9yG+Z zR)``hlnb}L<=Gb(qHJLmMV5rbpbr{@z5o%VDu}EC77E3-APNFXZ~wMyzNIDpq)rSbfN8=&evRZ%1me~8`oE+r$u)oM&W^HT0W@>2HwwA6l z^6wwJ2vv70VEejS_^w||oblxwtoI#s9f@tl|2I9tzUr})`Zn^ky7)9gV zp!CbuXisdr*!oimCgYj`_;0^g0QKp2C1P`>VwigGNHvs)^I-zeW;l`9aWRoBgUo*e zFU9E0vdksfzK@3H#k@{pq<%c4RZ`SfNDiv%ebNSbVkd0%J}xzFqNn+D%EXuh+9@UZ zaj7Y#GFoPScy?p*YXlrya^l&f9{0ZCVk`CKYx#OwB}x|5{nb0o delta 558 zcmV+}0@3}Y1%d^TBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wD1QO*Nkl!h` z=FIudnfbn}1-8mbOJMijptZva@^o2vEf}6I`n3j{+HyFzeQPIeY_WtF7hhGhv}5Dg zJT9DT-0h_!p|8El<-0PP~_{)ZL@ouCpf!&=&F z@6RLc?6ZoX020f4HhvA{fj@)*If(&~K^^u3`W2n=EE$s7chWQqo62w^^=u?b2z@z7 zLA5K>oJH)~Zhz|iS8C)~Px*(-IGFJgDrBS%}nV zJ93tAD-3~6d_>Y$^jtR`2h@Aj)Ik78?mZYkHtrt!(HA7p7N$z37@Y(8`~k@z@mgHQ wa|)lTk0uqO0CdMq@Pud&Kz6ut|Iwgt*vDE%e9uHw01E&B07*qoM6N<$f_=geK>z>% diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fast.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fast.png index 532f47c63d7d0802c81e0d0bff59ba73164ef2c4..762f1c703189ddac209a653c333b5acc2106e8db 100644 GIT binary patch delta 558 zcmV+}0@3~A1c3#RB#|)~3c>&Y4#EKyC`y2lQz?J_NklB>S-RPG`;6*Y$E z^*JD9EbJp~Em%LcIzDD{6nyB*lCQt1^KgG3q_R;jYgk5At zSwSL47S2NMJI+$!E)yf=gg79Avyl6anmiXb!g~cQRcqIs(`c}{e^TEnXzoa-=O$KlJCg!8 w@;$ZuQ|lavMR?DTDTvq)u%42~&H@(y0R=bH0p_Q*mH+?%07*qoM6N<$g0pZ2bpQYW delta 524 zcmV+n0`vWW1>yvdBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wDSy#PL_t(IPfe0n zOG7~rh4)oNUu-c1!5(vS6aRzQvBq8yM1A)~MMbeUEYTQCH1^&#ir|maZyX82;ojMq zJ+rgtteM{_Ec7PsKiF$WMfDvS#EQYm?05`nTGILM-g(W)LN3weSMlPWo1nT$3c91T zHkIJ$&37F0m)ECh)qiMtay@@IDHR+%*&C-GGON*|om+2nPiFMRHybJ-bNK9&6O_Q# z@9^Qb%W6tU9$U^MLv3l_T~;S8##bc6*kpvTe&P{=%ZjCBL8xq$)0uE$RrUc5X0{6G zB?QhIp3h|~pcd$Mkc37*f|^!QqM=igL$f)iDv+ila;@4nsef^Y?JJ7_bo4tlfM3_1 z(b(lMlutkWq(Yb0$-5s8Lr(>zMflo6Jvu6ZZ)J+_6_{NK}1pgIhX;7CRU+g4^gN%Cr zUvat^wJG}Q(`oYFz0F%t&ghc78g8PBGx_GZ$6yCpo}G@kbz!NmprS#Pfq>tUM_VT} zodbVL!$D>o)Fo)|b7GF(n-S>9^-S