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

Fix storm clouds moving too quickly fix logic for when they're above the world limit

Browse source
This commit is contained in:
Sollace 2023-11-05 21:40:49 +00:00
parent 8b28698650
commit 1cf6beafdc
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/minelittlepony/unicopia/entity/mob/StormCloudEntity.java
View file

@ -20,6 +20,7 @@ import net.minecraft.entity.data.DataTracker;
import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedData;
import net.minecraft.entity.data.TrackedDataHandlerRegistry; import net.minecraft.entity.data.TrackedDataHandlerRegistry;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.predicate.entity.EntityPredicates; import net.minecraft.predicate.entity.EntityPredicates;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
@ -135,10 +136,13 @@ public class StormCloudEntity extends Entity implements MagicImmune {
} }
if (isLogicalSideForUpdatingMovement()) { if (isLogicalSideForUpdatingMovement()) {
float groundY = getWorld().getTopY(Type.MOTION_BLOCKING_NO_LEAVES, (int)getX(), (int)getZ()); float groundY = findSurfaceBelow(getWorld(), getBlockPos()).getY();
float cloudY = (float)getY() - (isStormy() ? STORMY_TARGET_ALTITUDE : CLEAR_TARGET_ALTITUDE); float targetY = isStormy() ? STORMY_TARGET_ALTITUDE : CLEAR_TARGET_ALTITUDE;
float cloudY = (float)getY() - targetY;
addVelocity(0, 0.03F * (groundY - cloudY), 0); System.out.println("Ground Y: " + groundY + ", TargetY: " + targetY + ", Stormy: " + isStormy());
addVelocity(0, 0.0003F * (groundY - cloudY), 0);
if (!cursed && !isStormy()) { if (!cursed && !isStormy()) {
Vec3d wind = WeatherConditions.get(getWorld()).getWindDirection(); Vec3d wind = WeatherConditions.get(getWorld()).getWindDirection();
@ -264,7 +268,7 @@ public class StormCloudEntity extends Entity implements MagicImmune {
public static BlockPos findSurfaceBelow(World world, BlockPos pos) { public static BlockPos findSurfaceBelow(World world, BlockPos pos) {
BlockPos.Mutable mutable = new BlockPos.Mutable(); BlockPos.Mutable mutable = new BlockPos.Mutable();
mutable.set(pos); mutable.set(pos);
while (world.isInBuildLimit(mutable) && world.isAir(mutable)) { while (mutable.getY() > world.getBottomY() && world.isAir(mutable)) {
mutable.move(Direction.DOWN); mutable.move(Direction.DOWN);
} }
while (world.isInBuildLimit(mutable) && !world.isAir(mutable)) { while (world.isInBuildLimit(mutable) && !world.isAir(mutable)) {
@ -348,7 +352,9 @@ public class StormCloudEntity extends Entity implements MagicImmune {
public void readCustomDataFromNbt(NbtCompound nbt) { public void readCustomDataFromNbt(NbtCompound nbt) {
setStormTicks(nbt.getInt("stormTicks")); setStormTicks(nbt.getInt("stormTicks"));
setClearTicks(nbt.getInt("clearTicks")); setClearTicks(nbt.getInt("clearTicks"));
if (nbt.contains("size", NbtElement.FLOAT_TYPE)) {
setSize(currentSize = nbt.getFloat("size")); setSize(currentSize = nbt.getFloat("size"));
}
cursed = nbt.getBoolean("cursed"); cursed = nbt.getBoolean("cursed");
phase = nbt.getInt("phase"); phase = nbt.getInt("phase");
nextPhase = nbt.getInt("nextPhase"); nextPhase = nbt.getInt("nextPhase");