Changed sentinel value for invisible platforms to Barrier block

VazkiiMods · May 3, 2024 · cd548b5 · cd548b5
1 parent bbb022b
commit cd548b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/Fabric/src/main/java/vazkii/botania/fabric/client/FabricPlatformModel.java b/Fabric/src/main/java/vazkii/botania/fabric/client/FabricPlatformModel.java
@@ -15,10 +15,8 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 
-import vazkii.botania.common.block.BotaniaBlocks;
 import vazkii.botania.common.block.PlatformBlock;
 import vazkii.botania.common.block.block_entity.PlatformBlockEntity;
 

diff --git a/Forge/src/main/java/vazkii/botania/forge/client/ForgePlatformModel.java b/Forge/src/main/java/vazkii/botania/forge/client/ForgePlatformModel.java
@@ -8,7 +8,6 @@
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.client.model.BakedModelWrapper;
 import net.minecraftforge.client.model.data.ModelData;
@@ -17,11 +16,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import vazkii.botania.common.block.BotaniaBlocks;
 import vazkii.botania.common.block.PlatformBlock;
 import vazkii.botania.common.block.block_entity.PlatformBlockEntity;
 
-import java.util.Collections;
 import java.util.List;
 
 public class ForgePlatformModel extends BakedModelWrapper<BakedModel> {

diff --git a/Xplat/src/main/java/vazkii/botania/common/block/PlatformBlock.java b/Xplat/src/main/java/vazkii/botania/common/block/PlatformBlock.java
@@ -11,7 +11,6 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.stats.Stats;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
@@ -81,7 +80,7 @@ public Variant getVariant() {
 	@Override
 	public VoxelShape getShape(@NotNull BlockState state, @NotNull BlockGetter world, @NotNull BlockPos pos, @NotNull CollisionContext context) {
 		BlockEntity te = world.getBlockEntity(pos);
-		if (te instanceof PlatformBlockEntity platform && platform.getCamoState() != null && !platform.getCamoState().isAir()) {
+		if (te instanceof PlatformBlockEntity platform && platform.getCamoState() != null) {
 			return platform.getCamoState().getShape(world, pos);
 		} else {
 			return super.getShape(state, world, pos, context);
@@ -158,12 +157,11 @@ public InteractionResult use(BlockState state, Level world, BlockPos pos, Player
 
 				return InteractionResult.sidedSuccess(world.isClientSide());
 			}
-		}
-		else if (!currentStack.isEmpty()
+		} else if (!currentStack.isEmpty()
 				&& currentStack.is(BotaniaItems.phantomInk)
-				&& tile instanceof PlatformBlockEntity camo ) {
+				&& tile instanceof PlatformBlockEntity camo) {
 			if (!world.isClientSide) {
-				camo.setCamoState(Blocks.AIR.defaultBlockState());  //Air is being used as a sentinel value here
+				camo.setCamoState(Blocks.BARRIER.defaultBlockState()); //Barrier block is being used as a sentinel value here
 			}
 
 			return InteractionResult.sidedSuccess(world.isClientSide());