Return null if state for placement is null

copycats-plus · Jul 26, 2024 · 72241c0 · 72241c0
1 parent 3c42286
commit 72241c0
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/beam/CopycatBeamBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/beam/CopycatBeamBlock.java
@@ -115,7 +115,7 @@ public boolean isPathfindable(@NotNull BlockState pState, @NotNull BlockGetter p
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         Axis axis = context.getNearestLookingDirection().getAxis();
         return stateForPlacement.setValue(AXIS, axis);
     }

diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/board/CopycatBoardBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/board/CopycatBoardBlock.java
@@ -178,7 +178,7 @@ private static VoxelShape calculateMultifaceShape(BlockState pState) {
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         if (state.is(this)) {

diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/bytes/CopycatByteBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/bytes/CopycatByteBlock.java
@@ -183,7 +183,7 @@ public boolean isPathfindable(BlockState pState, BlockGetter pLevel, BlockPos pP
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         Vec3 bias = Vec3.atLowerCornerOf(context.getClickedFace().getNormal()).scale(1 / 16f);

diff --git a/...main/java/com/copycatsplus/copycats/content/copycat/half_layer/CopycatHalfLayerBlock.java b/...main/java/com/copycatsplus/copycats/content/copycat/half_layer/CopycatHalfLayerBlock.java
@@ -129,7 +129,7 @@ public Vec3i getVectorFromProperty(BlockState state, String property) {
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         if (state.is(this)) {

diff --git a/...main/java/com/copycatsplus/copycats/content/copycat/half_panel/CopycatHalfPanelBlock.java b/...main/java/com/copycatsplus/copycats/content/copycat/half_panel/CopycatHalfPanelBlock.java
@@ -131,7 +131,7 @@ public boolean isPathfindable(@NotNull BlockState pState, @NotNull BlockGetter p
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
 
         Direction facing = context.getClickedFace().getOpposite();
         double offset1, offset2;

diff --git a/...on/src/main/java/com/copycatsplus/copycats/content/copycat/ladder/CopycatLadderBlock.java b/...on/src/main/java/com/copycatsplus/copycats/content/copycat/ladder/CopycatLadderBlock.java
@@ -66,7 +66,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
     @Override
     public BlockState getStateForPlacement(@NotNull BlockPlaceContext pContext) {
         BlockState stateForPlacement = super.getStateForPlacement(pContext);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         return stateForPlacement.setValue(FACING, pContext.getHorizontalDirection().getOpposite());
     }
 

diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/layer/CopycatLayerBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/layer/CopycatLayerBlock.java
@@ -61,7 +61,7 @@ public boolean isIgnoredConnectivitySide(BlockAndTintGetter reader, BlockState s
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         if (state.is(this)) {

diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/slab/CopycatSlabBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/slab/CopycatSlabBlock.java
@@ -194,7 +194,7 @@ public boolean canConnectTexturesToward(String property, BlockAndTintGetter read
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         if (state.is(this)) {

diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/slice/CopycatSliceBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/slice/CopycatSliceBlock.java
@@ -113,7 +113,7 @@ public boolean isPathfindable(BlockState pState, BlockGetter pLevel, BlockPos pP
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         if (state.is(this)) {

diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/slope/CopycatSlopeBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/slope/CopycatSlopeBlock.java
@@ -137,7 +137,7 @@ public boolean isPathfindable(@NotNull BlockState pState, @NotNull BlockGetter p
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         Direction facing = context.getHorizontalDirection();
         Half half = context.getClickedFace() == Direction.DOWN
                 ? Half.TOP

diff --git a/...in/java/com/copycatsplus/copycats/content/copycat/slope_layer/CopycatSlopeLayerBlock.java b/...in/java/com/copycatsplus/copycats/content/copycat/slope_layer/CopycatSlopeLayerBlock.java
@@ -62,7 +62,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         if (state.is(this)) {

diff --git a/...a/com/copycatsplus/copycats/content/copycat/vertical_slice/CopycatVerticalSliceBlock.java b/...a/com/copycatsplus/copycats/content/copycat/vertical_slice/CopycatVerticalSliceBlock.java
@@ -132,7 +132,7 @@ public boolean isPathfindable(@NotNull BlockState pState, @NotNull BlockGetter p
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
         BlockPos blockPos = context.getClickedPos();
         BlockState state = context.getLevel().getBlockState(blockPos);
         if (state.is(this)) {

diff --git a/...a/com/copycatsplus/copycats/content/copycat/vertical_slope/CopycatVerticalSlopeBlock.java b/...a/com/copycatsplus/copycats/content/copycat/vertical_slope/CopycatVerticalSlopeBlock.java
@@ -170,7 +170,7 @@ public boolean isPathfindable(@NotNull BlockState pState, @NotNull BlockGetter p
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
 
         int xOffset = context.getClickLocation().x - context.getClickedPos().getX() > 0.5 ? 1 : -1;
         int zOffset = context.getClickLocation().z - context.getClickedPos().getZ() > 0.5 ? 1 : -1;

diff --git a/...ava/com/copycatsplus/copycats/content/copycat/vertical_step/CopycatVerticalStepBlock.java b/...ava/com/copycatsplus/copycats/content/copycat/vertical_step/CopycatVerticalStepBlock.java
@@ -137,7 +137,7 @@ public boolean isPathfindable(@NotNull BlockState pState, @NotNull BlockGetter p
     @Override
     public BlockState getStateForPlacement(BlockPlaceContext context) {
         BlockState stateForPlacement = super.getStateForPlacement(context);
-        assert stateForPlacement != null;
+        if (stateForPlacement == null) return null;
 
         int xOffset = context.getClickLocation().x - context.getClickedPos().getX() > 0.5 ? 1 : -1;
         int zOffset = context.getClickLocation().z - context.getClickedPos().getZ() > 0.5 ? 1 : -1;