-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33 from aidan99davis/AD/aiReworking
Ad/ai reworking
- Loading branch information
Showing
18 changed files
with
444 additions
and
425 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
src/main/java/com/spectrobes/spectrobesmod/common/entities/goals/AquaticJumpGoal.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| package com.spectrobes.spectrobesmod.common.entities.goals; | ||
|
|
||
| import com.spectrobes.spectrobesmod.common.entities.spectrobes.EntityAquaticSpectrobe; | ||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.entity.ai.goal.JumpGoal; | ||
| import net.minecraft.entity.passive.DolphinEntity; | ||
| import net.minecraft.fluid.FluidState; | ||
| import net.minecraft.tags.FluidTags; | ||
| import net.minecraft.util.Direction; | ||
| import net.minecraft.util.SoundEvents; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.util.math.MathHelper; | ||
| import net.minecraft.util.math.vector.Vector3d; | ||
|
|
||
| public class AquaticJumpGoal extends JumpGoal { | ||
| private static final int[] STEPS_TO_CHECK = new int[]{0, 1, 4, 5, 6, 7}; | ||
| private final EntityAquaticSpectrobe spectrobe; | ||
| private final int interval; | ||
| private boolean breached; | ||
|
|
||
| public AquaticJumpGoal(EntityAquaticSpectrobe p_i50329_1_, int p_i50329_2_) { | ||
| this.spectrobe = p_i50329_1_; | ||
| this.interval = p_i50329_2_; | ||
| } | ||
|
|
||
| /** | ||
| * Returns whether execution should begin. You can also read and cache any state necessary for execution in this | ||
| * method as well. | ||
| */ | ||
| public boolean canUse() { | ||
| if (this.spectrobe.getRandom().nextInt(this.interval) != 0) { | ||
| return false; | ||
| } else { | ||
| Direction direction = this.spectrobe.getMotionDirection(); | ||
| int i = direction.getStepX(); | ||
| int j = direction.getStepZ(); | ||
| BlockPos blockpos = this.spectrobe.blockPosition(); | ||
|
|
||
| for(int k : STEPS_TO_CHECK) { | ||
| if (!this.waterIsClear(blockpos, i, j, k) || !this.surfaceIsClear(blockpos, i, j, k)) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
|
|
||
| private boolean waterIsClear(BlockPos pPos, int pDx, int pDz, int pScale) { | ||
| BlockPos blockpos = pPos.offset(pDx * pScale, 0, pDz * pScale); | ||
| return this.spectrobe.level.getFluidState(blockpos).is(FluidTags.WATER) && !this.spectrobe.level.getBlockState(blockpos).getMaterial().blocksMotion(); | ||
| } | ||
|
|
||
| private boolean surfaceIsClear(BlockPos pPos, int pDx, int pDz, int pScale) { | ||
| return this.spectrobe.level.getBlockState(pPos.offset(pDx * pScale, 1, pDz * pScale)).isAir() && this.spectrobe.level.getBlockState(pPos.offset(pDx * pScale, 2, pDz * pScale)).isAir(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns whether an in-progress EntityAIBase should continue executing | ||
| */ | ||
| public boolean canContinueToUse() { | ||
| double d0 = this.spectrobe.getDeltaMovement().y; | ||
| return (!(d0 * d0 < (double)0.03F) || this.spectrobe.xRot == 0.0F || !(Math.abs(this.spectrobe.xRot) < 10.0F) || !this.spectrobe.isInWater()) && !this.spectrobe.isOnGround(); | ||
| } | ||
|
|
||
| public boolean isInterruptable() { | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * Execute a one shot task or start executing a continuous task | ||
| */ | ||
| public void start() { | ||
| Direction direction = this.spectrobe.getMotionDirection(); | ||
| this.spectrobe.setDeltaMovement(this.spectrobe.getDeltaMovement().add((double)direction.getStepX() * 0.6D, 0.7D, (double)direction.getStepZ() * 0.6D)); | ||
| this.spectrobe.getNavigation().stop(); | ||
| } | ||
|
|
||
| /** | ||
| * Reset the task's internal state. Called when this task is interrupted by another one | ||
| */ | ||
| public void stop() { | ||
| this.spectrobe.xRot = 0.0F; | ||
| } | ||
|
|
||
| /** | ||
| * Keep ticking a continuous task that has already been started | ||
| */ | ||
| public void tick() { | ||
| boolean flag = this.breached; | ||
| if (!flag) { | ||
| FluidState fluidstate = this.spectrobe.level.getFluidState(this.spectrobe.blockPosition()); | ||
| this.breached = fluidstate.is(FluidTags.WATER); | ||
| } | ||
|
|
||
| if (this.breached && !flag) { | ||
| this.spectrobe.playSound(SoundEvents.DOLPHIN_JUMP, 1.0F, 1.0F); | ||
| } | ||
|
|
||
| Vector3d vector3d = this.spectrobe.getDeltaMovement(); | ||
| if (vector3d.y * vector3d.y < (double)0.03F && this.spectrobe.xRot != 0.0F) { | ||
| this.spectrobe.xRot = MathHelper.rotlerp(this.spectrobe.xRot, 0.0F, 0.2F); | ||
| } else { | ||
| double d0 = Math.sqrt(Entity.getHorizontalDistanceSqr(vector3d)); | ||
| double d1 = Math.signum(-vector3d.y) * Math.acos(d0 / vector3d.length()) * (double)(180F / (float)Math.PI); | ||
| this.spectrobe.xRot = (float)d1; | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/main/java/com/spectrobes/spectrobesmod/common/entities/goals/AvoidKrawlGoal.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.spectrobes.spectrobesmod.common.entities.goals; | ||
|
|
||
| import com.spectrobes.spectrobesmod.common.entities.spectrobes.EntitySpectrobe; | ||
| import com.spectrobes.spectrobesmod.common.spectrobes.SpectrobeProperties; | ||
| import net.minecraft.entity.CreatureEntity; | ||
| import net.minecraft.entity.ai.goal.AvoidEntityGoal; | ||
|
|
||
| public class AvoidKrawlGoal extends AvoidEntityGoal { | ||
| public AvoidKrawlGoal(CreatureEntity entity, Class toAvoid, float maxDist, double walkSpeedModifier, double sprintSpeedModifier) { | ||
| super(entity, toAvoid, maxDist, walkSpeedModifier, sprintSpeedModifier); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean canUse() { | ||
| return ((EntitySpectrobe)mob).getStage() == SpectrobeProperties.Stage.CHILD && super.canUse(); | ||
| } | ||
| } |
29 changes: 0 additions & 29 deletions
29
src/main/java/com/spectrobes/spectrobesmod/common/entities/goals/FightGoal.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.