Fix quartz fixtures not being placeable on wall blocks.

AppliedEnergistics · Sep 28, 2022 · ac92184 · ac92184
1 parent 0fb72b0
commit ac92184
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/appeng/block/misc/LightDetectorBlock.java b/src/main/java/appeng/block/misc/LightDetectorBlock.java
@@ -101,10 +101,8 @@ public boolean isValidOrientation(LevelAccessor level, BlockPos pos, Direction f
         return this.canPlaceAt(level, pos, up.getOpposite());
     }
 
-    private boolean canPlaceAt(BlockGetter level, BlockPos pos, Direction dir) {
-        final BlockPos test = pos.relative(dir);
-        BlockState blockstate = level.getBlockState(test);
-        return blockstate.isFaceSturdy(level, test, dir.getOpposite());
+    private boolean canPlaceAt(LevelReader level, BlockPos pos, Direction dir) {
+        return canSupportCenter(level, pos.relative(dir), dir.getOpposite());
     }
 
     @Override

diff --git a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java
@@ -147,9 +147,7 @@ public boolean isValidOrientation(LevelAccessor level, BlockPos pos, Direction f
     }
 
     private boolean canPlaceAt(LevelReader level, BlockPos pos, Direction dir) {
-        final BlockPos test = pos.relative(dir);
-        BlockState blockstate = level.getBlockState(test);
-        return blockstate.isFaceSturdy(level, test, dir.getOpposite());
+        return canSupportCenter(level, pos.relative(dir), dir.getOpposite());
     }
 
     @Override

diff --git a/src/main/java/appeng/datagen/providers/tags/BlockTagsProvider.java b/src/main/java/appeng/datagen/providers/tags/BlockTagsProvider.java
@@ -105,6 +105,9 @@ protected void addTags() {
                 AEBlocks.CHISELED_QUARTZ_WALL.block(),
                 AEBlocks.QUARTZ_PILLAR_WALL.block());
 
+        // Fixtures should cause walls to have posts
+        tag(BlockTags.WALL_POST_OVERRIDE).add(AEBlocks.QUARTZ_FIXTURE.block(), AEBlocks.LIGHT_DETECTOR.block());
+
         addEffectiveTools();
 
         addConventionTags();