Fix CustomLeavesBlock

MModding · Jan 20, 2025 · 6c49ca8 · 6c49ca8
1 parent 3091f2b
commit 6c49ca8
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/blocks/CustomLeavesBlock.java b/src/main/java/com/mmodding/mmodding_lib/library/blocks/CustomLeavesBlock.java
@@ -62,8 +62,12 @@ protected boolean isLogValid(BlockState state) {
 		return state.isIn(BlockTags.LOGS);
 	}
 
-	protected boolean hasSeparatedLeaves() {
-		return false;
+	protected boolean areLeavesValid(BlockState state) {
+		return state.isOf(this);
+	}
+
+	protected boolean areLeavesConnected() {
+		return true;
 	}
 
 	@Override
@@ -99,7 +103,7 @@ private BlockState updateDistanceFromLogs(BlockState state, WorldAccess world, B
 		int distance = this.getMaxDistance();
 		BlockPos.Mutable mutable = new BlockPos.Mutable();
 
-		if (this.hasSeparatedLeaves()) {
+		if (!this.areLeavesConnected()) {
 			for (int i = -1; i <= 1; i++) {
 				for (int j = -1; j <= 1; j++) {
 					for (int k = -1; k <= 1; k++) {
@@ -129,7 +133,7 @@ private int getDistanceFromLog(BlockState state) {
 		if (this.isLogValid(state)) {
 			return 0;
 		}
-		else if (state.isOf(this)) {
+		else if (this.areLeavesValid(state)) {
 			return state.get(this.getDistanceProperty());
 		}
 		else {
@@ -150,7 +154,7 @@ public BlockState getPlacementState(ItemPlacementContext ctx) {
 			.getFluidState(ctx.getBlockPos());
 
 		BlockState blockState = this.getDefaultState()
-			.with(CustomLeavesBlock.PERSISTENT, false)
+			.with(CustomLeavesBlock.PERSISTENT, true)
 			.with(CustomLeavesBlock.WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
 
 		return this.updateDistanceFromLogs(blockState, ctx.getWorld(), ctx.getBlockPos());