From 92cb78dc943ad99e15f11079adfbbb4fb039bdfc Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Sep 2023 12:26:42 +0100 Subject: [PATCH] Add separate icons for backwards and forwards kicks --- .../unicopia/ability/EarthPonyKickAbility.java | 3 ++- .../unicopia/block/BaseZapAppleLeavesBlock.java | 13 +++++++++++++ .../gui/ability/kick_alicorn_backward.png | Bin 0 -> 5305 bytes ...kick_alicorn.png => kick_alicorn_forward.png} | Bin .../textures/gui/ability/kick_earth_backward.png | Bin 0 -> 5219 bytes .../{kick_earth.png => kick_earth_forward.png} | Bin 6 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn_backward.png rename src/main/resources/assets/unicopia/textures/gui/ability/{kick_alicorn.png => kick_alicorn_forward.png} (100%) create mode 100644 src/main/resources/assets/unicopia/textures/gui/ability/kick_earth_backward.png rename src/main/resources/assets/unicopia/textures/gui/ability/{kick_earth.png => kick_earth_forward.png} (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java index 6aa42e3e..086032bf 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java @@ -63,6 +63,7 @@ public class EarthPonyKickAbility implements Ability { Identifier id = Abilities.REGISTRY.getId(this); return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() + "_" + player.getObservedSpecies().getId().getPath() + + "_" + (getKickDirection(player) > 0 ? "forward" : "backward") + ".png"); } @@ -89,7 +90,7 @@ public class EarthPonyKickAbility implements Ability { player.asEntity().addExhaustion(3); - for (var e : VecHelper.findInRange(player.asEntity(), w, kickLocation.vec(), 2, EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR)) { + for (var e : VecHelper.findInRange(player.asEntity(), w, kickLocation.vec(), 2.5, EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR)) { if (e instanceof LivingEntity entity) { float calculatedStrength = 0.5F * (1 + player.getLevel().getScaled(9)); diff --git a/src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java b/src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java index 5af48b0b..d59a56b0 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/BaseZapAppleLeavesBlock.java @@ -39,6 +39,19 @@ public class BaseZapAppleLeavesBlock extends LeavesBlock implements TintedBlock tryAdvanceStage(state, world, pos, random); } + @Override + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + if (world instanceof ServerWorld sw) { + ZapAppleStageStore store = ZapAppleStageStore.get(sw); + ZapAppleStageStore.Stage currentStage = store.getStage(); + if (currentStage == ZapAppleStageStore.Stage.HIBERNATING) { + return currentStage.getNewState(state); + } + } + + return state; + } + @Override public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { super.scheduledTick(state, world, pos, random); diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn_backward.png new file mode 100644 index 0000000000000000000000000000000000000000..73b9851401bfe53c39c6d7a5e6c1e68ae89920d8 GIT binary patch literal 5305 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn_forward.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn.png rename to src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn_forward.png diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth_backward.png new file mode 100644 index 0000000000000000000000000000000000000000..fcef4e75af91890ef78967e27cf81641a46c6c1d GIT binary patch literal 5219 zcmeHKX;c$g77o}dps^WIRNTs7D=3vzC6%ottw0dc5JaE>cPdpCC?$(YkO1zs3NGN* zwkV_BIywrXtu2bu;!&VQLBv7DWl&skLq!?2Ris}9M40Jw=6GiOXX?DX``)|vyZ3$X zzME89Xh;Cp$<2ww;c!)f$}rGFY;))WzRk(Wji9Tfqg7g!Y6Qmt41lKH7aTiQ2Q<5O zvb|j=PA4$81hk$&W_8%+X4l!)uK;rYR(TzeJz8~G8`RF8!v%d7XhIX&#`H|?*mloP)Nu}5xxim_J~k~BXS%SLMV!hF&x8yf4d()M8qPMR8Fe{ z@hxKf{6bZJevr{*&@%Bfhhxo}vsw{YG-g1_v~Yj8ch^y=GHPeYtnr@dc~1U2ou@C3 z92m@RS~!fWTDE*!?L^~Ka^Hj6o4a!sn%L?odze^@fBD&a@{Q@3Q89ZXrYA=Dtu~~%(1ahR&i2Rd8pd~xAf<89?5cD zpjX`|-yb+H*Rg!=nrrvs&bi0L_0P|L9Cvz<@o=XV-u?D_7KE+Z5$a|CB(_nV6!Xf} zAvfu0-piSf-fg+^XQ&aB(2B(*ho3Q?blY@S;H)`58*}$%jE(@C=d!^paGkc z^cKPj>&@;gL<@$JHj^gCXkiR`h{Yr{h6Ia(#{=uo`}lN5wYm*nZ*FA)@FB1gMghu4 z1Uj9dy@lE0KMR1g2K1*E=7=OCEeNB{h6EEy`_H2F7WeiL6xn8POfbdUwnLEuI-b@6 zRWtC4c5umFxHb!xf>=gpv{?bNJ7`)M?FX_t#Kx}Jw$nZkVBUt?LHqsQZOTAPt;UrG zGJy?GrBv`(|2SnJ849)OpJ+OnOI7}VnnJTFp|;&S2ie$#K#&;IszOgqa$Kzfl(i8TVM&t zeL__Vo{*1xmAjozp zaDr^vf|-~_Q?@t(R?89@N9bc|P(51H_5D2aC#j&NFd9Xr5|9NF8H^Da$SXM*ip3I; zW`JB2X-S1PbhANgNhD0PPb}aOa0SxS_5%fZ*bd6GV=RerGYq?DON%zpn)| zj>fRFth zjK0g;ygTKw^TS2e54Q#<_pCfT?CP;3O;eL^&JC}nWz0M;-bu^gdHTE?L!^%%jWb2Y zT`q2_dE{`jc0u)~QA_q8$iMgM#t*#@9rJiLu?%?;@Gvps*SXd?A-ZKNxs&?uypwbG zW~SyzNPTwQkjlHY#^MUExUpGxemhun@bvMbkds&P3ld+i%3rxUXj?MkS?k_iyw;_0 z(6xEhJ-a=sc_Lo_8??Ubn~_QM{F&R`-na__2giuVzfGkA)T{X(aOBp!OZ2UaJ^I=w zWXh~qRRlM&aB^v;-NjRfB&kteWwG3P#h{-jov>c|8Q0V;oHk~^>+IXF@0_SADu1W1 zyys0WC`bvqEOV@06HZoscmF%jK3QHKSk`#W)1CDm5|Omqk^JJ$Wh-Z-k2|Q4?se1d zYp@=wT4|1Pi*$RP=}>>x>BWxF-2pj2$uo38!N2snP9E5*x<7lH=G-oxx#&yhgWxRZEVYe){4Xv^Mu`<0RrmI&Xf(z{Sf#dYBKRNddWo`ta6>E-YGhvUu#%%u;38 z(tgj&M*WmNVf%Bzy*a<6s7i(nb9vR6{Z$aJaRL7A^xWVI=jngD8n(G9+wxr5kM}t2 z#G5fH*E1s})3^8!Pw1I`dG?&qapr-8rv*imeZNhUSIsW2Thh4x?tn7pMD4xZB|+N{ zC?6J_;anuGH7@T8U*4X&ck7AVfwbIJ8)dIUL$ik~OG~PDA5SXb58pq(qDadLDEeCT zZu5qtM-#TzuT436r6Tm?!qgj!bUtB46PKfvo6>x^g%ihK;Mzs{yS#`dlQU;GBhy!> zUh)0rn^nF!3-eRYbL*-fTAK~nijd@{!qv^czO|bRU%1)SJ?=HQJRFsOh;ol_%)&na DD0gPw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth_forward.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/gui/ability/kick_earth.png rename to src/main/resources/assets/unicopia/textures/gui/ability/kick_earth_forward.png