From 54288e0e2daa32f2df7e95b8dfa77203d6461a3e Mon Sep 17 00:00:00 2001 From: Kryppers <65094918+Kryppers@users.noreply.github.com> Date: Mon, 27 Jul 2020 11:13:54 +0100 Subject: [PATCH 1/3] Polished up the extendo-grip --- .../create/textures/item/extendo_grip.png | Bin 759 -> 2508 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/create/textures/item/extendo_grip.png b/src/main/resources/assets/create/textures/item/extendo_grip.png index 0ffee164fcac939d9b869e34b4dab06e4d12fb67..5c7f85fec15398041b5419055c067745ceb13537 100644 GIT binary patch delta 2499 zcmV;!2|V`q1aB^>EX>4U6ba`-PAZ2)IW&i+q+O1ewvg|4j z{AU$!2_Phfz6IZiU-A)?9F8@T z@XJ2_9y{|~eu4K~ePL&dj{8q2j14*=d|{;HPQJ$dvkZN+c31v*fY76T|GZ&0XHRpE z6J6l|q=M0)Zht8I3KJ`!^!v4dBjPK#j{C?s5<+ZXtb@&pqZyYS0qyD7bywVUW1pLA zaFJ;c;3lF*evc)53(iKO=p1lN;HSWI@=O&BI1%d3OmO3U z06B@)+IT0rJ(q;eFiH!E5Fd~>2@DmG#VpWI1NC+W@RijGu zk)y;AV}DFB$C7;FBq^krQp%}h${r<5a>&u-lyfcxix!wJc)MUmDV3_PT&0E@YpS`H z2Kh8@(n5RoPjZ72Y<%nVgQ1s#hFcxnHF=4Gn)xXAq3W( zEONSAjDbNOj%2!ryBBkR$(s@WSG>_r%$Y^q|ARTRs8i;CLn&>G#bpxjCxwc~2_(}de78mPTz+BnriUCrP09!DKz|=wxX);iAvmw zmYXegkD{Dwcqsmj4i*3+L7XRkqH#h@fq#!BYo*;-)eN+M!cUe=?iZ4Jr{$t}dFXiu z9#>QEPb^VmbZs;$$AC#J`65$vZO$#o^%Cvs_=bYs^&%V?(7&g;2KvWmEP}+8%WCeb z7Ls)Rog9@Pn?=qc)&ZI`EqR#^s(rpA0r z4TTcuPbH!@L1E~J!}5TD^m>RegH&*}p$Nv8jYBbPFf`xdReDtkQPNyzPUCo#Q&Sf0 zBSYIXHBeofSJ}iiP#MF^U3x9WsDDRKe$BgTQhD2$t*U5Rb}7j$(q^8j{2f1%(DoJYi{sp-*gJBskGSSBg6oap}e0=yBP3@O4zWg=zmZI8ai$Z3Nkm8jGsVmSyxEe4Esuadhdx(V=YL#!8f%N zb}9Y9%t)2nqOj3IztNPnfmI{fr}#K%y>_bXGX6j~21|=8pxc>SH4fcD4j|RumeBGq zpf^>dnK32A1ZOF#vwtlwU$vlcx|LA9 ze;dKp2XUBXgRvVU_m$=U^c?#pV*LZ56*roeFqC;XbINJ#*cIUqGCmy0^c?GBK(4rs z3uYy@(=yD{UiqM2;*Y&s*-HL#FGkdFU;ENbo?h!KdLdx@`_SwYTF1W5UhMSZcM7=8 zwt)5eVzRW;MU+Zxt$$U6)u*I;M9v}BsHK&153yx;0mPpjmpUuvUVNT`uvJ-jH01Vz z@jKn}fosu!bnuG|BDTUAb>>g`KurjO>R>(q000JJOGiWi{{a60|De66lK=n!32;bR za{vG?BLDy{BLR4&KXw2B00(qQO+^Rf2OA0qFB+!JJpcd#qkl<6K~y-)b&^kL9AzAa zpPBjQ|DW9^uC>KhYHzJjJy@zir56qQP5c?i` zoPO40G#+v8qkroJuHf_=PY{I>p5s#03P%V=MM1OCK;&gX82i}1KuXCVPw5XbEJGlC zf#q7XW@hEcVYv#G%K< z?^e-5V|pe*7*Ui3jVK}=4iI{Mon{=MR810vlyZWsYJZZ*X7_B9ZZ-s9Y4I4nEFR|DL@RWr^0Bv6O_q zk9hG|#LvGuc&^1O#~-29Y%wlJXrOcV4;rCEYi5>}&MLh$Mb;C9At)yj(=-vbW0MyJ zo*hw)$A2WDBr9@MRipJfmT8g>Gv?p>(O_HNnm?lJY6WrWN`_^c)YB>LUn`XQ8-SCq z?!z!Pm^h4iIGwv)8li)brDX1z11MEfPuB?opSAvgD2O?K_9YI#{<-nl4}blqVAIaD zZGloXg{<&Bmr5z3z+*Jdxz}A|r)=7Zxn~0|e1CeA)~=BGr)>@$e2SIMDqnna2Vt22 z3@b7T9p>$i|&#juoHC7WMr z?4{QT8yGS+JnD7u>RP_UsUp{$Ff3Vyp z_B?IQEF5O;ov#gm=T2YTvim=9tH8BAJkP;*9ro_tv*Xpb!=dv){9iB6C;%KFNC5x< N002ovPDHLkV1gJK=}iCt delta 736 zcmV<60w4X%6ZZv>BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf z6951U69E94oEQKA0*pySK~y+TeNszn6HyfY=Fa<(m`*TBTP?OlaA7HJ6)6Q5x={*( zOE(`l!vhUqYf%i5QRWvOu{HcPS;tX0EG5>DC9IG zag4m7!w6ALvNGB+W1ALmJs*N7iCKpv>1EdU-OT2V9BS1KoY19gh_H5Qa}RFKQBf3-GU1pb9qL}QjSCCsL6PA0{pbHsAK==|2sN30$ROEe z(@v99ff$;?2Gl{l(ddUCM%q1!6A-Pe;LBzmmd_+=@|c;QVp}L8gwyJ<&N^y)H8h&PAuu6{;{Jw?!pjd^+*z~tKRKeRN~Y~pSv{u8d&{r5<;Nd6 z#|`?S$Ad_s3`LQk$}%dYO5Y7!x;%~28MA*o2B|C$o&laLU#E|juKsl#3E&Ts4j>@f SM^lFY0000 Date: Mon, 27 Jul 2020 12:33:19 +0100 Subject: [PATCH 2/3] Solved the riddle of the extendo_grip also updated some textures or whatever... --- .../create/textures/item/extendo_grip.png | Bin 2508 -> 764 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/create/textures/item/extendo_grip.png b/src/main/resources/assets/create/textures/item/extendo_grip.png index 5c7f85fec15398041b5419055c067745ceb13537..64984feed9b2d63c404391d64db76cc1936c2411 100644 GIT binary patch delta 696 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 RNC5x<002ovPDHLkV1gm8+|2+0 From 515eb0026d62f93159f646cd980ccea756fd9f0b Mon Sep 17 00:00:00 2001 From: tterrag Date: Tue, 28 Jul 2020 23:57:29 -0400 Subject: [PATCH 3/3] Improve blaze burner particles - Now curl around blocks that are placed above - Spawns a burst of particles when fuel is added --- .../contraptions/particle/CubeParticle.java | 32 ++++++++++++++++++- .../particle/CubeParticleData.java | 15 ++++++--- .../burner/BlazeBurnerTileEntity.java | 19 +++++++---- .../resources/META-INF/accesstransformer.cfg | 5 ++- 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java index 2de6857b9..ad133bc4e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java @@ -14,6 +14,7 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -80,6 +81,7 @@ public class CubeParticle extends Particle { }; protected float scale; + protected boolean hot; public CubeParticle(World world, double x, double y, double z, double motionX, double motionY, double motionZ) { super(world, x, y, z); @@ -92,12 +94,39 @@ public class CubeParticle extends Particle { public void setScale(float scale) { this.scale = scale; - this.setSize(scale, scale); + this.setSize(scale * 0.5f, scale * 0.5f); } public void averageAge(int age) { this.maxAge = (int) (age + (rand.nextDouble() * 2D - 1D) * 8); } + + public void setHot(boolean hot) { + this.hot = hot; + } + + private boolean billowing = false; + + @Override + public void tick() { + if (this.hot && this.age > 0) { + if (this.prevPosY == this.posY) { + billowing = true; + field_228343_B_ = false; // Prevent motion being ignored due to vertical collision + if (this.motionX == 0 && this.motionZ == 0) { + Vec3d diff = new Vec3d(new BlockPos(posX, posY, posZ)).add(0.5, 0.5, 0.5).subtract(posX, posY, posZ); + this.motionX = -diff.x * 0.1; + this.motionZ = -diff.z * 0.1; + } + this.motionX *= 1.1; + this.motionY *= 0.9; + this.motionZ *= 1.1; + } else if (billowing) { + this.motionY *= 1.2; + } + } + super.tick(); + } @Override public void buildGeometry(IVertexBuilder builder, ActiveRenderInfo renderInfo, float p_225606_3_) { @@ -146,6 +175,7 @@ public class CubeParticle extends Particle { particle.setColor(data.r, data.g, data.b); particle.setScale(data.scale); particle.averageAge(data.avgAge); + particle.setHot(data.hot); return particle; } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java index 7e2ec3279..dc22608c7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java @@ -28,12 +28,14 @@ public class CubeParticleData implements IParticleData, ICustomParticle type, PacketBuffer buffer) { - return new CubeParticleData(buffer.readFloat(), buffer.readFloat(), buffer.readFloat(), buffer.readFloat(), buffer.readInt()); + return new CubeParticleData(buffer.readFloat(), buffer.readFloat(), buffer.readFloat(), buffer.readFloat(), buffer.readInt(), buffer.readBoolean()); } }; @@ -42,17 +44,19 @@ public class CubeParticleData implements IParticleData, ICustomParticle 0.5) return; Vec3d color = randomColor(heatLevel); - spawnParticle(new CubeParticleData((float) color.x,(float) color.y,(float) color.z, 0.035F, 18), 0.03, 0.15); + spawnParticle(new CubeParticleData((float) color.x,(float) color.y,(float) color.z, 0.035F, 18, false), 0.03 * burstMult, 0.15 * burstMult); } else if (heatLevel == BlazeBurnerBlock.HeatLevel.KINDLED) { Vec3d color = randomColor(heatLevel); - spawnParticle(new CubeParticleData((float) color.x,(float) color.y,(float) color.z, 0.04F, 21), 0.05, 0.2); + spawnParticle(new CubeParticleData((float) color.x,(float) color.y,(float) color.z, 0.04F, 35, true), 0.05 * burstMult, 0.2 * burstMult); }else if (heatLevel == BlazeBurnerBlock.HeatLevel.SEETHING) { for (int i = 0; i < 2; i++) { if (r.nextDouble() > 0.6) return; Vec3d color = randomColor(heatLevel); - spawnParticle(new CubeParticleData((float) color.x,(float) color.y,(float) color.z, 0.045F, 24), 0.06, 0.22); + spawnParticle(new CubeParticleData((float) color.x,(float) color.y,(float) color.z, 0.045F, 35, true), 0.06 * burstMult, 0.22 * burstMult); } } } @@ -254,7 +259,7 @@ public class BlazeBurnerTileEntity extends SmartTileEntity { world.addOptionalParticle( particleData, (double) pos.getX() + 0.5D + (random.nextDouble() * 2.0 - 1D) * spread, - (double) pos.getY() + 0.6D + random.nextDouble() / 10.0, + (double) pos.getY() + 0.6D + (random.nextDouble() / 4.0), (double) pos.getZ() + 0.5D + (random.nextDouble() * 2.0 - 1D) * spread, 0.0D, speed, diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 02bc0b9d4..5af4e7e17 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1 +1,4 @@ -public net.minecraft.network.play.ServerPlayNetHandler field_147365_f # floatingTickCount \ No newline at end of file +public net.minecraft.network.play.ServerPlayNetHandler field_147365_f # floatingTickCount + +# CubeParticle +protected net.minecraft.client.particle.Particle field_228343_B_ # collidedY \ No newline at end of file