all the missing stairs and slabs

Author: Bixilon

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

@@ -26,6 +26,7 @@ import de.bixilon.minosoft.data.registries.blocks.state.BlockStateFlags
 import de.bixilon.minosoft.data.registries.blocks.state.BlockStateFlags.toFlagSet
 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.FernBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.plants.FlowerBlock
@@ -149,6 +150,7 @@ object VerifyIntegratedBlockRegistry {
     }
 
     private fun compareHardness(pixlyzer: Block, integrated: Block) {
+        if (integrated is EndStoneBrick.Stairs) return // TODO: 0.8 vs 3.0
         if (pixlyzer.hardness == integrated.hardness || (pixlyzer.hardness < 0.0f && integrated is UnbreakableBlock)) {
             return
         }
@@ -216,7 +218,7 @@ object VerifyIntegratedBlockRegistry {
                 continue
             }
             val identifier = id.toResourceLocation()
-            val integrated = registries.block[identifier] ?: Broken("Block $id does not exist in the registry?")
+            val integrated = registries.block[identifier] ?: Broken("Block $id does not exist in the registry? Maybe bad factory?")
             if (integrated is PixLyzerBlock) {
                 compareImplemented(identifier, error)
                 // useless to compare

src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt

@@ -44,7 +44,14 @@ import de.bixilon.minosoft.data.registries.blocks.types.building.quartz.SmoothQu
 import de.bixilon.minosoft.data.registries.blocks.types.building.snow.SnowBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.snow.SnowLayerBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.stone.*
+import de.bixilon.minosoft.data.registries.blocks.types.building.stone.blackstone.Blackstone
+import de.bixilon.minosoft.data.registries.blocks.types.building.stone.blackstone.PolishedBlackstone
+import de.bixilon.minosoft.data.registries.blocks.types.building.stone.blackstone.PolishedBlackstoneBrick
+import de.bixilon.minosoft.data.registries.blocks.types.building.stone.deepslate.*
 import de.bixilon.minosoft.data.registries.blocks.types.building.stone.sand.*
+import de.bixilon.minosoft.data.registries.blocks.types.building.stone.tuff.PolishedTuff
+import de.bixilon.minosoft.data.registries.blocks.types.building.stone.tuff.Tuff
+import de.bixilon.minosoft.data.registries.blocks.types.building.stone.tuff.TuffBrick
 import de.bixilon.minosoft.data.registries.blocks.types.climbing.ScaffoldingBlock
 import de.bixilon.minosoft.data.registries.blocks.types.entity.storage.EnderChestBlock
 import de.bixilon.minosoft.data.registries.blocks.types.entity.storage.ShulkerBoxBlock
@@ -72,56 +79,66 @@ object BlockFactories : DefaultFactory<BlockFactory<*>>(
     SmoothStone.Block, SmoothStone.Slab,
     StoneBrick.Block, StoneBrick.Slab, StoneBrick.Stairs,
     Cobblestone.Block, Cobblestone.Slab, Cobblestone.Stairs,
+    MossyCobblestone.Block, MossyCobblestone.Slab, MossyCobblestone.Stairs,
     Granite.Block, Granite.Slab, Granite.Stairs,
     PolishedGranite.Block, PolishedGranite.Slab, PolishedGranite.Stairs,
     Diorite.Block, Diorite.Slab, Diorite.Stairs,
     PolishedDiorite.Block, PolishedDiorite.Slab, PolishedDiorite.Stairs,
     Andesite.Block, Andesite.Slab, Andesite.Stairs,
     PolishedAndesite.Block, PolishedAndesite.Slab, PolishedAndesite.Stairs,
-    Tuff.Block, Tuff.Slab,
-    Deepslate.Block, Deepslate.Cobbled, Deepslate.Slab,
+    Tuff.Block, Tuff.Slab, Tuff.Stairs,
+    TuffBrick.Block, TuffBrick.Slab, TuffBrick.Stairs,
+    PolishedTuff.Block, PolishedTuff.Slab, PolishedTuff.Stairs,
+    Deepslate.Block,
+    CobbledDeepslate.Block, CobbledDeepslate.Slab, CobbledDeepslate.Stairs,
+    PolishedDeepslate.Block, PolishedDeepslate.Slab, PolishedDeepslate.Stairs,
+    DeepslateBricks.Block, DeepslateBricks.Slab, DeepslateBricks.Stairs,
+    DeepslateTile.Block, DeepslateTile.Slab, DeepslateTile.Stairs,
+
+    Blackstone.Block, Blackstone.Slab, Blackstone.Stairs,
+    PolishedBlackstone.Block, PolishedBlackstone.Slab, PolishedBlackstone.Stairs,
+    PolishedBlackstoneBrick.Block, PolishedBlackstoneBrick.Slab, PolishedBlackstoneBrick.Stairs,
 
     Dripstone.Block,
 
     Gravel,
 
-    Sandstone.Block, Sandstone.Slab,
+    Sandstone.Block, Sandstone.Slab, Sandstone.Stairs,
     CutSandstone.Block, CutSandstone.Slab,
-    SmoothSandstone.Block, SmoothSandstone.Slab,
-    RedSandstone.Block, RedSandstone.Slab,
+    SmoothSandstone.Block, SmoothSandstone.Slab, SmoothSandstone.Stairs,
+    RedSandstone.Block, RedSandstone.Slab, RedSandstone.Stairs,
     CutRedSandstone.Block, CutRedSandstone.Slab,
-    SmoothRedSandstone.Block, SmoothRedSandstone.Slab,
+    SmoothRedSandstone.Block, SmoothRedSandstone.Slab, SmoothRedSandstone.Stairs,
 
-    QuartzBlock.Block, QuartzBlock.Slab,
-    SmoothQuartz.Block, SmoothQuartz.Slab,
+    QuartzBlock.Block, QuartzBlock.Slab, QuartzBlock.Stairs,
+    SmoothQuartz.Block, SmoothQuartz.Slab, SmoothQuartz.Stairs,
 
-    Brick.Block, Brick.Slab,
-    NetherBrick.Block, NetherBrick.Slab,
-    MudBrick.Block, MudBrick.Slab,
-    MossyStoneBrick.Block, MossyStoneBrick.Slab,
-    MossyCobblestone.Block, MossyCobblestone.Slab,
-    RedNetherBrick.Block, RedNetherBrick.Slab,
+    Brick.Block, Brick.Slab, Brick.Stairs,
+    NetherBrick.Block, NetherBrick.Slab, NetherBrick.Fence, NetherBrick.Stairs,
+    MudBrick.Block, MudBrick.Slab, MudBrick.Stairs,
+    MossyStoneBrick.Block, MossyStoneBrick.Slab, MossyStoneBrick.Stairs,
+    RedNetherBrick.Block, RedNetherBrick.Slab, RedNetherBrick.Stairs,
 
 
-    Prismarine.Block, Prismarine.Slab,
-    PrismarineBrick.Block, PrismarineBrick.Slab,
-    DarkPrismarine.Block, DarkPrismarine.Slab,
+    Prismarine.Block, Prismarine.Slab, Prismarine.Stairs,
+    PrismarineBrick.Block, PrismarineBrick.Slab, PrismarineBrick.Stairs,
+    DarkPrismarine.Block, DarkPrismarine.Slab, DarkPrismarine.Stairs,
 
-    EndStoneBrick.Block, EndStoneBrick.Slab,
-    Purpur.Block, Purpur.Slab,
+    EndStoneBrick.Block, EndStoneBrick.Slab, EndStoneBrick.Stairs,
+    Purpur.Block, Purpur.Slab, Purpur.Stairs,
 
 
     OxidizedCopper.Block, OxidizedCopper.Slab,
-    OxidizedCutCopper.Block, OxidizedCutCopper.Slab,
-    WaxedOxidizedCutCopper.Block, WaxedOxidizedCutCopper.Slab,
+    OxidizedCutCopper.Block, OxidizedCutCopper.Slab, OxidizedCutCopper.Stairs,
+    WaxedOxidizedCutCopper.Block, WaxedOxidizedCutCopper.Slab, WaxedOxidizedCutCopper.Stairs,
     WeatheredCopper.Block, WeatheredCopper.Slab,
-    WeatheredCutCopper.Block, WeatheredCutCopper.Slab,
-    WaxedWeatheredCutCopper.Block, WaxedWeatheredCutCopper.Slab,
+    WeatheredCutCopper.Block, WeatheredCutCopper.Slab, WeatheredCutCopper.Stairs,
+    WaxedWeatheredCutCopper.Block, WaxedWeatheredCutCopper.Slab, WaxedWeatheredCutCopper.Stairs,
     ExposedCopper.Block, ExposedCopper.Slab,
-    ExposedCutCopper.Block, ExposedCutCopper.Slab,
-    WaxedExposedCutCopper.Block, WaxedExposedCutCopper.Slab,
-    CutCopper.Block, CutCopper.Slab,
-    WaxedCutCopper.Block, WaxedCutCopper.Slab,
+    ExposedCutCopper.Block, ExposedCutCopper.Slab, ExposedCutCopper.Stairs,
+    WaxedExposedCutCopper.Block, WaxedExposedCutCopper.Slab, WaxedExposedCutCopper.Stairs,
+    CutCopper.Block, CutCopper.Slab, CutCopper.Stairs,
+    WaxedCutCopper.Block, WaxedCutCopper.Slab, WaxedCutCopper.Stairs,
 
     Dirt,
     GrassBlock,
@@ -141,7 +158,7 @@ object BlockFactories : DefaultFactory<BlockFactory<*>>(
 
     DoorBlock.IronDoor,
 
-    Oak.Leaves, Oak.Door, Oak.Slab, Oak.Planks, Oak.Fence, Oak.Stairs,
+    Oak.Leaves, Oak.Door, Oak.PetrifiedSlab, Oak.Slab, Oak.Planks, Oak.Fence, Oak.Stairs,
     Spruce.Leaves, Spruce.Door, Spruce.Slab, Spruce.Planks, Spruce.Fence, Spruce.Stairs,
     Birch.Leaves, Birch.Door, Birch.Slab, Birch.Planks, Birch.Fence, Birch.Stairs,
     Jungle.Leaves, Jungle.Door, Jungle.Slab, Jungle.Planks, Jungle.Fence, Jungle.Stairs,

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

@@ -28,6 +28,9 @@ import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.collisi
 import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.outline.OutlinedBlock
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
 import de.bixilon.minosoft.data.registries.item.items.Item
+import de.bixilon.minosoft.data.registries.item.items.tool.axe.AxeRequirement
+import de.bixilon.minosoft.data.registries.item.items.tool.pickaxe.PickaxeRequirement
+import de.bixilon.minosoft.data.registries.item.items.tool.properties.requirement.HandBreakable
 import de.bixilon.minosoft.data.registries.shapes.aabb.AABB
 import de.bixilon.minosoft.data.text.formatting.color.RGBArray
 import de.bixilon.minosoft.data.world.positions.BlockPosition
@@ -76,7 +79,7 @@ abstract class FenceBlock(identifier: ResourceLocation, settings: BlockSettings)
     }
 
 
-    class FenceRenderer(
+    private class FenceRenderer(
         val none: BlockRender?,
         val sides: Array<BlockRender?>,
     ) : NeighbourBlockRender {
@@ -100,6 +103,14 @@ abstract class FenceBlock(identifier: ResourceLocation, settings: BlockSettings)
         }
     }
 
+    abstract class Wooden(identifier: ResourceLocation, settings: BlockSettings) : FenceBlock(identifier, settings), HandBreakable, AxeRequirement {
+        override val hardness get() = 2.0f
+    }
+
+    abstract class Stone(identifier: ResourceLocation, settings: BlockSettings) : FenceBlock(identifier, settings), PickaxeRequirement {
+        override val hardness get() = 1.5f
+    }
+
 
     companion object {
         val NORTH = BooleanProperty("north")

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

@@ -115,11 +115,11 @@ abstract class SlabBlock(identifier: ResourceLocation, settings: BlockSettings)
         }
     }
 
-    abstract class WoodSlab(identifier: ResourceLocation, settings: BlockSettings) : SlabBlock(identifier, settings), AxeRequirement, HandBreakable {
+    abstract class Wooden(identifier: ResourceLocation, settings: BlockSettings) : SlabBlock(identifier, settings), AxeRequirement, HandBreakable {
         override val hardness get() = 2.0f
     }
 
-    abstract class AbstractStoneSlab(identifier: ResourceLocation, settings: BlockSettings) : SlabBlock(identifier, settings), PickaxeRequirement
+    abstract class Stone(identifier: ResourceLocation, settings: BlockSettings) : SlabBlock(identifier, settings), PickaxeRequirement
 
 
     /*

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

@@ -111,7 +111,7 @@ abstract class StairsBlock(identifier: ResourceLocation, settings: BlockSettings
         return shape
     }
 
-    inner class StairsRenderer(
+    private inner class StairsRenderer(
         val models: Array<BlockRender?>,
     ) : NeighbourBlockRender {
         override val default: BlockRender? get() = models[Shapes.STRAIGHT.ordinal]

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

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2023 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.
  *
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory
 import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
 import de.bixilon.minosoft.data.registries.blocks.types.building.RockBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.SlabBlock
+import de.bixilon.minosoft.data.registries.blocks.types.building.StairsBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.hardness.HardnessBlock
 import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
@@ -34,12 +35,22 @@ interface Brick : HardnessBlock {
         }
     }
 
-    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.AbstractStoneSlab(identifier, settings), Brick {
+    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.Stone(identifier, settings), Brick {
 
         companion object : BlockFactory<Slab> {
             override val identifier = minecraft("brick_slab")
 
             override fun build(registries: Registries, settings: BlockSettings) = Slab(settings = settings)
         }
     }
+
+    class Stairs(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : StairsBlock.Stone(identifier, settings), Brick {
+        override val hardness get() = super<Brick>.hardness
+
+        companion object : BlockFactory<Stairs> {
+            override val identifier = minecraft("brick_stairs")
+
+            override fun build(registries: Registries, settings: BlockSettings) = Stairs(settings = settings)
+        }
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2023 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.
  *
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory
 import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
 import de.bixilon.minosoft.data.registries.blocks.types.building.RockBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.SlabBlock
+import de.bixilon.minosoft.data.registries.blocks.types.building.StairsBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.hardness.HardnessBlock
 import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
@@ -34,12 +35,22 @@ interface MossyStoneBrick : HardnessBlock {
         }
     }
 
-    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.AbstractStoneSlab(identifier, settings), MossyStoneBrick {
+    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.Stone(identifier, settings), MossyStoneBrick {
 
         companion object : BlockFactory<Slab> {
             override val identifier = minecraft("mossy_stone_brick_slab")
 
             override fun build(registries: Registries, settings: BlockSettings) = Slab(settings = settings)
         }
     }
+
+    class Stairs(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : StairsBlock.Stone(identifier, settings), MossyStoneBrick {
+        override val hardness get() = super<MossyStoneBrick>.hardness
+
+        companion object : BlockFactory<Stairs> {
+            override val identifier = minecraft("mossy_stone_brick_stairs")
+
+            override fun build(registries: Registries, settings: BlockSettings) = Stairs(settings = settings)
+        }
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2023 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.
  *
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory
 import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
 import de.bixilon.minosoft.data.registries.blocks.types.building.RockBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.SlabBlock
+import de.bixilon.minosoft.data.registries.blocks.types.building.StairsBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.hardness.HardnessBlock
 import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
@@ -34,12 +35,22 @@ interface MudBrick : HardnessBlock {
         }
     }
 
-    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.AbstractStoneSlab(identifier, settings), MudBrick {
+    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.Stone(identifier, settings), MudBrick {
 
         companion object : BlockFactory<Slab> {
             override val identifier = minecraft("mud_brick_slab")
 
             override fun build(registries: Registries, settings: BlockSettings) = Slab(settings = settings)
         }
     }
+
+    class Stairs(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : StairsBlock.Stone(identifier, settings), MudBrick {
+        override val hardness get() = super<MudBrick>.hardness
+
+        companion object : BlockFactory<Stairs> {
+            override val identifier = minecraft("mud_brick_stairs")
+
+            override fun build(registries: Registries, settings: BlockSettings) = Stairs(settings = settings)
+        }
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2023 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,8 +15,10 @@ package de.bixilon.minosoft.data.registries.blocks.types.building.brick
 
 import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory
 import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
+import de.bixilon.minosoft.data.registries.blocks.types.building.FenceBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.RockBlock
 import de.bixilon.minosoft.data.registries.blocks.types.building.SlabBlock
+import de.bixilon.minosoft.data.registries.blocks.types.building.StairsBlock
 import de.bixilon.minosoft.data.registries.blocks.types.properties.hardness.HardnessBlock
 import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft
 import de.bixilon.minosoft.data.registries.identified.ResourceLocation
@@ -34,12 +36,32 @@ interface NetherBrick : HardnessBlock {
         }
     }
 
-    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.AbstractStoneSlab(identifier, settings), NetherBrick {
+    class Slab(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : SlabBlock.Stone(identifier, settings), NetherBrick {
 
         companion object : BlockFactory<Slab> {
             override val identifier = minecraft("nether_brick_slab")
 
             override fun build(registries: Registries, settings: BlockSettings) = Slab(settings = settings)
         }
     }
+
+    class Fence(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : FenceBlock.Stone(identifier, settings), NetherBrick {
+        override val hardness get() = super<NetherBrick>.hardness
+
+        companion object : BlockFactory<Fence> {
+            override val identifier = minecraft("nether_brick_fence")
+
+            override fun build(registries: Registries, settings: BlockSettings) = Fence(settings = settings)
+        }
+    }
+
+    class Stairs(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : StairsBlock.Stone(identifier, settings), NetherBrick {
+        override val hardness get() = super<NetherBrick>.hardness
+
+        companion object : BlockFactory<Stairs> {
+            override val identifier = minecraft("nether_brick_stairs")
+
+            override fun build(registries: Registries, settings: BlockSettings) = Stairs(settings = settings)
+        }
+    }
 }