From 5f5936a3ce3d652cf60ee37794904b87df8e580e Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 13 Dec 2020 23:57:51 +0300 Subject: [PATCH] Door textures (WIP) & fixes --- .../ru/betterend/entity/EntityCubozoa.java | 17 +++++++++++++++++ .../textures/block/helix_tree_door_bottom.png | Bin 0 -> 464 bytes .../textures/block/helix_tree_door_side.png | Bin 0 -> 1708 bytes .../textures/block/helix_tree_door_top.png | Bin 0 -> 596 bytes .../textures/block/helix_tree_ladder.png | Bin 0 -> 2127 bytes .../textures/block/helix_tree_trapdoor.png | Bin 0 -> 491 bytes 6 files changed, 17 insertions(+) create mode 100644 src/main/resources/assets/betterend/textures/block/helix_tree_door_bottom.png create mode 100644 src/main/resources/assets/betterend/textures/block/helix_tree_door_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/helix_tree_door_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/helix_tree_ladder.png create mode 100644 src/main/resources/assets/betterend/textures/block/helix_tree_trapdoor.png diff --git a/src/main/java/ru/betterend/entity/EntityCubozoa.java b/src/main/java/ru/betterend/entity/EntityCubozoa.java index d460739e..e2cf0812 100644 --- a/src/main/java/ru/betterend/entity/EntityCubozoa.java +++ b/src/main/java/ru/betterend/entity/EntityCubozoa.java @@ -17,10 +17,15 @@ import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.passive.SchoolingFishEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.packet.s2c.play.GameStateChangeS2CPacket; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.tag.FluidTags; @@ -124,6 +129,18 @@ public class EntityCubozoa extends SchoolingFishEntity { return SoundEvents.ENTITY_SALMON_FLOP; } + @Override + public void onPlayerCollision(PlayerEntity player) { + if (player instanceof ServerPlayerEntity && player.damage(DamageSource.mob(this), 0.5F)) { + if (!this.isSilent()) { + ((ServerPlayerEntity) player).networkHandler.sendPacket(new GameStateChangeS2CPacket(GameStateChangeS2CPacket.PUFFERFISH_STING, 0.0F)); + } + if (random.nextBoolean()) { + player.addStatusEffect(new StatusEffectInstance(StatusEffects.POISON, 20, 0)); + } + } + } + static class CubozoaMoveControl extends MoveControl { CubozoaMoveControl(EntityCubozoa owner) { super(owner); diff --git a/src/main/resources/assets/betterend/textures/block/helix_tree_door_bottom.png b/src/main/resources/assets/betterend/textures/block/helix_tree_door_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4bfa16662a662a3468a546bb190267dedc125cc2 GIT binary patch literal 464 zcmV;>0WbcEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0cA-k?zJh?+){$e$Rg6sx&S9{(WZ-O4QnxeR-f&Pc1l%%Y=EJGp{s#6W8XAD-rL=<$5T)8^T(ewvivd{&7VjlY2vClp7?Bf;sr_C zx9wL}(iQJbh*^+9gjH##9Yh>0Nrz|J5yGo9m8-Pwhk51Cig$mwW#V%21UX>5GAtwlEisW|C3=`PSD;-|Q*W$6J$Q?+!npX-!P+svCD+Du3^0*8$fq7;Apz30v&=ZG+nv(Q@C18YH+DE*VE#6d8Lu25!AF+ ztCeY)85Y+y-F00J7@A?I9HAx~VT#&nm`wH=N;JW-AEiDEWxxTq*YCUhD zG1N;C3?!0tcAbaOOUO`kQrU>8wnP)Q7GpZQ&TUSLXd+mQDN0#fVXWCN)MDSVTr7&h z!nz_4G6{>U$zm?d-I*O1o(IcelA;jPaw)Iyurt0-V9u$5 zoMlthp{Ah%VqvvPDN%`)vklV$mSt7@`%4V3iQ=35Sw^4jXzcS(4K;VO3Ri?PI*z3i*C8s>ZCAw(ca=kyp<1?Oaw4i% zYqn_UPLIHOKjGEe=zSu~^mK34^yN-lK!ioR=M^mKOo`Ha><`Juo|Jq0TMf!dA5;9U zdctaH3&pfh=egTUe`$~MpP==}yWd+iyS9e9-`$V@(|s>FxPihtL_C_9HQmx^ z|E^l+-LARRhx1`4mV+tFZw7OkhMYR)Q~1Xhr9b!tf2Uk3RHkm8-`*O38yptBRhBQn%BR2e>-UcmD=*uprt1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/helix_tree_door_top.png b/src/main/resources/assets/betterend/textures/block/helix_tree_door_top.png new file mode 100644 index 0000000000000000000000000000000000000000..bb5c7b45be07f9cd759daa28c0ccbfe2e99e0c11 GIT binary patch literal 596 zcmV-a0;~OrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0qIFZK~y+Tb&@ep z+fWpR&$9xtL5Wz(lAuT+Dj@+>4bM1sVLY{03^JNMH6mSzI)EQ>dS65b6w!>4g%xJNubpNDiz@20qAsq z#l;E4arz`5h6+x<56sS%P%4=QGcyw=7-1V1iyl0$px+gyrc90NW^fqX-zP{@$)Vd# zrI6S{l4Y5mV8}?`ZDZ#vd?=-4Y)-TJF;we^7i#;no=;OQ1B_P>&XxZmRFueRm?ts; zwdGHz%gdwI8jjuV_7O$KTtY)xb9)j61 zjBs@o;pQfi2Ko`GnIBv2%rh?Rzx*W$o{%KK+Y_Um{5YDI&)*#X&3)RM%kri>Je4|W z;$UEs7J4u}{k#V}RB@4NwXz;3#@X3#)a#>#(2VmS41t9Ovq+R6w~)W%e?73bU_G!{ zFJxn^CeM4SmmUlT>3<%uX%ra~WP)CgryFPU(1UU07wL}&yw@O5SXn7Z0i`fcY;0

1uoz*N#1 z7{(klM+nFvsu_)(2FssuoB@CGCsPrrEEvl`{D~YWtVAvQ_BbwS(41~=Z@=ArzUO`3 z_j&iditNm^$cgb2Aqa}hNH^wy^JMu5eG2?eA9z56QM5H!Ax zH|I%trX>_3IF&RjSU9E6=>}*Bnv?8v(@X&;DJ-0gcNyTm!!59aXASTQwFxu1Q#d=H zUgF_$OES$&Ndcp0;pDlBIX(&yI5~+{_?!-xNcjw~pO*q_`8EnG{1BSsO63?A24aCL z18kQhH-(~JuUF|Mm4e5H;(EOv#R!xj5P(3$VwXhw5SN%R%wXh1#>2ZMUT`U7M%p42 zN(LAx9ZJFJ4$`{BK$$?nP#^6^aU~|FG(>3}qEOP8#IQJ82t-x?MI{5v(MYA~*yO z2n^JbeibGYmEjU4+Qo1gMgt7eR`NVcu{f*IGg=G6=m{NSwW?HzPE8Yt)xuZ^3(jIR zLk#aX3QVDFuDpM!&sl*19REZmNwANlF$B|+dIYBdo8D?=5Ktg1%jqrX;9&Wx3)b2_8 z3w@M+kuG|?`X_U9NY+U8qx9qdR39h~W2ap<4opxKmh(a7Sus-*&BU zLBDe>U--ec8PQ?W1~xC7-lr=)SKWTmE=BC#ab{@`oZ!o*)?PVrBDrj~D85+O^-bfn z9|w+;pSIMiVu~mRss5}A-g)|H+1~zx2g=Ich--XpLrXVQn}z1l7hYK3);_aRb7NjBxNZO7s;JfL8WNL|@;A-f-w{^VJ(gUnxwFzZ z?tV>80#)ek&fawS@{zH-r|!#>T2KBQb1KcgpE|iW;&#Vj=Pwaa3rm~(YFn>Q+SiXC zi959Uk5|g$OV2md$2LIY&t9jm#zrMw+Mp}l5}SL`QTF?~nn)>R)7;)It>q2RL|Sc? zy;pCkwF|nx(DMfq#{HRiCNHw-PI%LV8%+nRu_k7fYyJIO(DHgy+{7D8R-6s{=|E+? zCHd_Q7rS;AYL8V94pcR-g3)OFSlg5zE+^eZX6@>^>m8i*WnXQ7&5l2O@?U;NYNqj%1*Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0f0$FK~y+Tb&}6& z!axwlH$_d1M7?+@7Cm_OmKo!*Al0Z;;0mRb0e0cp^;goC90UNrEE6uy7%E>3So z8Wh|YyT5(k!yN=ohVb9Fq%rt(p7>tBR_{M6&9I1ORng3