Merge pull request #13 from Nyphet/1.18.2/dev

1.18.2/dev
Crystal-Spider · Jul 11, 2022 · 4b55836 · 4b55836
2 parents 4f9769f + 575fc14
commit 4b55836
Show file tree

Hide file tree

Showing 7 changed files with 619 additions and 315 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Forge Semantic Versioning](https://mcforge.readthed
 - Fixed tinted glass light down propagation.
 - Fixed a combining bug that would prevent vertical slabs facing north from creating certain angles when side by side with double vertical slabs.
 - Fixed tint of grass vertical slabs particles.
+- Improved double vertical slabs.
 
 ## [1.18.2-3.2.0.0-beta1] - 2022/06/04
 - Added double vertical slabs.

diff --git a/forge/src/main/java/crystalspider/justverticalslabs/JustVerticalSlabsLoader.java b/forge/src/main/java/crystalspider/justverticalslabs/JustVerticalSlabsLoader.java
@@ -1,9 +1,9 @@
 package crystalspider.justverticalslabs;
 
-import com.mojang.logging.LogUtils;
-
 import org.slf4j.Logger;
 
+import com.mojang.logging.LogUtils;
+
 import crystalspider.justverticalslabs.blocks.CutoutVerticalSlabBlock;
 import crystalspider.justverticalslabs.blocks.TranslucentVerticalSlabBlock;
 import crystalspider.justverticalslabs.blocks.VerticalSlabBlock;

diff --git a/forge/src/main/java/crystalspider/justverticalslabs/blocks/CutoutVerticalSlabBlock.java b/forge/src/main/java/crystalspider/justverticalslabs/blocks/CutoutVerticalSlabBlock.java
@@ -1,6 +1,5 @@
 package crystalspider.justverticalslabs.blocks;
 
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 
 /**
@@ -10,9 +9,4 @@ public class CutoutVerticalSlabBlock extends VerticalSlabBlock {
   public CutoutVerticalSlabBlock() {
     super(Material.WOOD);
   }
-
-  @Override
-  public boolean useShapeForLightOcclusion(BlockState state) {
-    return true;
-  }
 }
diff --git a/forge/src/main/java/crystalspider/justverticalslabs/blocks/TranslucentVerticalSlabBlock.java b/forge/src/main/java/crystalspider/justverticalslabs/blocks/TranslucentVerticalSlabBlock.java
@@ -36,14 +36,14 @@ public VoxelShape getOcclusionShape(BlockState state, BlockGetter getter, BlockP
 
   @Override
   public boolean useShapeForLightOcclusion(BlockState state) {
-    return state.getValue(OCCLUSION);
+    return state.getValue(OCCLUSION) && super.useShapeForLightOcclusion(state);
   }
 
   @Override
   public boolean propagatesSkylightDown(BlockState state, BlockGetter getter, BlockPos pos) {
     BlockState referredBlockState = VerticalSlabUtils.getReferredBlockState(getter, pos);
     if (referredBlockState != null) {
-      return getReferredProperty(referredBlockState::propagatesSkylightDown, () -> true, getter, pos);
+      return Behaviour.getReferredProperty(referredBlockState::propagatesSkylightDown, () -> true, getter, pos);
     }
     return true;
   }
@@ -54,9 +54,9 @@ public float getShadeBrightness(BlockState state, BlockGetter getter, BlockPos p
     if (referredSlabState != null) {
       BlockState referredBlockState = VerticalSlabUtils.getReferredBlockState(referredSlabState);
       if (referredBlockState != null) {
-        return getReferredProperty(referredBlockState::getShadeBrightness, () -> 1.0F, getter, pos);
+        return Behaviour.getReferredProperty(referredBlockState::getShadeBrightness, () -> 1.0F, getter, pos);
       }
-      return getReferredProperty(referredSlabState::getShadeBrightness, () -> 1.0F, getter, pos);
+      return Behaviour.getReferredProperty(referredSlabState::getShadeBrightness, () -> 1.0F, getter, pos);
     }
     return 1.0F;
   }
@@ -67,10 +67,10 @@ public int getLightBlock(BlockState state, BlockGetter getter, BlockPos pos) {
     BlockState referredSlabState = VerticalSlabUtils.getReferredSlabState(getter, pos);
     BlockState referredBlockState = VerticalSlabUtils.getReferredBlockState(referredSlabState);
     if (referredBlockState != null) {
-      return getReferredProperty(referredBlockState::getLightBlock, () -> super.getLightBlock(state, getter, pos), getter, pos);
+      return Behaviour.getReferredProperty(referredBlockState::getLightBlock, () -> super.getLightBlock(state, getter, pos), getter, pos);
     } else {
       if (referredSlabState != null) {
-        return getReferredProperty(referredSlabState::getLightBlock, () -> super.getLightBlock(state, getter, pos), getter, pos);
+        return Behaviour.getReferredProperty(referredSlabState::getLightBlock, () -> super.getLightBlock(state, getter, pos), getter, pos);
       }
     }
     return super.getLightBlock(state, getter, pos);