change swimming to be bettertm

common/src/main/java/net/cmr/jurassicrevived/entity/ai/DinoAIController.java

@@ -67,6 +67,8 @@ public class DinoAIController {
     public void tick() {
         if (homePos == null) homePos = dino.blockPosition();
 
+        handleFloating();
+
         updateSensors();
 
         switch (currentState) {
@@ -84,6 +86,27 @@ public class DinoAIController {
         if (attackCooldown > 0) attackCooldown--;
     }
 
+	private void handleFloating() {
+		if (!dino.isInWater()) {
+			return;
+		}
+
+		double fluidHeight = dino.getFluidHeight(FluidTags.WATER);
+		if (fluidHeight <= dino.getFluidJumpThreshold()) {
+			return;
+		}
+
+		Vec3 velocity = dino.getDeltaMovement();
+
+		if (velocity.y < 0.08D) {
+			dino.setDeltaMovement(
+				velocity.x,
+				Math.min(velocity.y + 0.03D, 0.08D),
+				velocity.z
+			);
+		}
+	}
+
     public void onHurtBy(LivingEntity attacker) {
         // Retaliate if we are capable of attacking (have damage attribute > 0)
         // Carnivores always attack back. Herbivores/others attack back if they have strength.

common/src/main/java/net/cmr/jurassicrevived/entity/custom/AchillobatorEntity.java

@@ -316,4 +316,9 @@ public class AchillobatorEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ACHILLOBATOR_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlbertosaurusEntity.java

@@ -318,4 +318,9 @@ public class AlbertosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ALBERTOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/AllosaurusEntity.java

@@ -319,4 +319,9 @@ public class AllosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ALBERTOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlvarezsaurusEntity.java

@@ -323,4 +323,9 @@ public class AlvarezsaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ALVAREZSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/AnkylosaurusEntity.java

@@ -322,4 +322,9 @@ public class AnkylosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ANKYLOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ApatosaurusEntity.java

@@ -331,4 +331,9 @@ public class ApatosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.APATOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ArambourgianiaEntity.java

@@ -363,4 +363,9 @@ public class ArambourgianiaEntity extends DinoEntityBase implements GeoEntity, F
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ARAMBOURGIANIA_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/BaryonyxEntity.java

@@ -325,4 +325,9 @@ public class BaryonyxEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.BARYONYX_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/BrachiosaurusEntity.java

@@ -331,4 +331,9 @@ public class BrachiosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.BRACHIOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarcharodontosaurusEntity.java

@@ -332,4 +332,9 @@ public class CarcharodontosaurusEntity extends DinoEntityBase implements GeoEnti
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CARCHARODONTOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarnotaurusEntity.java

@@ -320,4 +320,9 @@ public class CarnotaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CARNOTAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CearadactylusEntity.java

@@ -363,4 +363,9 @@ public class CearadactylusEntity extends DinoEntityBase implements GeoEntity, Fl
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CEARADACTYLUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CeratosaurusEntity.java

@@ -320,4 +320,9 @@ public class CeratosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CERATOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChasmosaurusEntity.java

@@ -322,4 +322,9 @@ public class ChasmosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CHASMOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChickenosaurusEntity.java

@@ -324,4 +324,9 @@ public class ChickenosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CHICKENOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelophysisEntity.java

@@ -323,4 +323,9 @@ public class CoelophysisEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.COELOPHYSIS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelurusEntity.java

@@ -323,4 +323,9 @@ public class CoelurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.COELURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CompsognathusEntity.java

@@ -322,4 +322,9 @@ public class CompsognathusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.COMPSOGNATHUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ConcavenatorEntity.java

@@ -319,4 +319,9 @@ public class ConcavenatorEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CONCAVENATOR_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/CorythosaurusEntity.java

@@ -320,4 +320,9 @@ public class CorythosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.CORYTHOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/DeinonychusEntity.java

@@ -323,4 +323,9 @@ public class DeinonychusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.DEINONYCHUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/DilophosaurusEntity.java

@@ -324,4 +324,9 @@ public class DilophosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.DILOPHOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/DimorphodonEntity.java

@@ -363,4 +363,9 @@ public class DimorphodonEntity extends DinoEntityBase implements GeoEntity, Flyi
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.DIMORPHODON_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/DiplodocusEntity.java

@@ -330,4 +330,9 @@ public class DiplodocusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.DIPLODOCUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/DistortusRexEntity.java

@@ -332,4 +332,9 @@ public class DistortusRexEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.DISTORTUS_REX_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/DryosaurusEntity.java

@@ -320,4 +320,9 @@ public class DryosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.DRYOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/EdmontosaurusEntity.java

@@ -320,4 +320,9 @@ public class EdmontosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.EDMONTOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/FDuckEntity.java

@@ -324,4 +324,9 @@ public class FDuckEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.FDUCK_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/GallimimusEntity.java

@@ -320,4 +320,9 @@ public class GallimimusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.GALLIMIMUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/GeosternbergiaEntity.java

@@ -363,4 +363,9 @@ public class GeosternbergiaEntity extends DinoEntityBase implements GeoEntity, F
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.GEOSTERNBERGIA_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/GiganotosaurusEntity.java

@@ -325,4 +325,9 @@ public class GiganotosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.GIGANOTOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuanlongEntity.java

@@ -324,4 +324,9 @@ public class GuanlongEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.GUANLONG_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuidracoEntity.java

@@ -363,4 +363,9 @@ public class GuidracoEntity extends DinoEntityBase implements GeoEntity, FlyingA
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.GUIDRACO_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/HadrosaurusEntity.java

@@ -320,4 +320,9 @@ public class HadrosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.HADROSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/HerrerasaurusEntity.java

@@ -325,4 +325,9 @@ public class HerrerasaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.HERRERASAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/HypsilophodonEntity.java

@@ -320,4 +320,9 @@ public class HypsilophodonEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.HYPSILOPHODON_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndominusRexEntity.java

@@ -331,4 +331,9 @@ public class IndominusRexEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.INDOMINUS_REX_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndoraptorEntity.java

@@ -324,4 +324,9 @@ public class IndoraptorEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.INDORAPTOR_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/InostranceviaEntity.java

@@ -324,4 +324,9 @@ public class InostranceviaEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.INOSTRANCEVIA_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/LambeosaurusEntity.java

@@ -320,4 +320,9 @@ public class LambeosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.LAMBEOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/LudodactylusEntity.java

@@ -363,4 +363,9 @@ public class LudodactylusEntity extends DinoEntityBase implements GeoEntity, Fly
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.LUDODACTYLUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/MajungasaurusEntity.java

@@ -325,4 +325,9 @@ public class MajungasaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.MAJUNGASAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/MamenchisaurusEntity.java

@@ -331,4 +331,9 @@ public class MamenchisaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.MAMENCHISAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/MetriacanthosaurusEntity.java

@@ -320,4 +320,9 @@ public class MetriacanthosaurusEntity extends DinoEntityBase implements GeoEntit
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.METRIACANTHOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/MoganopterusEntity.java

@@ -363,4 +363,9 @@ public class MoganopterusEntity extends DinoEntityBase implements GeoEntity, Fly
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.MOGANOPTERUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/NyctosaurusEntity.java

@@ -363,4 +363,9 @@ public class NyctosaurusEntity extends DinoEntityBase implements GeoEntity, Flyi
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.NYCTOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnitholestesEntity.java

@@ -323,4 +323,9 @@ public class OrnitholestesEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ORNITHOLESTES_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnithomimusEntity.java

@@ -320,4 +320,9 @@ public class OrnithomimusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ORNITHOMIMUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/OuranosaurusEntity.java

@@ -320,4 +320,9 @@ public class OuranosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.OURANOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/OviraptorEntity.java

@@ -322,4 +322,9 @@ public class OviraptorEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.OVIRAPTOR_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/PachycephalosaurusEntity.java

@@ -322,4 +322,9 @@ public class PachycephalosaurusEntity extends DinoEntityBase implements GeoEntit
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.PACHYCEPHALOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ParasaurolophusEntity.java

@@ -320,4 +320,9 @@ public class ParasaurolophusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.PARASAUROLOPHUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProceratosaurusEntity.java

@@ -323,4 +323,9 @@ public class ProceratosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.PROCERATOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProcompsognathusEntity.java

@@ -323,4 +323,9 @@ public class ProcompsognathusEntity extends DinoEntityBase implements GeoEntity
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.PROCOMPSOGNATHUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProtoceratopsEntity.java

@@ -322,4 +322,9 @@ public class ProtoceratopsEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.PROTOCERATOPS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/PteranodonEntity.java

@@ -363,4 +363,9 @@ public class PteranodonEntity extends DinoEntityBase implements GeoEntity, Flyin
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.PTERANODON_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/PterodaustroEntity.java

@@ -363,4 +363,9 @@ public class PterodaustroEntity extends DinoEntityBase implements GeoEntity, Fly
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.PTERODAUSTRO_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/QuetzalcoatlusEntity.java

@@ -363,4 +363,9 @@ public class QuetzalcoatlusEntity extends DinoEntityBase implements GeoEntity, F
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.QUETZALCOATLUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/RajasaurusEntity.java

@@ -325,4 +325,9 @@ public class RajasaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.RAJASAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/RugopsEntity.java

@@ -325,4 +325,9 @@ public class RugopsEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.RUGOPS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/SegisaurusEntity.java

@@ -323,4 +323,9 @@ public class SegisaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.SEGISAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ShantungosaurusEntity.java

@@ -320,4 +320,9 @@ public class ShantungosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.SHANTUNGOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/SpinosaurusEntity.java

@@ -324,4 +324,9 @@ public class SpinosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.SPINOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/StegosaurusEntity.java

@@ -323,4 +323,9 @@ public class StegosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.STEGOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/StyracosaurusEntity.java

@@ -322,4 +322,9 @@ public class StyracosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.STYRACOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TapejaraEntity.java

@@ -363,4 +363,9 @@ public class TapejaraEntity extends DinoEntityBase implements GeoEntity, FlyingA
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.TAPEJARA_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TherizinosaurusEntity.java

@@ -323,4 +323,9 @@ public class TherizinosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.THERIZINOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TitanosaurusEntity.java

@@ -331,4 +331,9 @@ public class TitanosaurusEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.TITANOSAURUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TriceratopsEntity.java

@@ -322,4 +322,9 @@ public class TriceratopsEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.TRICERATOPS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TroodonEntity.java

@@ -323,4 +323,9 @@ public class TroodonEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.TROODON_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TropeognathusEntity.java

@@ -363,4 +363,9 @@ public class TropeognathusEntity extends DinoEntityBase implements GeoEntity, Fl
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.TROPEOGNATHUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TupuxuaraEntity.java

@@ -363,4 +363,9 @@ public class TupuxuaraEntity extends DinoEntityBase implements GeoEntity, Flying
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.TUPUXUARA_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/TyrannosaurusRexEntity.java

@@ -332,4 +332,9 @@ public class TyrannosaurusRexEntity extends DinoEntityBase implements GeoEntity
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.TYRANNOSAURUS_REX_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/UtahraptorEntity.java

@@ -322,4 +322,9 @@ public class UtahraptorEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.UTAHRAPTOR_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/VelociraptorEntity.java

@@ -324,4 +324,9 @@ public class VelociraptorEntity extends DinoEntityBase implements GeoEntity {
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.VELOCIRAPTOR_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

common/src/main/java/net/cmr/jurassicrevived/entity/custom/ZhenyuanopterusEntity.java

@@ -363,4 +363,9 @@ public class ZhenyuanopterusEntity extends DinoEntityBase implements GeoEntity,
 	protected @Nullable SoundEvent getAmbientSound() {
 		return ModSounds.ZHENYUANOPTERUS_CALL.get();
 	}
+
+	@Override
+	public double getFluidJumpThreshold() {
+		return this.getEyeHeight();
+	}
 }

gradle.properties

@@ -10,7 +10,7 @@ fabric.loom.multiProjectOptimisation=true
 mod.name=Jurassic Revived
 mod.id=jurassicrevived
 mod.group=net.cmr.jurassicrevived
-mod.version=0.207.0
+mod.version=0.208.0
 mod.author=CMR Team, Eli Gibbs
 mod.description=A Minecraft mod that brings dinosaurs back to life using ancient DNA and modern technology\nBreed, study, and build your own prehistoric park with a wide variety of creatures...
 mod.license=CC-BY-ND-4.0