AstralTransRocketries/Squake
1
0
Fork 0
mirror of https://github.com/squeek502/Squake.git synced 2025-09-08 11:37:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix surface tension

Browse Source
This commit is contained in:
CoolMineman 2020-08-01 12:16:12 -05:00
parent 61c4622bca
commit 1ac2a15159
No known key found for this signature in database
GPG Key ID: 2439F5FE115256DD
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
java/squeek/quakemovement/QuakeClientPlayer.java
View File

@ -7,12 +7,15 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.MovementType; import net.minecraft.entity.MovementType;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.FluidState;
import net.minecraft.particle.BlockStateParticleEffect; import net.minecraft.particle.BlockStateParticleEffect;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.tag.FluidTags;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.util.math.Box;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -221,6 +224,31 @@ public class QuakeClientPlayer
return ((IsJumpingGetter) player).isJumping(); return ((IsJumpingGetter) player).isJumping();
} }
private static boolean isInWater(Box box, World world) {
int i = MathHelper.floor(box.minX);
int j = MathHelper.ceil(box.maxX);
int k = MathHelper.floor(box.minY);
int l = MathHelper.ceil(box.maxY);
int m = MathHelper.floor(box.minZ);
int n = MathHelper.ceil(box.maxZ);
if (!world.isRegionLoaded(i, k, m, j, l, n)) {
return false;
}
BlockPos.Mutable mutable = new BlockPos.Mutable();
for(int p = i; p < j; ++p) {
for(int q = k; q < l; ++q) {
for(int r = m; r < n; ++r) {
mutable.set(p, q, r);
FluidState fluidState = world.getFluidState(mutable);
if (fluidState.isIn(FluidTags.WATER)) {
return true;
}
}
}
}
return false;
}
/* ================================================= /* =================================================
* END HELPERS * END HELPERS
* ================================================= * =================================================
@ -376,7 +404,7 @@ public class QuakeClientPlayer
if (ModConfig.SHARKING_ENABLED && ModConfig.SHARKING_SURFACE_TENSION > 0.0D && isJumping(player) && player.getVelocity().y < 0.0F) if (ModConfig.SHARKING_ENABLED && ModConfig.SHARKING_SURFACE_TENSION > 0.0D && isJumping(player) && player.getVelocity().y < 0.0F)
{ {
Box axisalignedbb = player.getBoundingBox().offset(player.getVelocity()); Box axisalignedbb = player.getBoundingBox().offset(player.getVelocity());
boolean isFallingIntoWater = false;//player.world.containsBlockWithMaterial(axisalignedbb, Material.WATER); //todo fix boolean isFallingIntoWater = isInWater(axisalignedbb, player.world);
if (isFallingIntoWater) if (isFallingIntoWater)
player.setVelocity(player.getVelocity().multiply(1.0D, ModConfig.SHARKING_SURFACE_TENSION, 1.0D)); player.setVelocity(player.getVelocity().multiply(1.0D, ModConfig.SHARKING_SURFACE_TENSION, 1.0D));