From f6dadc083ce490021368458e1387239333aad35f Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Sat, 3 Aug 2013 12:40:47 -0400 Subject: [PATCH 1/2] Began work on Contractor "suck" mode --- .../textures/models/em_contractor.png | Bin 1109 -> 2746 bytes .../textures/models/em_contractor_push.png | Bin 0 -> 2772 bytes .../contractor/BlockEMContractor.java | 8 +-- .../contractor/TileEntityEMContractor.java | 48 +++++++++++++++--- .../render/RenderEMContractor.java | 10 +++- 5 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 resources/assets/resonantinduction/textures/models/em_contractor_push.png diff --git a/resources/assets/resonantinduction/textures/models/em_contractor.png b/resources/assets/resonantinduction/textures/models/em_contractor.png index 287ea90ac8b90c569c2050cf0926125186d7f7e0..1cacad5839ff001fea90bf46fc4c9fc0e3c7b673 100644 GIT binary patch literal 2746 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 literal 1109 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEa{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)W0|WC# zPZ!6KinzCTeDkCXMGh3sS8STlP$aI`_(Nzy!w;*7?~z}aLd|op#)`jHT;&yd)$8tu zQ?sv$Zc3A|_E~b{pK@>0!I>X_-;|U7&|~;t?r&YZpZV{q7x&9{>#hy+wwinH|J!fh z!p^;Y{yAIu{(Z?vz3E1B{pX+Y>hk}zWu2A95cTmELyq%?^XEk$Ki~L?fBrwShLb5y z%pcZlcH6X5v_8}MMcM8}x4(Yfdgsm^kM-BJw{1F9SCRVUwY2j7d(uBYWjr~)QL&~v z+eP}w`~J4J3m&}J-#q#EZ{Lf`!w)xD{N0r~-zX#hx^MOVusvZv?%tgn6B{d<`Fmfr z*^L~tO}F1ZdHB##th;qb=KSQz&z%_8mgF*Qdvy0p>+a|G<99Xm?Y#9n=jiU27e3ji z3Q1J)d@|Qqu)OZ>wbxsF+!jCjnQ8SUz<(x7n_TlBUapMy*9(8#_{{(7j&Hl1R*I0s zuKZ8-%?`rC8<+br%~zBulhj&Z8+W|cTDbi3!r#jEDNLV##)Pe&`sVxZM_=AAQ|4}e z)W*fb*1YKZ>m&JAbGv5q-If2TENoHt$NI+Q{dFQGmnXJ57do?UxwQ5B?Tz<++u!y7 znaKIVyy2H@!@Pf66?eQmacJR=g-n}o`fR(MYxwhWe@mWKN&S<4p9L@DnU%TcKT>L7 zVB%1iu(u(0!bDq_bqwF8ABcH;-t66~`;41d6$@B432(?|+RQztp?7BquR_~I?vS;N zSDxP4PpowbvLCP_I7+O@z#iOa%5m+5m+I%V%M(etLuz2O`|TpQ@L>O{qrxs z82_$VQE8lbQr&0o?)Kkz8|Dh!VoR9b7k>Abs{C3O;M1& diff --git a/resources/assets/resonantinduction/textures/models/em_contractor_push.png b/resources/assets/resonantinduction/textures/models/em_contractor_push.png new file mode 100644 index 0000000000000000000000000000000000000000..037538af32655aabaf26733db42c235d01ae72b7 GIT binary patch literal 2772 zcmeH}_dgp51I9y$6{SW9Dz?(2)=MKQQM6JmDySW!c2ReBq@wh!tJI-A6j!w!p;i&2 zcI}l~wbhCkZHyYp_5C;A&-=skJl~(cKRt;SW_NhG#kc_g0596a$nxhB{u@rv&+gQB z9RL8>Q^EU0zDtMba65xI=CVn}-K{iN}l zNmJlt`IebV>cEhI>PO+@Ve0agB+da^>Mq0VNVY99`O8?MjCp&2@D)7t1pHud(y!iB zsEy<7#HRuD<-5fGgf<&%IqPfu8-eh#Ud5Yc(nzk9QDv%d1t%G#N1pb)-r$M_iuR=~ zTL*|Y$#|yLRQ&1s>&WtTVo-xRlTS4}gudexYkT&lu+jYkU*f{GBdgX#BMzfy~PsgKJ!(k8TrGMgs7dGx-u@yoKpapi^*pp(O`)9r(>Np9}>ajz4>R)}b zH>N_o1ZoOI2zxdswbSmKsU>|FpC#9&k9YB9nb@o#oAtQ)fg1bFK~`DfqqgFqH3A0# zSzAFaVILaT)zQp{d^3IM7f@MhFk6{r_kia@BNO3F>{Ie@&ge*o4P0speG46c-0d0L zQi!hbjP$xZJI&slD>C~sZ+?6y7$h1ojU?+{Uk6FdIZax+)xT@MvuR``YX(tqqmG7Tk5C8I@J| zi0soJ9B*76Eo0;}N&`x;B_flH2;Vp;qDT&}jK6kq6|acDesM1;*se+DLe43pHC2@z z-n`e6CqIoNVO<61lbpOMetG{<#F+Kt)xowhHDV>xiq~59cesv*z!z6q zM1#3&eDBxcR1VlgwfN*gIiRT?tM0h+V2IsZURsf*c3;mlUA8#X@y*v)N#VM=Ns1kd-8pnD>=GBHpX=B;Ox;Mr>CIBOZn*X z(9hca!VhOiWh5o8sQwQcPLwk&mG1WZSaS*at2z{)ToV;R)s?Lftr-OsT3}rpm#@*dr{?W~~h=mj9 zS01ijUK=*#3K$1&U*J;i_>@71URT8k+)779GUh! z%QW0LF#zUT@EI#)tmG1S0}l5Av-^0XGUw;#6V5MAMGkKCQ+(@27Z(@bGbiX&>*2-S zLDbQGtc`g-G5!5{)a8!&uVO2m{8-7UeA}G2j<-@{SZ@_Wm}q!lr#^%ZQ0p+n_->U_ zdymJq_p;dZ=@P2UV6c$)R}+5bUb%n5B01V_ho5tg)U|F{XU9mm-@Nxyf#7}N z1M@5P)qMG`&M^3&R5hip3qpEyCUvAtgCFr@@)RSlE`p-=p0}6Ig4h1qDi+t@^*uV7#Jj%H3 zJ$QQXC{PSypNu23^``DWF zk}H2&b?)uKMc{C_YRbDvwRTFA`Y&DJXseW%{HO@v>!(m7Bm$8v?1;sZ9F3jcW<&RL z+Os3Jvc9~6#WodvuJn$LsgLGtq|uxQ1=U>X4sE=<%GG0@fJxtgfXc5#F>P(_m1_%{ znwmi!35~4a>c&PpE`g>-0e?_?HhF4~7qznQ7z(Cpg82tconvt3GqpO<2?1`C~+BlXoG zhDacgoz2Y6{RO_3u`c~LoC$TKDzA2hgNZ2J&uywDO_k9 Date: Sat, 3 Aug 2013 12:52:12 -0400 Subject: [PATCH 2/2] Minor speed adjustments --- src/resonantinduction/contractor/TileEntityEMContractor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resonantinduction/contractor/TileEntityEMContractor.java b/src/resonantinduction/contractor/TileEntityEMContractor.java index 42be3e3c..394a2537 100644 --- a/src/resonantinduction/contractor/TileEntityEMContractor.java +++ b/src/resonantinduction/contractor/TileEntityEMContractor.java @@ -50,7 +50,7 @@ public class TileEntityEMContractor extends TileEntity if(!suck) { - entityItem.motionY = Math.max(-(MAX_SPEED*4), entityItem.motionY-(ACCELERATION*5)); + entityItem.motionY = Math.max(-MAX_SPEED, entityItem.motionY-ACCELERATION); } else { entityItem.motionY = Math.min((MAX_SPEED*4), entityItem.motionY+(ACCELERATION*5)); @@ -72,7 +72,7 @@ public class TileEntityEMContractor extends TileEntity entityItem.motionY = Math.min((MAX_SPEED*4), entityItem.motionY+(ACCELERATION*5)); } else { - entityItem.motionY = Math.max(-(MAX_SPEED*4), entityItem.motionY-(ACCELERATION*5)); + entityItem.motionY = Math.max(-MAX_SPEED, entityItem.motionY-ACCELERATION); } entityItem.isAirBorne = true;