PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-12 16:14:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improved cloud IA

Browse source
This commit is contained in:
Sollace 2019-01-30 15:49:15 +02:00
parent 70d97b4127
commit 124612d02e
2 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java
View file

@ -25,6 +25,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityFlying;
import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList;
import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.IEntityLivingData;
import net.minecraft.entity.MoverType;
import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.passive.IAnimals; import net.minecraft.entity.passive.IAnimals;
@ -65,7 +66,10 @@ public class EntityCloud extends EntityFlying implements IAnimals {
private static final DataParameter<Boolean> STATIONARY = EntityDataManager.createKey(EntityCloud.class, DataSerializers.BOOLEAN); private static final DataParameter<Boolean> STATIONARY = EntityDataManager.createKey(EntityCloud.class, DataSerializers.BOOLEAN);
protected double altitude; protected double targetAltitude;
protected int directionX;
protected int directionZ;
private final double baseWidth = 3f; private final double baseWidth = 3f;
private final double baseHeight = 0.8f; private final double baseHeight = 0.8f;
@ -343,20 +347,29 @@ public class EntityCloud extends EntityFlying implements IAnimals {
super.updateAITasks(); super.updateAITasks();
if (!isBeingRidden()) { if (!isBeingRidden()) {
double distance = altitude - posY; double distance = targetAltitude - posY;
if (Math.abs(distance) < 1 && rand.nextInt(7000) == 0) { if (Math.abs(distance) < 1 && rand.nextInt(7000) == 0) {
altitude = getRandomFlyingHeight(); targetAltitude = getRandomFlyingHeight();
distance = altitude - posY; distance = targetAltitude - posY;
} }
if (distance < 1) { if (rand.nextInt(7000) == 0) {
directionX = directionX == 0 ? rand.nextInt(3) - 1 : 0;
}
if (rand.nextInt(7000) == 0) {
directionZ = directionZ == 0 ? rand.nextInt(3) - 1 : 0;
}
if (Math.abs(distance) < 1) {
distance = 0; distance = 0;
} }
motionX -= 0.01; motionX -= 0.02;
motionZ -= (Math.signum(distance) * 0.699999988079071D - motionZ) * 0.10000000149011612D; motionX -= (Math.signum(directionX) * 0.699999988079071D - motionX) * 0.10000000149011612D;
motionY += (Math.signum(distance) * 0.699999988079071D - motionY) * 0.10000000149011612D; motionY += (Math.signum(distance) * 0.699999988079071D - motionY) * 0.10000000149011612D;
motionZ -= (Math.signum(directionZ) * 0.699999988079071D - motionZ) * 0.10000000149011612D;
} }
} }
} }
@ -501,9 +514,9 @@ public class EntityCloud extends EntityFlying implements IAnimals {
return super.attackEntityFrom(source, amount * 1.5f); return super.attackEntityFrom(source, amount * 1.5f);
} else if (canFly) { } else if (canFly) {
if (player.posY < posY) { if (player.posY < posY) {
altitude += 5; targetAltitude = posY + 5;
} else if (player.posY > posY) { } else if (player.posY > posY) {
altitude -= 5; targetAltitude = posY - 5;
} }
} }
} }
@ -588,7 +601,7 @@ public class EntityCloud extends EntityFlying implements IAnimals {
entity.onGround = true; entity.onGround = true;
entity.motionY += (((floatStrength > 2 ? 1 : floatStrength/2) * 0.699999998079071D) - entity.motionY + boundModifier * 0.7) * 0.10000000149011612D; entity.motionY += (((floatStrength > 2 ? 1 : floatStrength/2) * 0.699999998079071D) - entity.motionY + boundModifier * 0.7) * 0.10000000149011612D;
if (!getStationary()) { if (!getStationary()) {
entity.motionX -= 0.005; entity.motionX -= 0.013;
} }
if (!getStationary() && entity.motionY > 0.4 && world.rand.nextInt(900) == 0) { if (!getStationary() && entity.motionY > 0.4 && world.rand.nextInt(900) == 0) {
@ -609,6 +622,17 @@ public class EntityCloud extends EntityFlying implements IAnimals {
return false; return false;
} }
@Override
protected void doBlockCollisions() {
super.doBlockCollisions();
}
@Override
public void move(MoverType type, double x, double y, double z) {
this.setEntityBoundingBox(this.getEntityBoundingBox().offset(x, y, z));
this.resetPositionToBB();
}
public int getFloatStrength(Entity entity) { public int getFloatStrength(Entity entity) {
if (Predicates.ENTITY_INTERACT_WITH_CLOUDS.test(entity)) { if (Predicates.ENTITY_INTERACT_WITH_CLOUDS.test(entity)) {
return 3; return 3;

4
src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java
View file

@ -75,7 +75,7 @@ public class EntityWildCloud extends EntityCloud {
if (!(pack instanceof PackData)) { if (!(pack instanceof PackData)) {
float minSpawnHeight = getMinimumFlyingHeight(); float minSpawnHeight = getMinimumFlyingHeight();
altitude = getRandomFlyingHeight(); targetAltitude = getRandomFlyingHeight();
if (posY < minSpawnHeight) { if (posY < minSpawnHeight) {
minSpawnHeight += world.rand.nextInt(Math.max(1, (int)getMaximumFlyingHeight() - (int)minSpawnHeight)); minSpawnHeight += world.rand.nextInt(Math.max(1, (int)getMaximumFlyingHeight() - (int)minSpawnHeight));
@ -87,7 +87,7 @@ public class EntityWildCloud extends EntityCloud {
pack = new PackData(this); pack = new PackData(this);
} else { } else {
PackData packData = (PackData)pack; PackData packData = (PackData)pack;
altitude = packData.leader.altitude; targetAltitude = packData.leader.targetAltitude;
Vec3d position = packData.getUnOccupiedPosition(getCloudSize()); Vec3d position = packData.getUnOccupiedPosition(getCloudSize());