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 00000000..73b98514 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn_backward.png differ 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 00000000..fcef4e75 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth_backward.png differ 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