remove some unspecific block properties

Author: Bixilon

src/integration-test/kotlin/de/bixilon/minosoft/data/registries/blocks/factory/VerifyIntegratedBlockRegistry.kt

@@ -28,6 +28,7 @@ import de.bixilon.minosoft.data.registries.blocks.types.Block
 import de.bixilon.minosoft.data.registries.blocks.types.building.FenceBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.end.EndStoneBrick
 import de.bixilon.minosoft.data.registries.blocks.types.building.nether.SoulSand
+import de.bixilon.minosoft.data.registries.blocks.types.building.plants.DoublePlant
 import de.bixilon.minosoft.data.registries.blocks.types.building.plants.FernBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.plants.FlowerBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.snow.SnowLayerBlock
@@ -126,6 +127,9 @@ object VerifyIntegratedBlockRegistry {
             flags -= BlockStateFlags.FULL_COLLISION
             flags -= BlockStateFlags.FULL_OUTLINE
         }
+        if (block is DoublePlant) {
+            flags -= BlockStateFlags.OFFSET
+        }
 
         return flags
     }
@@ -233,7 +237,7 @@ object VerifyIntegratedBlockRegistry {
             fake.setParent(registries)
             SHAPES[fake] = registries.shape
 
-            val states = FlattenedBlockStateCodec.deserialize(parsed, BlockStateFlags.of(parsed), value, version, fake)
+            val states = FlattenedBlockStateCodec.deserialize(parsed, integrated.properties, BlockStateFlags.of(parsed), value, version, fake)
 
             Block.STATES[parsed] = states
 

src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/BlockProperties.kt

@@ -35,9 +35,7 @@ object BlockProperties {
     val INVERTED = BooleanProperty("inverted").register()
     val LIT = BooleanProperty("lit").register()
     val WATERLOGGED = BooleanProperty("waterlogged").register()
-    val STAIR_DIRECTIONAL = EnumProperty("shape", Shapes).register()
     val SLAB_HALF = EnumProperty("half", Halves).register()
-    val STAIR_HALF = EnumProperty("half", Halves, Halves.set(Halves.UPPER, Halves.LOWER))
     val SLAB_TYPE = SlabBlock.TYPE.register()
     val FLUID_LEVEL = FluidBlock.LEVEL.register()
     val MOISTURE_LEVEL = IntProperty("moisture").register()

src/main/java/de/bixilon/minosoft/data/registries/blocks/properties/Shapes.kt

@@ -17,21 +17,7 @@ import de.bixilon.kutil.enums.EnumUtil
 import de.bixilon.kutil.enums.ValuesEnum
 
 enum class Shapes {
-    @Deprecated("stairs")
     STRAIGHT,
-
-    @Deprecated("stairs")
-    INNER_LEFT,
-
-    @Deprecated("stairs")
-    INNER_RIGHT,
-
-    @Deprecated("stairs")
-    OUTER_LEFT,
-
-    @Deprecated("stairs")
-    OUTER_RIGHT,
-
     NORTH_SOUTH,
     SOUTH_EAST,
     SOUTH_WEST,

src/main/java/de/bixilon/minosoft/data/registries/blocks/registry/BlockRegistry.kt

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2025 Moritz Zwerger
+ * Copyright (C) 2020-2026 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -50,7 +50,7 @@ class BlockRegistry(
         val flags = block.flags
 
         val manager = when {
-            flattened -> FlattenedBlockStateCodec.deserialize(block, flags, data, version, registries)
+            flattened -> FlattenedBlockStateCodec.deserialize(block, block.properties, flags, data, version, registries)
             else -> LegacyBlockStateCodec.deserialize(block, flags, data, version, registries)
         }
 

src/main/java/de/bixilon/minosoft/data/registries/blocks/registry/codec/FlattenedBlockStateCodec.kt

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2025 Moritz Zwerger
+ * Copyright (C) 2020-2026 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -19,6 +19,7 @@ import de.bixilon.kutil.enums.inline.IntInlineSet
 import de.bixilon.kutil.json.JsonObject
 import de.bixilon.kutil.primitive.IntUtil.toInt
 import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperty
+import de.bixilon.minosoft.data.registries.blocks.properties.list.BlockPropertyList
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
 import de.bixilon.minosoft.data.registries.blocks.state.builder.BlockStateBuilder
 import de.bixilon.minosoft.data.registries.blocks.state.manager.BlockStateManager
@@ -31,13 +32,13 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
 
 object FlattenedBlockStateCodec {
 
-    fun deserialize(block: Block, flags: IntInlineSet, data: JsonObject, version: Version, registries: Registries): BlockStateManager {
+    fun deserialize(block: Block, propertyList: BlockPropertyList, flags: IntInlineSet, data: JsonObject, version: Version, registries: Registries): BlockStateManager {
         val properties: MutableMap<BlockProperty<*>, MutableSet<Any>> = mutableMapOf()
 
         val states: MutableSet<BlockState> = ObjectOpenHashSet()
 
         for ((stateId, stateJson) in data["states"].asAnyMap()) {
-            val settings = BlockStateBuilder.of(block, flags, registries, stateJson.unsafeCast())
+            val settings = BlockStateBuilder.of(block, propertyList, flags, registries, stateJson.unsafeCast())
             val state = block.buildState(version, settings)
 
             states += state

src/main/java/de/bixilon/minosoft/data/registries/blocks/registry/codec/LegacyBlockStateCodec.kt

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2025 Moritz Zwerger
+ * Copyright (C) 2020-2026 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -39,7 +39,7 @@ object LegacyBlockStateCodec {
         if (statesData == null) {
             // block has only a single state
             if (id == null) throw IllegalArgumentException("Missing id (block=$block)!")
-            val settings = BlockStateBuilder.of(block, flags, registries, data)
+            val settings = BlockStateBuilder.of(block, block.properties, flags, registries, data)
             val state = block.buildState(version, settings)
             registries.blockState[id, meta] = state
 
@@ -51,7 +51,7 @@ object LegacyBlockStateCodec {
 
         val states: MutableSet<BlockState> = ObjectOpenHashSet(statesData.size)
         for (stateJson in statesData) {
-            val settings = BlockStateBuilder.of(block, flags, registries, stateJson.unsafeCast())
+            val settings = BlockStateBuilder.of(block, block.properties, flags, registries, stateJson.unsafeCast())
             val state = block.buildState(version, settings)
 
             states += state

src/main/java/de/bixilon/minosoft/data/registries/blocks/state/builder/BlockStateBuilder.kt

@@ -118,9 +118,9 @@ class BlockStateBuilder(
             return lightProperties
         }
 
-        fun of(block: Block, flags: IntInlineSet, registries: Registries, data: JsonObject): BlockStateBuilder {
+        fun of(block: Block, properties: BlockPropertyList, flags: IntInlineSet, registries: Registries, data: JsonObject): BlockStateBuilder {
             val implemented = !(block is PixLyzerBlock || block is LegacyBlock || block is FenceBlock || block is StairsBlock) // TODO: implement missing shapes
-            val properties = data.getProperties(block.properties) ?: emptyMap()
+            val properties = data.getProperties(properties) ?: emptyMap()
             val collisionShape = if (!implemented) data.getCollisionShape(registries.shape) else null
             val outlineShape = if (!implemented) data.getOutlineShape(registries.shape) else null
 

src/main/java/de/bixilon/minosoft/data/registries/blocks/types/building/DoorBlock.kt

@@ -37,6 +37,7 @@ import de.bixilon.minosoft.data.registries.blocks.types.properties.item.BlockWit
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.collision.CollidableBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.outline.OutlinedBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.size.DoubleSizeBlock
+import de.bixilon.minosoft.data.registries.blocks.types.properties.size.DoubleSizeBlock.Companion.HALF
 import de.bixilon.minosoft.data.registries.identified.Namespaces
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
 import de.bixilon.minosoft.data.registries.item.items.Item
@@ -168,7 +169,6 @@ abstract class DoorBlock(identifier: ResourceLocation, settings: BlockSettings)
     }
 
     companion object {
-        val HALF = EnumProperty("half", Halves.Companion, Halves.set(Halves.UPPER, Halves.LOWER))
         val HINGE = EnumProperty("hinge", Sides.Companion)
         val POWERED = BlockProperties.POWERED
         val FACING = BlockProperties.FACING_HORIZONTAL

src/main/java/de/bixilon/minosoft/data/registries/blocks/types/building/plants/DoublePlant.kt

@@ -19,7 +19,6 @@ import de.bixilon.kutil.reflection.ReflectionUtil.forceSet
 import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory
 import de.bixilon.minosoft.data.registries.blocks.light.TransparentProperty
-import de.bixilon.minosoft.data.registries.blocks.properties.EnumProperty
 import de.bixilon.minosoft.data.registries.blocks.properties.Halves
 import de.bixilon.minosoft.data.registries.blocks.properties.list.MapPropertyList
 import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
@@ -34,6 +33,7 @@ import de.bixilon.minosoft.data.registries.blocks.types.properties.offset.Random
 import de.bixilon.minosoft.data.registries.blocks.types.properties.offset.RandomOffsetTypes
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.outline.OutlinedBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.size.DoubleSizeBlock
+import de.bixilon.minosoft.data.registries.blocks.types.properties.size.DoubleSizeBlock.Companion.HALF
 import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
 import de.bixilon.minosoft.data.registries.item.items.Item
@@ -103,10 +103,6 @@ abstract class DoublePlant(identifier: ResourceLocation, settings: BlockSettings
         }
     }
 
-    companion object {
-        val HALF = EnumProperty("half", Halves, Halves.set(Halves.UPPER, Halves.LOWER))
-    }
-
     open class Sunflower(identifier: ResourceLocation = Companion.identifier, settings: BlockSettings) : DoublePlant(identifier, settings) {
 
         companion object : BlockFactory<Sunflower> {

src/main/java/de/bixilon/minosoft/data/registries/blocks/types/properties/size/DoubleSizeBlock.kt

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2025 Moritz Zwerger
+ * Copyright (C) 2020-2026 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.registries.blocks.types.properties.size
 
 import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.entities.block.BlockEntity
-import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties
+import de.bixilon.minosoft.data.registries.blocks.properties.EnumProperty
 import de.bixilon.minosoft.data.registries.blocks.properties.Halves
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
 import de.bixilon.minosoft.data.world.positions.BlockPosition
@@ -24,9 +24,9 @@ import de.bixilon.minosoft.protocol.network.session.play.PlaySession
 interface DoubleSizeBlock : MultiSizeBlock {
 
 
-    fun isTop(state: BlockState, session: PlaySession) = state.properties[BlockProperties.STAIR_HALF] == Halves.UPPER
-    fun getTop(state: BlockState, session: PlaySession): BlockState = state.withProperties(BlockProperties.STAIR_HALF to Halves.UPPER)
-    fun getBottom(state: BlockState, session: PlaySession): BlockState = state.withProperties(BlockProperties.STAIR_HALF to Halves.LOWER)
+    fun isTop(state: BlockState, session: PlaySession) = state[HALF] == Halves.UPPER
+    fun getTop(state: BlockState, session: PlaySession): BlockState = state.withProperties(HALF to Halves.UPPER)
+    fun getBottom(state: BlockState, session: PlaySession): BlockState = state.withProperties(HALF to Halves.LOWER)
 
     override fun onBreak(session: PlaySession, position: BlockPosition, state: BlockState, entity: BlockEntity?) {
         val offset = if (isTop(state, session)) Directions.DOWN else Directions.UP
@@ -42,4 +42,8 @@ interface DoubleSizeBlock : MultiSizeBlock {
 
         session.world[position + offset] = otherState
     }
+
+    companion object {
+        val HALF = EnumProperty("half", Halves, Halves.set(Halves.UPPER, Halves.LOWER))
+    }
 }