fixed incompatibility with Snow Real Magic

Author: supermassimo

gradle.properties

@@ -1,6 +1,6 @@
 modName=DynamicTrees
 modId=dynamictrees
-modVersion=1.4.1
+modVersion=1.4.2
 
 group=com.ferreusveritas.dynamictrees
 

src/main/java/com/ferreusveritas/dynamictrees/data/DTEntityTypeTags.java

@@ -14,6 +14,7 @@ public final class DTEntityTypeTags {
 
     public static final TagKey<EntityType<?>> CAN_PASS_THROUGH_LEAVES = bind("can_pass_through_leaves");
     public static final TagKey<EntityType<?>> FALLING_TREE_DAMAGE_IMMUNE = bind("falling_tree_damage_immune");
+    public static final TagKey<EntityType<?>> FALLING_TREE_COLLISION_BLACKLIST = bind("falling_tree_collision_blacklist");
 
     private static TagKey<EntityType<?>> bind(String identifier) {
         return TagKey.create(Registries.ENTITY_TYPE, DynamicTrees.location(identifier));

src/main/java/com/ferreusveritas/dynamictrees/entity/FallingTreeEntity.java

@@ -3,6 +3,7 @@
 import com.ferreusveritas.dynamictrees.api.TreeHelper;
 import com.ferreusveritas.dynamictrees.block.branch.TrunkShellBlock;
 import com.ferreusveritas.dynamictrees.block.rooty.RootyBlock;
+import com.ferreusveritas.dynamictrees.data.DTEntityTypeTags;
 import com.ferreusveritas.dynamictrees.entity.animation.AnimationHandler;
 import com.ferreusveritas.dynamictrees.entity.animation.AnimationHandlers;
 import com.ferreusveritas.dynamictrees.entity.animation.DataAnimationHandler;
@@ -12,7 +13,6 @@
 import com.ferreusveritas.dynamictrees.models.ModelTracker;
 import com.ferreusveritas.dynamictrees.tree.species.Species;
 import com.ferreusveritas.dynamictrees.util.BlockBounds;
-import com.ferreusveritas.dynamictrees.util.BlockStates;
 import com.ferreusveritas.dynamictrees.util.BranchDestructionData;
 import com.ferreusveritas.dynamictrees.util.CoordUtils.Surround;
 import com.google.common.collect.Iterables;
@@ -419,6 +419,12 @@ public boolean shouldDie() {
         return tickCount > 20 && currentAnimationHandler.shouldDie(this); //Give the entity 20 ticks to receive it's data from the server.
     }
 
+    @Override
+    public boolean canCollideWith(Entity pEntity) {
+        if (pEntity.getType().is(DTEntityTypeTags.FALLING_TREE_COLLISION_BLACKLIST)) return false;
+        return super.canCollideWith(pEntity);
+    }
+
     @OnlyIn(Dist.CLIENT)
     public boolean shouldRender() {
         return currentAnimationHandler.shouldRender(this);

src/main/java/com/ferreusveritas/dynamictrees/entity/animation/FalloverAnimationHandler.java

@@ -33,6 +33,8 @@
 
 public class FalloverAnimationHandler implements AnimationHandler {
 
+    public static int TICKS_BEFORE_CHECKING_COLLISION = 10;
+
     @Override
     public String getName() {
         return "fallover";
@@ -206,7 +208,7 @@ public void handleMotion(FallingTreeEntity entity) {
             }
         }
 
-        if (fallSpeed > 0 && testCollision(entity)) {
+        if (entity.tickCount > TICKS_BEFORE_CHECKING_COLLISION && fallSpeed > 0 && testCollision(entity)) {
             playEndSound(entity);
             flingLeavesParticles(entity, fallSpeed);
             addRotation(entity, -fallSpeed);//pull back to before the collision

src/main/resources/data/dynamictrees/tags/entity_types/falling_tree_collision_blacklist.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "snowrealmagic:snow",
+      "required": false
+    }
+  ]
+}