Update blockstate property to IEProperties.OPEN

- IEProperties.ACTIVE was used before - New property better describes state
BluSunrize · Jun 22, 2024 · 12bcdcd · 12bcdcd
1 parent beebaa0
commit 12bcdcd
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 41 deletions.
diff --git a/src/api/java/blusunrize/immersiveengineering/api/IEProperties.java b/src/api/java/blusunrize/immersiveengineering/api/IEProperties.java
@@ -34,6 +34,7 @@ public class IEProperties
 
 	public static final BooleanProperty MULTIBLOCKSLAVE = BooleanProperty.create("multiblockslave");
 	public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
+	public static final BooleanProperty OPEN = BooleanProperty.create("open");
 	public static final BooleanProperty MIRRORED = BooleanProperty.create("mirrored");
 
 	public static final BooleanProperty UP = BooleanProperty.create("up");

diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/blockstates/BlockStates.java b/src/datagen/java/blusunrize/immersiveengineering/data/blockstates/BlockStates.java
@@ -716,11 +716,11 @@ private void createLadderBlock(Supplier<? extends Block> b, ModelFile model, Mod
 		{
 			builder.partialState()
 					.with(IEProperties.FACING_HORIZONTAL, d)
-					.with(IEProperties.ACTIVE, false)
+					.with(IEProperties.OPEN, false)
 					.setModels(new ConfiguredModel(model, 0, getAngle(d, 180), true));
 			builder.partialState()
 					.with(IEProperties.FACING_HORIZONTAL, d)
-					.with(IEProperties.ACTIVE, true)
+					.with(IEProperties.OPEN, true)
 					.setModels(new ConfiguredModel(modelOpen, 0, getAngle(d, 180), false));
 		}
 	}

diff --git a/src/generated/resources/.cache/619000d5325dea258e481d2612f9a5c790da2123 b/src/generated/resources/.cache/619000d5325dea258e481d2612f9a5c790da2123
diff --git a/src/generated/resources/assets/immersiveengineering/blockstates/metal_ladder_alu.json b/src/generated/resources/assets/immersiveengineering/blockstates/metal_ladder_alu.json
diff --git a/src/generated/resources/assets/immersiveengineering/blockstates/metal_ladder_steel.json b/src/generated/resources/assets/immersiveengineering/blockstates/metal_ladder_steel.json
diff --git a/src/main/java/blusunrize/immersiveengineering/common/blocks/metal/MetalLadderBlock.java b/src/main/java/blusunrize/immersiveengineering/common/blocks/metal/MetalLadderBlock.java
@@ -94,7 +94,7 @@ public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, Co
 		else
 		{
 			Direction ladderSide = state.getValue(LadderBlock.FACING);
-			return state.getValue(IEProperties.ACTIVE) ? Shapes.joinUnoptimized(base, FRAMES_OPEN.get(ladderSide), BooleanOp.OR) : Shapes.joinUnoptimized(base, FRAMES.get(ladderSide), BooleanOp.OR);
+			return state.getValue(IEProperties.OPEN) ? Shapes.joinUnoptimized(base, FRAMES_OPEN.get(ladderSide), BooleanOp.OR) : Shapes.joinUnoptimized(base, FRAMES.get(ladderSide), BooleanOp.OR);
 		}
 	}
 
@@ -104,7 +104,7 @@ public BlockState getStateForPlacement(BlockPlaceContext ctx)
 	{
 		BlockState baseState = super.getStateForPlacement(ctx);
 		if(baseState==null) return baseState;
-		baseState = baseState.setValue(IEProperties.ACTIVE, false);
+		baseState = baseState.setValue(IEProperties.OPEN, false);
 		if(type==CoverType.NONE)
 			return baseState;
 		else
@@ -122,7 +122,7 @@ public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos)
 
 	@Override
 	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> state) {
-		state.add(FACING, WATERLOGGED, IEProperties.ACTIVE);
+		state.add(FACING, WATERLOGGED, IEProperties.OPEN);
 	}
 
 	@Override
@@ -131,7 +131,7 @@ public InteractionResult useHammer(BlockState state, Level world, BlockPos pos,
 		if (player==null) return InteractionResult.FAIL;
 		if(type!=CoverType.NONE&&player.isShiftKeyDown())
 		{
-			boolean b = world.setBlockAndUpdate(pos, state.setValue(IEProperties.ACTIVE, !state.getValue(IEProperties.ACTIVE)));
+			boolean b = world.setBlockAndUpdate(pos, state.setValue(IEProperties.OPEN, !state.getValue(IEProperties.OPEN)));
 			if(b)
 				return InteractionResult.SUCCESS;
 			else