Merge pull request #1134 from HYPER1208-max/fix-falling-tree

Fix falling tree

Author: supermassimo

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

@@ -15,6 +15,8 @@
 import com.ferreusveritas.dynamictrees.util.BlockBounds;
 import com.ferreusveritas.dynamictrees.util.BranchDestructionData;
 import com.ferreusveritas.dynamictrees.util.CoordUtils.Surround;
+import com.ferreusveritas.dynamictrees.block.branch.ThickBranchBlock;
+import com.ferreusveritas.dynamictrees.util.CoordUtils.ShellDirection;
 import com.google.common.collect.Iterables;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -237,12 +239,16 @@ public void buildClient() {
     protected void cleanupShellBlocks(BranchDestructionData destroyData) {
         BlockPos cutPos = destroyData.cutPos;
         for (int i = 0; i < destroyData.getNumBranches(); i++) {
-            if (destroyData.getBranchRadius(i) > 8) {
+            int radius = destroyData.getBranchRadius(i);
+            if (radius > ThickBranchBlock.RADIUS_TO_INNER_SHELL) {
                 BlockPos pos = destroyData.getBranchRelPos(i).offset(cutPos);
-                for (Surround dir : Surround.values()) {
-                    BlockPos dPos = pos.offset(dir.getOffset());
-                    if (level().getBlockState(dPos).getBlock() instanceof TrunkShellBlock) {
-                        level().removeBlock(dPos, false);
+                for (ShellDirection dir : ShellDirection.values()) {
+                    // Only check shells that this radius actually needs
+                    if (dir.getShellLevel() == 1 || dir.getShellLevel() == 2 && radius > ThickBranchBlock.RADIUS_TO_OUTER_SHELL || dir.getShellLevel() == 3 && radius > ThickBranchBlock.RADIUS_TO_OUTERMOST_SHELL) {
+                        BlockPos dPos = pos.offset(dir.getOffset());
+                        if (level().getBlockState(dPos).getBlock() instanceof TrunkShellBlock) {
+                            level().removeBlock(dPos, false);
+                        }
                     }
                 }
             }
@@ -549,4 +555,4 @@ public static FallingTreeEntity dropTree(Level level, BranchDestructionData dest
         return null;
     }
 
-}
+}

src/main/java/com/ferreusveritas/dynamictrees/models/baked/BasicBranchBlockBakedModel.java

@@ -48,9 +48,9 @@ public class BasicBranchBlockBakedModel implements IDynamicBakedModel {
     protected final TextureAtlasSprite ringsTexture;
 
 
-    protected final BakedModel[][] sleeves = new BakedModel[6][7];
-    protected final BakedModel[][] cores = new BakedModel[3][8]; // 8 Cores for 3 axis with the bark texture all all 6 sides rotated appropriately.
-    protected final BakedModel[] rings = new BakedModel[8]; // 8 Cores with the ring textures on all 6 sides.
+    protected BakedModel[][] sleeves = new BakedModel[6][7];
+    protected BakedModel[][] cores = new BakedModel[3][8]; // 8 Cores for 3 axis with the bark texture all all 6 sides rotated appropriately.
+    protected BakedModel[] rings = new BakedModel[8]; // 8 Cores with the ring textures on all 6 sides.
 
     public BasicBranchBlockBakedModel(IGeometryBakingContext customData, ResourceLocation modelLocation, ResourceLocation barkTextureLocation, ResourceLocation ringsTextureLocation,
                                       Function<Material, TextureAtlasSprite> spriteGetter) {
@@ -202,7 +202,7 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
 
         final int coreRadius = getRadius(state);
 
-        if (coreRadius > 8) {
+        if (coreRadius > cores[0].length) {
             return Collections.emptyList();
         }