Do not take into account "minimumLeavesAroundRequired" when using shi…

…ft down mode

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [Fabric-1.16.2-2.3.2] - 2020-09-09
+* Do not take into account "minimumLeavesAroundRequired" when using shift down mode
+
 ## [Fabric-1.16.2-2.3.1] - 2020-09-04
 * Set minimum required fabric api (#22)
 

changes.md

@@ -1 +1 @@
-* Set minimum required fabric api (#22)
+* Do not take into account "minimumLeavesAroundRequired" when using shift down mode

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 group=fr.raksrinana
 loader=Fabric
 mod_id=falling_tree
-version=2.3.1
+version=2.3.2
 
 repoName=FallingTree
 name=FallingTree

src/main/java/fr/raksrinana/fallingtree/config/BreakMode.java

@@ -1,5 +1,14 @@
 package fr.raksrinana.fallingtree.config;
 
 public enum BreakMode{
-	INSTANTANEOUS, SHIFT_DOWN
+	INSTANTANEOUS(true), SHIFT_DOWN(false);
+	private final boolean checkLeavesAround;
+
+	BreakMode(boolean checkLeavesAround){
+		this.checkLeavesAround = checkLeavesAround;
+	}
+
+	public boolean shouldCheckLeavesAround(){
+		return this.checkLeavesAround;
+	}
 }

src/main/java/fr/raksrinana/fallingtree/config/TreeConfiguration.java

@@ -33,7 +33,8 @@ public class TreeConfiguration{
 			"INFO: Only in INSTANTANEOUS mode.")
 	@Min(1)
 	public int maxSize = 100;
-	@Comment("The minimum amount of leaves that needs to be around the top most log in order for the mod to consider it a tree.")
+	@Comment("The minimum amount of leaves that needs to be around the top most log in order for the mod to consider it a tree. " +
+			"INFO: Only in INSTANTANEOUS mode.")
 	@Min(0)
 	@Max(5)
 	public int minimumLeavesAroundRequired = 3;

src/main/java/fr/raksrinana/fallingtree/tree/TreeHandler.java

@@ -34,12 +34,16 @@ public static Optional<Tree> getTree(World world, BlockPos blockPos){
 			toAnalyzePos.addAll(nearbyPos.stream().filter(pos -> !toAnalyzePos.contains(pos)).collect(Collectors.toList()));
 		}
 
-		int aroundRequired = FallingTree.config.getTreesConfiguration().getMinimumLeavesAroundRequired();
-		if(tree.getTopMostLog().map(topLog -> getLeavesAround(world, topLog) >= aroundRequired).orElseGet(() -> aroundRequired == 0)){
-			return Optional.of(tree);
+		if(FallingTree.config.getTreesConfiguration().getBreakMode().shouldCheckLeavesAround()){
+			int aroundRequired = FallingTree.config.getTreesConfiguration().getMinimumLeavesAroundRequired();
+			if(tree.getTopMostLog()
+					.map(topLog -> getLeavesAround(world, topLog) < aroundRequired)
+					.orElse(true)){
+				return Optional.empty();
+			}
 		}
 
-		return Optional.empty();
+		return Optional.of(tree);
 	}
 
 	private static Collection<BlockPos> neighborLogs(World world, Block logBlock, BlockPos blockPos, Collection<BlockPos> analyzedPos){