From 60731e1bcac272a2e2584d815056b781cdf4b787 Mon Sep 17 00:00:00 2001 From: Eli Gibbs Date: Mon, 1 Jun 2026 12:48:38 -0400 Subject: [PATCH] change swimming to be bettertm --- .../entity/ai/DinoAIController.java | 23 +++++++++++++++++++ .../entity/custom/AchillobatorEntity.java | 5 ++++ .../entity/custom/AlbertosaurusEntity.java | 5 ++++ .../entity/custom/AllosaurusEntity.java | 5 ++++ .../entity/custom/AlvarezsaurusEntity.java | 5 ++++ .../entity/custom/AnkylosaurusEntity.java | 5 ++++ .../entity/custom/ApatosaurusEntity.java | 5 ++++ .../entity/custom/ArambourgianiaEntity.java | 5 ++++ .../entity/custom/BaryonyxEntity.java | 5 ++++ .../entity/custom/BrachiosaurusEntity.java | 5 ++++ .../custom/CarcharodontosaurusEntity.java | 5 ++++ .../entity/custom/CarnotaurusEntity.java | 5 ++++ .../entity/custom/CearadactylusEntity.java | 5 ++++ .../entity/custom/CeratosaurusEntity.java | 5 ++++ .../entity/custom/ChasmosaurusEntity.java | 5 ++++ .../entity/custom/ChickenosaurusEntity.java | 5 ++++ .../entity/custom/CoelophysisEntity.java | 5 ++++ .../entity/custom/CoelurusEntity.java | 5 ++++ .../entity/custom/CompsognathusEntity.java | 5 ++++ .../entity/custom/ConcavenatorEntity.java | 5 ++++ .../entity/custom/CorythosaurusEntity.java | 5 ++++ .../entity/custom/DeinonychusEntity.java | 5 ++++ .../entity/custom/DilophosaurusEntity.java | 5 ++++ .../entity/custom/DimorphodonEntity.java | 5 ++++ .../entity/custom/DiplodocusEntity.java | 5 ++++ .../entity/custom/DistortusRexEntity.java | 5 ++++ .../entity/custom/DryosaurusEntity.java | 5 ++++ .../entity/custom/EdmontosaurusEntity.java | 5 ++++ .../entity/custom/FDuckEntity.java | 5 ++++ .../entity/custom/GallimimusEntity.java | 5 ++++ .../entity/custom/GeosternbergiaEntity.java | 5 ++++ .../entity/custom/GiganotosaurusEntity.java | 5 ++++ .../entity/custom/GuanlongEntity.java | 5 ++++ .../entity/custom/GuidracoEntity.java | 5 ++++ .../entity/custom/HadrosaurusEntity.java | 5 ++++ .../entity/custom/HerrerasaurusEntity.java | 5 ++++ .../entity/custom/HypsilophodonEntity.java | 5 ++++ .../entity/custom/IndominusRexEntity.java | 5 ++++ .../entity/custom/IndoraptorEntity.java | 5 ++++ .../entity/custom/InostranceviaEntity.java | 5 ++++ .../entity/custom/LambeosaurusEntity.java | 5 ++++ .../entity/custom/LudodactylusEntity.java | 5 ++++ .../entity/custom/MajungasaurusEntity.java | 5 ++++ .../entity/custom/MamenchisaurusEntity.java | 5 ++++ .../custom/MetriacanthosaurusEntity.java | 5 ++++ .../entity/custom/MoganopterusEntity.java | 5 ++++ .../entity/custom/NyctosaurusEntity.java | 5 ++++ .../entity/custom/OrnitholestesEntity.java | 5 ++++ .../entity/custom/OrnithomimusEntity.java | 5 ++++ .../entity/custom/OuranosaurusEntity.java | 5 ++++ .../entity/custom/OviraptorEntity.java | 5 ++++ .../custom/PachycephalosaurusEntity.java | 5 ++++ .../entity/custom/ParasaurolophusEntity.java | 5 ++++ .../entity/custom/ProceratosaurusEntity.java | 5 ++++ .../entity/custom/ProcompsognathusEntity.java | 5 ++++ .../entity/custom/ProtoceratopsEntity.java | 5 ++++ .../entity/custom/PteranodonEntity.java | 5 ++++ .../entity/custom/PterodaustroEntity.java | 5 ++++ .../entity/custom/QuetzalcoatlusEntity.java | 5 ++++ .../entity/custom/RajasaurusEntity.java | 5 ++++ .../entity/custom/RugopsEntity.java | 5 ++++ .../entity/custom/SegisaurusEntity.java | 5 ++++ .../entity/custom/ShantungosaurusEntity.java | 5 ++++ .../entity/custom/SpinosaurusEntity.java | 5 ++++ .../entity/custom/StegosaurusEntity.java | 5 ++++ .../entity/custom/StyracosaurusEntity.java | 5 ++++ .../entity/custom/TapejaraEntity.java | 5 ++++ .../entity/custom/TherizinosaurusEntity.java | 5 ++++ .../entity/custom/TitanosaurusEntity.java | 5 ++++ .../entity/custom/TriceratopsEntity.java | 5 ++++ .../entity/custom/TroodonEntity.java | 5 ++++ .../entity/custom/TropeognathusEntity.java | 5 ++++ .../entity/custom/TupuxuaraEntity.java | 5 ++++ .../entity/custom/TyrannosaurusRexEntity.java | 5 ++++ .../entity/custom/UtahraptorEntity.java | 5 ++++ .../entity/custom/VelociraptorEntity.java | 5 ++++ .../entity/custom/ZhenyuanopterusEntity.java | 5 ++++ gradle.properties | 2 +- 78 files changed, 404 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/ai/DinoAIController.java b/common/src/main/java/net/cmr/jurassicrevived/entity/ai/DinoAIController.java index ca5ffca..bf2f447 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/ai/DinoAIController.java +++ b/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. diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AchillobatorEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AchillobatorEntity.java index d54c5a0..9c9f3b4 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AchillobatorEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlbertosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlbertosaurusEntity.java index a7efd84..d06e0ed 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlbertosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AllosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AllosaurusEntity.java index a0d967b..481f848 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AllosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlvarezsaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlvarezsaurusEntity.java index 358025e..8bf8ae7 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AlvarezsaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AnkylosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AnkylosaurusEntity.java index 85f2440..2867e92 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/AnkylosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ApatosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ApatosaurusEntity.java index ea1a106..b8e2261 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ApatosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ArambourgianiaEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ArambourgianiaEntity.java index c0b00e7..6c9bd12 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ArambourgianiaEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/BaryonyxEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/BaryonyxEntity.java index b03e9db..3043120 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/BaryonyxEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/BrachiosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/BrachiosaurusEntity.java index fcf6676..eb90186 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/BrachiosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarcharodontosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarcharodontosaurusEntity.java index 0fa0b7e..d474671 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarcharodontosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarnotaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarnotaurusEntity.java index be41a14..41f8f8a 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CarnotaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CearadactylusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CearadactylusEntity.java index bc1ef7f..4b805ab 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CearadactylusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CeratosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CeratosaurusEntity.java index b0d3768..eaf49ae 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CeratosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChasmosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChasmosaurusEntity.java index 56ab4f5..c5c1686 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChasmosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChickenosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChickenosaurusEntity.java index 1abf372..1663f59 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ChickenosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelophysisEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelophysisEntity.java index f639095..cec362d 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelophysisEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelurusEntity.java index 789ab65..497dd82 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CoelurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CompsognathusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CompsognathusEntity.java index e33af0f..19b3170 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CompsognathusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ConcavenatorEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ConcavenatorEntity.java index 3c0e585..8bfae5a 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ConcavenatorEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CorythosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CorythosaurusEntity.java index 6302b8e..b5b3145 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/CorythosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DeinonychusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DeinonychusEntity.java index 5ee3124..4d6cdc7 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DeinonychusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DilophosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DilophosaurusEntity.java index c36006d..1782820 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DilophosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DimorphodonEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DimorphodonEntity.java index 0a4a03c..99b3b6a 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DimorphodonEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DiplodocusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DiplodocusEntity.java index 314db67..1d4d845 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DiplodocusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DistortusRexEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DistortusRexEntity.java index 9735939..a7c08c3 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DistortusRexEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DryosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DryosaurusEntity.java index 8ab19c8..c6eb2ab 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/DryosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/EdmontosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/EdmontosaurusEntity.java index 150ff22..0c6a7d1 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/EdmontosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/FDuckEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/FDuckEntity.java index 36e7108..7015b9d 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/FDuckEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GallimimusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GallimimusEntity.java index 3547693..29c2cc2 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GallimimusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GeosternbergiaEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GeosternbergiaEntity.java index 48c98ea..362bdf8 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GeosternbergiaEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GiganotosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GiganotosaurusEntity.java index 10cb1e5..43f04aa 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GiganotosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuanlongEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuanlongEntity.java index a9ad0dd..53b0a3d 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuanlongEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuidracoEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuidracoEntity.java index 8e29cb4..78d3d81 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/GuidracoEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HadrosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HadrosaurusEntity.java index c1102aa..4ae457b 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HadrosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HerrerasaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HerrerasaurusEntity.java index 36ee61f..3528087 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HerrerasaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HypsilophodonEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HypsilophodonEntity.java index 2a92be0..6887c4c 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/HypsilophodonEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndominusRexEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndominusRexEntity.java index 320dc8f..5b17676 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndominusRexEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndoraptorEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndoraptorEntity.java index 5c7da67..a97e9cf 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/IndoraptorEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/InostranceviaEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/InostranceviaEntity.java index 75f8ada..6c57ee5 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/InostranceviaEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/LambeosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/LambeosaurusEntity.java index dd8b7be..aefe57f 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/LambeosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/LudodactylusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/LudodactylusEntity.java index c4010a8..c71b4d2 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/LudodactylusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MajungasaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MajungasaurusEntity.java index 677a86e..ea8869e 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MajungasaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MamenchisaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MamenchisaurusEntity.java index 39a7cd4..886cff6 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MamenchisaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MetriacanthosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MetriacanthosaurusEntity.java index 1e92456..185ce01 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MetriacanthosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MoganopterusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MoganopterusEntity.java index 4769bc5..d375039 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/MoganopterusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/NyctosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/NyctosaurusEntity.java index 9322914..79afd93 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/NyctosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnitholestesEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnitholestesEntity.java index a9fdb9c..e51880a 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnitholestesEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnithomimusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnithomimusEntity.java index 13b5110..bfe862c 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OrnithomimusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OuranosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OuranosaurusEntity.java index d588832..935068a 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OuranosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OviraptorEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OviraptorEntity.java index 17ffeb4..4d7db9b 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/OviraptorEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PachycephalosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PachycephalosaurusEntity.java index 8e1048e..91e9de5 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PachycephalosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ParasaurolophusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ParasaurolophusEntity.java index ef74c6d..3ec6e34 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ParasaurolophusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProceratosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProceratosaurusEntity.java index 68614df..ea89058 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProceratosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProcompsognathusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProcompsognathusEntity.java index 04b45c6..97e1fb0 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProcompsognathusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProtoceratopsEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProtoceratopsEntity.java index cbc25f1..957aee4 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ProtoceratopsEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PteranodonEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PteranodonEntity.java index 7946ada..c39dabe 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PteranodonEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PterodaustroEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PterodaustroEntity.java index 94c636d..f0b2a56 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/PterodaustroEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/QuetzalcoatlusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/QuetzalcoatlusEntity.java index db7721d..24cfeb5 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/QuetzalcoatlusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/RajasaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/RajasaurusEntity.java index a3ae9fe..19269c7 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/RajasaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/RugopsEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/RugopsEntity.java index fcfaf6b..98cf718 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/RugopsEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/SegisaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/SegisaurusEntity.java index 16b756b..0590bb1 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/SegisaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ShantungosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ShantungosaurusEntity.java index 1744a7f..699142d 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ShantungosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/SpinosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/SpinosaurusEntity.java index 286e42d..7a194a8 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/SpinosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/StegosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/StegosaurusEntity.java index 8ef2381..a9dbcd2 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/StegosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/StyracosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/StyracosaurusEntity.java index 6dc01ff..4cd9afe 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/StyracosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TapejaraEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TapejaraEntity.java index 3691460..cd84fa7 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TapejaraEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TherizinosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TherizinosaurusEntity.java index cff0d4a..76f2fe2 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TherizinosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TitanosaurusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TitanosaurusEntity.java index b24106e..af35b9e 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TitanosaurusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TriceratopsEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TriceratopsEntity.java index 979d33d..9e334a0 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TriceratopsEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TroodonEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TroodonEntity.java index c3d48ab..9b25bfa 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TroodonEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TropeognathusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TropeognathusEntity.java index 76b0eb4..f5facd2 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TropeognathusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TupuxuaraEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TupuxuaraEntity.java index 0b7d62e..add3db0 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TupuxuaraEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TyrannosaurusRexEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TyrannosaurusRexEntity.java index 18340a7..9f0111f 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/TyrannosaurusRexEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/UtahraptorEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/UtahraptorEntity.java index c0caec7..416f610 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/UtahraptorEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/VelociraptorEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/VelociraptorEntity.java index e7bb399..1193ae7 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/VelociraptorEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ZhenyuanopterusEntity.java b/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ZhenyuanopterusEntity.java index 6755dbf..0c1a4d3 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/entity/custom/ZhenyuanopterusEntity.java +++ b/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(); + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index dec9c14..44519f9 100755 --- a/gradle.properties +++ b/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