Merge pull request 'feat: added support for ReFramed block entities with axiom' (#16) from dev into master

Reviewed-on: #16

README.md

@@ -21,14 +21,10 @@ or based on preferences add the person(s) to the project
 
 ### What Shapes are planed to be added
 Currently, the list of shapes to be added is pretty simple as the mod is still under development:
-- Wall
 - Fence
-- Pane
 - Button
 - Pressure Plate
-- Trapdoor
-- Door
-- Carpet
+- Carpet (maybe redundant with Layer)
 - Post
 - Half Slab (maybe redundant with Layer)
 - Slabs Stair (a stair with one end being of a second theme, might be done in multiple blocks)

build.gradle

@@ -4,7 +4,7 @@ import fr.altarik.CreateTag
 
 plugins {
 	id "com.modrinth.minotaur" version "2.+"
-	id 'fabric-loom' version '1.5-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -106,11 +106,11 @@ dependencies {
 //	modRuntimeOnly "maven.modrinth:indium:${project.indium_version}+mc${project.minecraft_version}"
 //	modRuntimeOnly "maven.modrinth:sodium:mc${project.minecraft_version}-${project.sodium_version}"
 
-	// Athena for connected texture
+	// Athena for connected textures
 	modCompileOnly "earth.terrarium.athena:athena-fabric-${project.minecraft_version}:${project.athena_version}"
 	modRuntimeOnly "earth.terrarium.athena:athena-fabric-${project.minecraft_version}:${project.athena_version}"
 
-	// Continuity for connectedTextures
+	// Continuity for connected textures
 	modCompileOnly "maven.modrinth:continuity:${project.continuity_version}"
 	modRuntimeOnly "maven.modrinth:continuity:${project.continuity_version}"
 
@@ -118,6 +118,9 @@ dependencies {
 	modRuntimeOnly "com.teamresourceful.resourcefullib:resourcefullib-fabric-${project.minecraft_version}:2.4.7"
 	modRuntimeOnly "earth.terrarium.chipped:Chipped-fabric-${project.minecraft_version}:3.1.2"
 
+	// Axiom for blueprint support
+	modCompileOnly "maven.modrinth:N6n5dqoA:nvx3oDkz"
+
 	// Fabric API.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 }
@@ -200,8 +203,8 @@ publishing {
 modrinth {
 	token = getEnv("MODRINTH_TOKEN", local.getProperty("modrinth_token"))
 	projectId = project.modrinth_id
-	versionNumber = project.mod_version
-	versionName = "${project.archives_base_name} ${project.mod_version}"
+	versionNumber = "${project.mod_version}-${project.minecraft_version}"
+	versionName = "${project.archives_base_name} ${project.mod_version}-${project.minecraft_version}"
 	versionType = project.mod_version.endsWith('SNAPSHOT') ? 'beta' : 'release'
 	uploadFile = remapJar
 	gameVersions = [project.minecraft_version]
@@ -210,6 +213,7 @@ modrinth {
 		required.project "fabric-api"
 		optional.version "b1ZV3DIJ", "${project.athena_version}"
 		optional.version "Orvt0mRa", "${project.indium_version}+mc${project.minecraft_version}"
+		optional.version "1IjD5062", "${project.continuity_version}"
 	}
 }
 

gradle.properties

@@ -5,18 +5,18 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.20.4
 yarn_mappings=1.20.4+build.3
-loader_version=0.15.6
+loader_version=0.15.11
 
 # Mod Properties
 modrinth_id = jCpoCBpn
-mod_version = 1.5.6
+mod_version = 1.5.11
 maven_group = fr.adrien1106
 archives_base_name = ReFramed
 mod_id = reframed
 
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.95.4+1.20.4
+fabric_version=0.97.0+1.20.4
 
 git_owner=Altarik
 git_repo=ReFramed

src/main/java/fr/adrien1106/reframed/ReFramed.java

@@ -28,17 +28,16 @@ import java.util.stream.Stream;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.LIGHT;
 
 /**
- * TODO make block pairable by right click                                 -> for v1.6
- * TODO Dynamic Ambient Occlusion                                          -> for v1.6
- * TODO add minecraft models like wall fence etc                           -> for v1.6
- * TODO better connected textures                                          -> maybe v1.6 ?
- * TODO support continuity overlays                                        -> not scheduled
+ * TODO Dynamic Ambient Occlusion                                            -> for v1.6
+ * TODO add minecraft models like wall fence etc                             -> for v1.6
+ * TODO better connected textures                                            -> maybe v1.6 ?
+ * TODO support continuity overlays                                          -> not scheduled
  */
 public class ReFramed implements ModInitializer {
 	public static final String MODID = "reframed";
 
 	public static final ArrayList<Block> BLOCKS = new ArrayList<>();
-	public static Block CUBE, SMALL_CUBE, SMALL_CUBES_STEP, STAIR, HALF_STAIR, STAIRS_CUBE, HALF_STAIRS_SLAB, HALF_STAIRS_STAIR, SLAB, SLABS_CUBE, STEP, STEPS_SLAB, LAYER;
+	public static Block CUBE, SMALL_CUBE, SMALL_CUBES_STEP, STAIR, HALF_STAIR, STAIRS_CUBE, HALF_STAIRS_SLAB, HALF_STAIRS_STAIR, SLAB, SLABS_CUBE, STEP, STEPS_SLAB, LAYER, PILLAR, PILLARS_WALL, WALL, PANE, TRAPDOOR, DOOR;
 
 	public static final ArrayList<Item> ITEMS = new ArrayList<>();
 	public static Item HAMMER, SCREWDRIVER, BLUEPRINT, BLUEPRINT_WRITTEN;
@@ -65,6 +64,12 @@ public class ReFramed implements ModInitializer {
 		SLABS_CUBE        = registerBlock("slabs_cube"        , new ReFramedSlabsCubeBlock(cp(Blocks.OAK_SLAB)));
 		STEP              = registerBlock("step"              , new ReFramedStepBlock(cp(Blocks.OAK_SLAB)));
 		STEPS_SLAB        = registerBlock("steps_slab"        , new ReFramedStepsSlabBlock(cp(Blocks.OAK_SLAB)));
+		PILLAR            = registerBlock("pillar"            , new ReFramedPillarBlock(cp(Blocks.OAK_FENCE)));
+		PILLARS_WALL      = registerBlock("pillars_wall"      , new ReFramedPillarsWallBlock(cp(Blocks.OAK_FENCE)));
+		WALL              = registerBlock("wall"              , new ReFramedWallBlock(cp(Blocks.OAK_FENCE)));
+        PANE              = registerBlock("pane"              , new ReFramedPaneBlock(cp(Blocks.OAK_FENCE)));
+        TRAPDOOR          = registerBlock("trapdoor"          , new ReFramedTrapdoorBlock(cp(Blocks.OAK_TRAPDOOR)));
+        DOOR              = registerBlock("door"              , new ReFramedDoorBlock(cp(Blocks.OAK_DOOR)));
 
 		HAMMER            = registerItem("hammer"             , new ReFramedHammerItem(new Item.Settings().maxCount(1)));
 		SCREWDRIVER       = registerItem("screwdriver"        , new ReFramedScrewdriverItem(new Item.Settings().maxCount(1)));

src/main/java/fr/adrien1106/reframed/block/ReFramedBlock.java

@@ -1,13 +1,9 @@
 package fr.adrien1106.reframed.block;
 
 import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.RecipeSetter;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BlockItem;
@@ -15,7 +11,8 @@ import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.nbt.NbtHelper;
+import net.minecraft.registry.Registries;
 import net.minecraft.state.StateManager;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -31,36 +28,21 @@ import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
 
+import static fr.adrien1106.reframed.block.ReFramedEntity.BLOCKSTATE_KEY;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.LIGHT;
 
-public class ReFramedBlock extends Block implements BlockEntityProvider, RecipeSetter {
+public class ReFramedBlock extends Block implements BlockEntityProvider {
 
 	public ReFramedBlock(Settings settings) {
 		super(settings);
 		setDefaultState(getDefaultState().with(LIGHT, false));
 	}
 
-	/**
-	 * Generates a record for the key so that it replaces the blockstate
-	 * which may have states that returns same models
-	 * @param state - the state_key to generate the key from
-	 * @return a cache key with only relevant properties
-	 */
-	public Object getModelCacheKey(BlockState state) {
-		return "";
-	}
-
-	/**
-	 * @return the amount of models the block can have prevents allocating too much space for a model
-	 */
-	public int getModelStateCount() {
-		return 1;
-	}
-	
-	//For addon devs: override this so your blocks don't end up trying to place my block entity, my BlockEntityType only handles blocks internal to the mod
-	//Just make your own BlockEntityType, it's fine, you can even use the same ReFramedEntity class
 	@Override
 	public @Nullable BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
 		return ReFramed.REFRAMED_BLOCK_ENTITY.instantiate(pos, state);
@@ -79,25 +61,20 @@ public class ReFramedBlock extends Block implements BlockEntityProvider, RecipeS
 	
 	@Override
 	public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-		if (!canUse(world, pos, player)) return superUse(state, world, pos, player, hand, hit);
+		if (!canUse(world, pos, player)) return ActionResult.PASS;
 		ActionResult result = BlockHelper.useUpgrade(state, world, pos, player, hand);
 		if (result.isAccepted()) return result;
 		return BlockHelper.useCamo(state, world, pos, player, hand, hit, 1);
 
 	}
 
-	// don't like this but might be useful
-	protected ActionResult superUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-		return super.onUse(state, world, pos, player, hand, hit);
-	}
-
 	protected boolean canUse(World world, BlockPos pos, PlayerEntity player) {
 		return player.canModifyBlocks() && world.canPlayerModifyAt(player, pos);
 	}
 	
 	@Override
 	public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
-		if(!state.isOf(newState.getBlock()) &&
+		if(!(newState.getBlock() instanceof ReFramedBlock) &&
 			world.getBlockEntity(pos) instanceof ReFramedEntity frame_entity &&
 			world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)
 		) {
@@ -122,14 +99,52 @@ public class ReFramedBlock extends Block implements BlockEntityProvider, RecipeS
 		}
 		super.onStateReplaced(state, world, pos, newState, moved);
 	}
-	
-	@Override
-	public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
-		if(world.isClient && world.getBlockEntity(pos) instanceof ReFramedEntity be) {
-			NbtCompound tag = BlockItem.getBlockEntityNbt(stack);
-			if(tag != null) be.readNbt(tag);
+
+	public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack, BlockState old_state, BlockEntity old_entity) {
+		if (!(world.getBlockEntity(pos) instanceof ReFramedEntity frame_entity)) {
+			onPlaced(world, pos, state, placer, stack);
+			return;
 		}
-		super.onPlaced(world, pos, state, placer, stack);
+
+		// apply state change keeping the old information
+		if (old_state.getBlock() instanceof ReFramedBlock old_frame_block
+			&& old_entity instanceof ReFramedEntity old_frame_entity) {
+			Map<Integer, Integer> theme_map = old_frame_block.getThemeMap(old_state, state);
+			theme_map.forEach((self, other) ->
+				frame_entity.setTheme(old_frame_entity.getTheme(self), other)
+			);
+
+			// apply any changes needed to keep previous properties
+			if (old_frame_entity.emitsLight() && !frame_entity.emitsLight()) {
+				frame_entity.toggleLight();
+				world.setBlockState(pos, state.with(LIGHT, true));
+			}
+			if (old_frame_entity.emitsRedstone() && !frame_entity.emitsRedstone()) {
+				frame_entity.toggleRedstone();
+				world.updateNeighbors(pos, this);
+			}
+			if (old_frame_entity.isSolid() && !frame_entity.isSolid()) frame_entity.toggleSolidity();
+
+			// apply themes from item
+			NbtCompound tag = BlockItem.getBlockEntityNbt(stack);
+			if(tag != null) {
+				// determine a list of themes than can be used
+				Iterator<Integer> free_themes = IntStream
+					.rangeClosed(1, frame_entity.getThemes().size())
+					.filter(value -> !theme_map.containsValue(value))
+					.iterator();
+				// apply all the themes possible from item
+				for (int i = 1; tag.contains(BLOCKSTATE_KEY + i) && free_themes.hasNext(); i++) {
+					BlockState theme = NbtHelper.toBlockState(Registries.BLOCK.getReadOnlyWrapper(), tag.getCompound(BLOCKSTATE_KEY + i));
+					if (theme == null || theme.getBlock() == Blocks.AIR) continue;
+					frame_entity.setTheme(theme, free_themes.next());
+				}
+			}
+		} else if(world.isClient) { // prevents flashing with default texture before server sends the update
+			NbtCompound tag = BlockItem.getBlockEntityNbt(stack);
+			if(tag != null) frame_entity.readNbt(tag);
+		}
+		onPlaced(world, pos, state, placer, stack);
 	}
 	
 	@Override
@@ -165,21 +180,20 @@ public class ReFramedBlock extends Block implements BlockEntityProvider, RecipeS
 		return getWeakRedstonePower(state, view, pos, dir);
 	}
 
+	/**
+	 * @param state - the block state to get the top theme index from
+	 * @return the index of the top theme to use for the block
+	 */
 	public int getTopThemeIndex(BlockState state) {
 		return 1;
 	}
 
-	@Override
-	public void setRecipe(RecipeExporter exporter) {
-		ShapedRecipeJsonBuilder
-			.create(RecipeCategory.BUILDING_BLOCKS, this)
-			.pattern("III")
-			.pattern("I~I")
-			.pattern("III")
-			.input('I', Items.BAMBOO)
-			.input('~', Items.STRING)
-			.criterion(FabricRecipeProvider.hasItem(Items.BAMBOO), FabricRecipeProvider.conditionsFromItem(Items.BAMBOO))
-			.criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-			.offerTo(exporter);
+	/**
+	 * @param state     - the block state of the block that is being replaced
+	 * @param new_state - the block state of the block that is replacing the block
+	 * @return a map of the theme indexes to map when changing state so that the themes are preserved
+	 */
+	public Map<Integer, Integer> getThemeMap(BlockState state, BlockState new_state) {
+		return Map.of();
 	}
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedDoorBlock.java

@@ -0,0 +1,273 @@
+package fr.adrien1106.reframed.block;
+
+import fr.adrien1106.reframed.util.VoxelHelper;
+import fr.adrien1106.reframed.util.blocks.BlockHelper;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.enums.DoorHinge;
+import net.minecraft.block.enums.DoubleBlockHalf;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.ai.pathing.NavigationType;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.fluid.Fluids;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.state.StateManager;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.WorldView;
+import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.explosion.Explosion;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiConsumer;
+
+import static net.minecraft.state.property.Properties.*;
+
+public class ReFramedDoorBlock extends WaterloggableReFramedBlock {
+
+    public static final VoxelShape[] DOOR_VOXELS;
+
+    public ReFramedDoorBlock(Settings settings) {
+        super(settings);
+        setDefaultState(getDefaultState()
+            .with(HORIZONTAL_FACING, Direction.NORTH)
+            .with(DOOR_HINGE, DoorHinge.LEFT)
+            .with(DOUBLE_BLOCK_HALF, DoubleBlockHalf.LOWER)
+            .with(OPEN, false)
+            .with(POWERED, false)
+        );
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder.add(HORIZONTAL_FACING, DOOR_HINGE, DOUBLE_BLOCK_HALF, OPEN, POWERED));
+    }
+
+    @Override
+    public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
+        BlockPos pos_down = pos.down();
+        BlockState state_down = world.getBlockState(pos_down);
+        return state.get(DOUBLE_BLOCK_HALF) == DoubleBlockHalf.LOWER ? !state_down.isAir() : state_down.isOf(this);
+    }
+
+    @Override
+    public void neighborUpdate(BlockState state, World world, BlockPos pos, Block source, BlockPos sourcePos, boolean notify) {
+        if (world.isClient) return;
+        boolean powered = world.isReceivingRedstonePower(pos)
+            || world.isReceivingRedstonePower(
+                state.get(DOUBLE_BLOCK_HALF) == DoubleBlockHalf.LOWER
+                    ? pos.up()
+                    : pos.down()
+        );
+        if (!getDefaultState().isOf(source) && powered != state.get(POWERED)) {
+            if (state.get(OPEN) != powered)
+                playToggleSound(null, world, pos, powered);
+
+            world.setBlockState(pos, state.with(POWERED, powered).with(OPEN, powered), 2);
+            if (state.get(WATERLOGGED)) {
+                world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world));
+            }
+        }
+    }
+
+    @Override
+    public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        World world = ctx.getWorld();
+        BlockPos pos = ctx.getBlockPos();
+        Direction facing = ctx.getHorizontalPlayerFacing().getOpposite();
+        if (pos.getY() >= world.getTopY() - 1 || !world.getBlockState(pos.up()).canReplace(ctx)) return null;
+        BlockState state = super.getPlacementState(ctx)
+            .with(DOUBLE_BLOCK_HALF, DoubleBlockHalf.LOWER)
+            .with(HORIZONTAL_FACING, facing);
+
+        if (world.isReceivingRedstonePower(pos) || world.isReceivingRedstonePower(pos.up()))
+            state = state.with(OPEN, true).with(POWERED, true);
+
+
+        return state.with(DOOR_HINGE, getHinge(facing, pos, world, BlockHelper.getRelativePos(ctx.getHitPos(), pos)));
+    }
+
+    @Override
+    public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack, BlockState old_state, BlockEntity old_entity) {
+        world.setBlockState(
+            pos.up(),
+            state
+                .with(DOUBLE_BLOCK_HALF, DoubleBlockHalf.UPPER)
+                .with(WATERLOGGED, world.getFluidState(pos.up()).isOf(Fluids.WATER)),
+            3
+        );
+    }
+
+    @Override
+    public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
+        if (!world.isClient() && (player.isCreative() || !player.canHarvest(state))) {
+            DoubleBlockHalf half = state.get(DOUBLE_BLOCK_HALF);
+            BlockPos other_pos = half == DoubleBlockHalf.LOWER ? pos.up() : pos.down();
+            BlockState other_state = world.getBlockState(other_pos);
+            if (other_state.isOf(this) && other_state.get(DOUBLE_BLOCK_HALF) != half) {
+                world.setBlockState(other_pos, other_state.get(WATERLOGGED) ? Blocks.WATER.getDefaultState(): Blocks.AIR.getDefaultState(), 35);
+                world.syncWorldEvent(player, 2001, other_pos, Block.getRawIdFromState(other_state));
+            }
+        }
+
+        return super.onBreak(world, pos, state, player);
+    }
+
+    @Override
+    public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
+        super.onStateReplaced(state, world, pos, newState, moved);
+
+        if(!state.isOf(newState.getBlock())) world.removeBlockEntity(pos);
+    }
+
+    @Override
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState other, WorldAccess world, BlockPos pos, BlockPos moved) {
+        if (direction.getAxis() == Direction.Axis.Y
+            && other.isOf(this)
+            && other.get(DOUBLE_BLOCK_HALF) != state.get(DOUBLE_BLOCK_HALF)
+            && other.get(OPEN) != state.get(OPEN)
+        ) return state.cycle(OPEN);
+        Direction facing = state.get(HORIZONTAL_FACING);
+        if (direction == (
+            state.get(DOOR_HINGE) == DoorHinge.RIGHT
+                ? facing.rotateYClockwise()
+                : facing.rotateYCounterclockwise())
+            && other.isOf(this)
+            && other.get(DOUBLE_BLOCK_HALF) == state.get(DOUBLE_BLOCK_HALF)
+            && other.get(DOOR_HINGE) != state.get(DOOR_HINGE)
+            && !state.get(POWERED)
+        ) return state.with(OPEN, other.get(OPEN));
+        return super.getStateForNeighborUpdate(state, direction, other, world, pos, moved);
+    }
+
+    @Override
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        ActionResult result = super.onUse(state, world, pos, player, hand, hit);
+        if (result.isAccepted()) return result;
+        flip(state, world, pos, player);
+        return ActionResult.success(world.isClient);
+    }
+
+    @Override
+    public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) {
+        return switch (type) {
+            case LAND, AIR -> state.get(OPEN);
+            case WATER -> false;
+        };
+    }
+
+    @Override
+    public void onExploded(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> stack_merger) {
+        if (explosion.getDestructionType() == Explosion.DestructionType.TRIGGER_BLOCK
+                && !world.isClient()
+                && !state.get(POWERED)
+        ) flip(state, world, pos, null);
+
+        super.onExploded(state, world, pos, explosion, stack_merger);
+    }
+
+    private void flip(BlockState state, World world, BlockPos pos, @Nullable PlayerEntity player) {
+        state = state.cycle(OPEN);
+        world.setBlockState(pos, state, 10);
+
+        this.playToggleSound(player, world, pos, state.get(OPEN));
+    }
+
+    protected void playToggleSound(@Nullable PlayerEntity player, World world, BlockPos pos, boolean open) {
+        world.playSound(player, pos, open ? BlockSetType.OAK.doorOpen() : BlockSetType.OAK.doorClose(), SoundCategory.BLOCKS, 1.0F, world.getRandom().nextFloat() * 0.1F + 0.9F);
+        world.emitGameEvent(player, open ? GameEvent.BLOCK_OPEN : GameEvent.BLOCK_CLOSE, pos);
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        Direction direction = state.get(HORIZONTAL_FACING);
+        if (state.get(OPEN)) direction = switch (state.get(DOOR_HINGE)) {
+            case RIGHT -> direction.rotateYCounterclockwise();
+            case LEFT -> direction.rotateYClockwise();
+        };
+        return DOOR_VOXELS[direction.ordinal() - 2];
+    }
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(HORIZONTAL_FACING, rotation.rotate(state.get(HORIZONTAL_FACING)));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return mirror == BlockMirror.NONE ? state : state.with(HORIZONTAL_FACING, mirror.apply(state.get(HORIZONTAL_FACING))).cycle(DOOR_HINGE);
+    }
+
+    @Override
+    public long getRenderingSeed(BlockState state, BlockPos pos) {
+        return MathHelper.hashCode(pos.getX(), pos.down(state.get(DOUBLE_BLOCK_HALF) == DoubleBlockHalf.LOWER ? 0 : 1).getY(), pos.getZ());
+    }
+
+    private DoorHinge getHinge(Direction facing, BlockPos pos, World world, Vec3d hit_pos) {
+        Direction left = facing.rotateYClockwise();
+        BlockPos left_pos = pos.offset(left);
+        BlockState left_state = world.getBlockState(left_pos);
+        Direction right = facing.rotateYCounterclockwise();
+        BlockPos right_pos = pos.offset(right);
+        BlockState right_state = world.getBlockState(right_pos);
+        DoorHinge hinge = null;
+
+        if (left_state.isSideSolidFullSquare(world, left_pos, right))
+            hinge = DoorHinge.LEFT;
+        if (right_state.isSideSolidFullSquare(world, right_pos, left))
+            hinge = hinge == DoorHinge.LEFT ? null : DoorHinge.RIGHT;
+
+        if (hinge != null) return hinge;
+
+        if (left_state.isOf(this)
+            && left_state.get(HORIZONTAL_FACING) == facing
+            && left_state.get(DOUBLE_BLOCK_HALF) == DoubleBlockHalf.LOWER
+            && left_state.get(DOOR_HINGE) == DoorHinge.LEFT
+        ) hinge = DoorHinge.RIGHT;
+        if (right_state.isOf(this)
+            && right_state.get(HORIZONTAL_FACING) == facing
+            && right_state.get(DOUBLE_BLOCK_HALF) == DoubleBlockHalf.LOWER
+            && right_state.get(DOOR_HINGE) == DoorHinge.RIGHT
+        ) hinge = hinge == DoorHinge.RIGHT ? null : DoorHinge.LEFT;
+
+        if (hinge != null) return hinge;
+
+        return switch (facing.getAxis()) {
+            case Z -> {
+                if (left.getDirection() == Direction.AxisDirection.POSITIVE)
+                    yield hit_pos.getX() < 0.5 ? DoorHinge.RIGHT : DoorHinge.LEFT;
+                else // left.getDirection() == Direction.AxisDirection.NEGATIVE
+                    yield hit_pos.getX() < 0.5 ? DoorHinge.LEFT : DoorHinge.RIGHT;
+            }
+            case X -> {
+                if (left.getDirection() == Direction.AxisDirection.POSITIVE)
+                    yield hit_pos.getZ() < 0.5 ? DoorHinge.RIGHT : DoorHinge.LEFT;
+                else // left.getDirection() == Direction.AxisDirection.NEGATIVE
+                    yield hit_pos.getZ() < 0.5 ? DoorHinge.LEFT : DoorHinge.RIGHT;
+            }
+            default -> DoorHinge.LEFT;
+        };
+    }
+
+    static {
+        VoxelShape SHAPE = createCuboidShape(0.0, 0.0, 0.0, 16.0, 16.0, 3.0);
+        DOOR_VOXELS = VoxelHelper.VoxelListBuilder.create(SHAPE, 4)
+            .add(VoxelHelper::mirrorZ)
+            .add(VoxelHelper::rotateY)
+            .add(VoxelHelper::mirrorX)
+            .build();
+    }
+}

src/main/java/fr/adrien1106/reframed/block/ReFramedDoubleBlock.java

@@ -49,6 +49,14 @@ public abstract class ReFramedDoubleBlock extends ReFramedBlock {
         return 0;
     }
 
+    public boolean matchesShape(Vec3d hit, BlockPos pos, BlockState state, int i) {
+        Vec3d rel = BlockHelper.getRelativePos(hit, pos);
+        return BlockHelper.cursorMatchesFace(
+            getShape(state, i),
+            rel
+        );
+    }
+
     @Override
     public boolean isTransparent(BlockState state, BlockView world, BlockPos pos) {
         return world.getBlockEntity(pos) instanceof ThemeableBlockEntity framed_entity
@@ -61,17 +69,17 @@ public abstract class ReFramedDoubleBlock extends ReFramedBlock {
 
     @Override
     public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
-        return getCullingShape(state, view, pos);
-    }
-
-    @Override
-    public VoxelShape getCullingShape(BlockState state, BlockView view, BlockPos pos) {
         return isGhost(view, pos) ? empty() : fullCube();
     }
 
+    @Override
+    public VoxelShape getCullingShape(BlockState state, BlockView view, BlockPos pos) {
+        return getCollisionShape(state, view, pos, ShapeContext.absent());
+    }
+
     @Override
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-        if (!canUse(world, pos, player)) return superUse(state, world, pos, player, hand, hit);
+        if (!canUse(world, pos, player)) return ActionResult.PASS;
         ActionResult result = BlockHelper.useUpgrade(state, world, pos, player, hand);
         if (result.isAccepted()) return result;
         return BlockHelper.useCamo(state, world, pos, player, hand, hit, getHitShape(state, hit));

src/main/java/fr/adrien1106/reframed/block/ReFramedHalfStairBlock.java

@@ -1,65 +1,98 @@
 package fr.adrien1106.reframed.block;
 
 import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.VoxelHelper;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Corner;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.BlockStateSupplier;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import org.jetbrains.annotations.Nullable;
 
-import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
-import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER;
-import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER_FACE;
-import static fr.adrien1106.reframed.util.blocks.Corner.*;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import java.util.Map;
 
-public class ReFramedHalfStairBlock extends WaterloggableReFramedBlock implements BlockStateProvider {
+import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.*;
+import static fr.adrien1106.reframed.util.blocks.Corner.*;
+import static net.minecraft.state.property.Properties.WATERLOGGED;
+
+public class ReFramedHalfStairBlock extends WaterloggableReFramedBlock {
 
     public static final VoxelShape[] HALF_STAIR_VOXELS;
 
-    private record ModelCacheKey(Corner corner, int face) {}
-
     public ReFramedHalfStairBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(CORNER, NORTH_EAST_DOWN).with(CORNER_FACE, 0));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return new ModelCacheKey(state.get(CORNER), state.get(CORNER_FACE));
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 24;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(CORNER,CORNER_FACE));
     }
 
+    @Override
+    public boolean canReplace(BlockState state, ItemPlacementContext context) {
+        if (context.getPlayer() == null) return false;
+        Direction dir = state.get(CORNER).getDirection(state.get(CORNER_FACE));
+        return !(
+            context.getPlayer().isSneaking()
+                || !(context.getStack().getItem() instanceof BlockItem block_item)
+                || (
+                    !(
+                        block_item.getBlock() == this
+                        && ((ReFramedHalfStairsStairBlock) ReFramed.HALF_STAIRS_STAIR)
+                            .matchesShape(
+                                context.getHitPos(),
+                                context.getBlockPos(),
+                                ReFramed.HALF_STAIRS_STAIR.getDefaultState()
+                                    .with(EDGE, state.get(CORNER).getEdge(dir)),
+                                dir.getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+                            )
+                    )
+                    && !(
+                        block_item.getBlock() == ReFramed.SMALL_CUBE
+                        && BlockHelper.cursorMatchesFace(
+                            ReFramed.SMALL_CUBE.getOutlineShape(
+                                ReFramed.SMALL_CUBE.getDefaultState()
+                                    .with(CORNER, state.get(CORNER).getOpposite(state.get(CORNER_FACE))),
+                                context.getWorld(),
+                                context.getBlockPos(),
+                                ShapeContext.absent()
+                            ),
+                            BlockHelper.getRelativePos(context.getHitPos(), context.getBlockPos())
+                        )
+                    )
+                )
+        );
+    }
+
     @Override
     public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockState current_state = ctx.getWorld().getBlockState(ctx.getBlockPos());
+        if (current_state.isOf(ReFramed.SMALL_CUBE)) {
+            Corner corner = current_state.get(CORNER).getOpposite(ctx.getSide().getOpposite());
+            return ReFramed.HALF_STAIRS_SLAB.getDefaultState()
+                .with(CORNER, corner)
+                .with(CORNER_FACE, corner.getDirectionIndex(ctx.getSide().getOpposite()))
+                .with(WATERLOGGED, current_state.get(WATERLOGGED));
+        }
+
+        if (current_state.isOf(this))
+            return ReFramed.HALF_STAIRS_STAIR.getDefaultState()
+                .with(EDGE, current_state.get(CORNER).getEdge(current_state.get(CORNER).getDirection(current_state.get(CORNER_FACE))))
+                .with(WATERLOGGED, current_state.get(WATERLOGGED));
+
         Corner corner = BlockHelper.getPlacementCorner(ctx);
         return super.getPlacementState(ctx)
             .with(CORNER, corner)
@@ -72,84 +105,30 @@ public class ReFramedHalfStairBlock extends WaterloggableReFramedBlock implement
     }
 
     @Override
-    public BlockStateSupplier getMultipart() {
-        return getHalfStairMultipart(
-            this,
-            ReFramed.id("half_stair_down_special"),
-            ReFramed.id("half_stair_side_special")
-        );
-    }
-
-    public static BlockStateSupplier getHalfStairMultipart(Block block, Identifier model_down, Identifier model_side) {
-        return MultipartBlockStateSupplier.create(block)
-            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R0, R0))
-            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R90, R270))
-            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R0, R0))
-
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R0, R90))
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R90, R0))
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R0, R90))
-
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R0, R180))
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R90, R90))
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R0, R180))
-
-            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R0, R270))
-            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R90, R180))
-            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R0, R270))
-
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R180, R0))
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R270, R90))
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R180, R0))
-
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R180, R90))
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R270, R180))
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R180, R90))
-
-            .with(GBlockstate.when(CORNER, WEST_NORTH_UP, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R180, R180))
-            .with(GBlockstate.when(CORNER, WEST_NORTH_UP, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R270, R270))
-            .with(GBlockstate.when(CORNER, WEST_NORTH_UP, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R180, R180))
-
-            .with(GBlockstate.when(CORNER, NORTH_EAST_UP, CORNER_FACE, 0),
-                GBlockstate.variant(model_side, true, R180, R270))
-            .with(GBlockstate.when(CORNER, NORTH_EAST_UP, CORNER_FACE, 1),
-                GBlockstate.variant(model_side, true, R270, R0))
-            .with(GBlockstate.when(CORNER, NORTH_EAST_UP, CORNER_FACE, 2),
-                GBlockstate.variant(model_down, true, R180, R270));
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        Corner corner = state.get(CORNER).rotate(rotation);
+        Direction face = state.get(CORNER).getDirection(state.get(CORNER_FACE));
+        return state.with(CORNER, corner).with(CORNER_FACE, corner.getDirectionIndex(rotation.rotate(face)));
     }
 
     @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 2);
-        ShapedRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this, 4)
-            .pattern("I  ")
-            .pattern("II ")
-            .input('I', ReFramed.CUBE)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        Corner corner = state.get(CORNER).mirror(mirror);
+        Direction face = state.get(CORNER).getDirection(state.get(CORNER_FACE));
+        return state.with(CORNER, corner).with(CORNER_FACE, corner.getDirectionIndex(mirror.apply(face)));
+    }
+
+    @Override
+    public Map<Integer, Integer> getThemeMap(BlockState state, BlockState new_state) {
+        if (new_state.isOf(ReFramed.HALF_STAIRS_SLAB)) return Map.of(1, 1);
+        if (new_state.isOf(ReFramed.HALF_STAIRS_STAIR))
+            return Map.of(
+                1,
+                state.get(CORNER)
+                    .getDirection(state.get(CORNER_FACE))
+                    .getDirection() == Direction.AxisDirection.POSITIVE ? 2 : 1
+            );
+        return super.getThemeMap(state, new_state);
     }
 
     static {

src/main/java/fr/adrien1106/reframed/block/ReFramedHalfStairsSlabBlock.java

@@ -1,27 +1,21 @@
 package fr.adrien1106.reframed.block;
 
-import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Corner;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.BlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import org.jetbrains.annotations.Nullable;
 
 import static fr.adrien1106.reframed.block.ReFramedHalfStairBlock.HALF_STAIR_VOXELS;
-import static fr.adrien1106.reframed.block.ReFramedHalfStairBlock.getHalfStairMultipart;
 import static fr.adrien1106.reframed.block.ReFramedSlabBlock.getSlabShape;
 import static fr.adrien1106.reframed.block.ReFramedSmallCubeBlock.SMALL_CUBE_VOXELS;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER;
@@ -29,25 +23,13 @@ import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER_FACE;
 import static fr.adrien1106.reframed.util.blocks.Corner.NORTH_EAST_DOWN;
 import static net.minecraft.util.shape.VoxelShapes.empty;
 
-public class ReFramedHalfStairsSlabBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider {
-
-    private record ModelCacheKey(Corner corner, int face) {}
+public class ReFramedHalfStairsSlabBlock extends WaterloggableReFramedDoubleBlock {
 
     public ReFramedHalfStairsSlabBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(CORNER, NORTH_EAST_DOWN).with(CORNER_FACE, 0));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return new ModelCacheKey(state.get(CORNER), state.get(CORNER_FACE));
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 24;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(CORNER,CORNER_FACE));
@@ -62,7 +44,7 @@ public class ReFramedHalfStairsSlabBlock extends WaterloggableReFramedDoubleBloc
     }
 
     @Override
-    public VoxelShape getCullingShape(BlockState state, BlockView view, BlockPos pos) {
+    public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
         return isGhost(view, pos) ? empty(): getSlabShape(state.get(CORNER).getDirection(state.get(CORNER_FACE)));
     }
 
@@ -71,6 +53,20 @@ public class ReFramedHalfStairsSlabBlock extends WaterloggableReFramedDoubleBloc
         return getSlabShape(state.get(CORNER).getDirection(state.get(CORNER_FACE)));
     }
 
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        Corner corner = state.get(CORNER).rotate(rotation);
+        Direction face = state.get(CORNER).getDirection(state.get(CORNER_FACE));
+        return state.with(CORNER, corner).with(CORNER_FACE, corner.getDirectionIndex(rotation.rotate(face)));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        Corner corner = state.get(CORNER).mirror(mirror);
+        Direction face = state.get(CORNER).getDirection(state.get(CORNER_FACE));
+        return state.with(CORNER, corner).with(CORNER_FACE, corner.getDirectionIndex(mirror.apply(face)));
+    }
+
     @Override
     public VoxelShape getShape(BlockState state, int i) {
         Corner corner = state.get(CORNER);
@@ -79,25 +75,4 @@ public class ReFramedHalfStairsSlabBlock extends WaterloggableReFramedDoubleBloc
             ? SMALL_CUBE_VOXELS[corner.getOpposite(face).getID()]
             : HALF_STAIR_VOXELS[face + corner.getID() * 3];
     }
-
-    @Override
-    public BlockStateSupplier getMultipart() {
-        return getHalfStairMultipart(
-            this,
-            ReFramed.id("half_stairs_slab_down_special"),
-            ReFramed.id("half_stairs_slab_side_special")
-        );
-    }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 2);
-        ShapelessRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .input(ReFramed.HALF_STAIR)
-            .input(ReFramed.SMALL_CUBE)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedHalfStairsStairBlock.java

@@ -1,25 +1,16 @@
 package fr.adrien1106.reframed.block;
 
-import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Corner;
 import fr.adrien1106.reframed.util.blocks.Edge;
 import fr.adrien1106.reframed.util.blocks.StairShape;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.BlockStateSupplier;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
@@ -30,25 +21,14 @@ import static fr.adrien1106.reframed.block.ReFramedHalfStairBlock.HALF_STAIR_VOX
 import static fr.adrien1106.reframed.block.ReFramedStairBlock.getStairShape;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
 import static fr.adrien1106.reframed.util.blocks.Edge.*;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
 import static net.minecraft.util.shape.VoxelShapes.empty;
 
-public class ReFramedHalfStairsStairBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider {
+public class ReFramedHalfStairsStairBlock extends WaterloggableReFramedDoubleBlock {
     public ReFramedHalfStairsStairBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(EDGE, NORTH_DOWN));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return state.get(EDGE);
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 12;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(EDGE));
@@ -61,7 +41,7 @@ public class ReFramedHalfStairsStairBlock extends WaterloggableReFramedDoubleBlo
     }
 
     @Override
-    public VoxelShape getCullingShape(BlockState state, BlockView view, BlockPos pos) {
+    public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
         return isGhost(view, pos) ? empty(): getStairShape(state.get(EDGE), StairShape.STRAIGHT);
     }
 
@@ -70,6 +50,16 @@ public class ReFramedHalfStairsStairBlock extends WaterloggableReFramedDoubleBlo
         return getStairShape(state.get(EDGE), StairShape.STRAIGHT);
     }
 
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(EDGE, state.get(EDGE).rotate(rotation));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(EDGE, state.get(EDGE).mirror(mirror));
+    }
+
     @Override
     public VoxelShape getShape(BlockState state, int i) {
         Edge edge = state.get(EDGE);
@@ -89,50 +79,4 @@ public class ReFramedHalfStairsStairBlock extends WaterloggableReFramedDoubleBlo
     public int getTopThemeIndex(BlockState state) {
         return 2;
     }
-
-    @Override
-    public BlockStateSupplier getMultipart() {
-        Identifier model_id = ReFramed.id("half_stairs_stair_down_special");
-        Identifier side_model_id = ReFramed.id("half_stairs_stair_side_special");
-        Identifier reverse_model_id = ReFramed.id("half_stairs_stair_reverse_special");
-        return MultipartBlockStateSupplier.create(this)
-            /* X AXIS */
-            .with(GBlockstate.when(EDGE, NORTH_DOWN),
-                GBlockstate.variant(side_model_id, true, R90, R180))
-            .with(GBlockstate.when(EDGE, DOWN_SOUTH),
-                GBlockstate.variant(side_model_id, true, R0, R180))
-            .with(GBlockstate.when(EDGE, SOUTH_UP),
-                GBlockstate.variant(side_model_id, true, R270, R180))
-            .with(GBlockstate.when(EDGE, UP_NORTH),
-                GBlockstate.variant(side_model_id, true, R180, R180))
-            /* Y AXIS */
-            .with(GBlockstate.when(EDGE, NORTH_EAST),
-                GBlockstate.variant(model_id, true, R0, R0))
-            .with(GBlockstate.when(EDGE, EAST_SOUTH),
-                GBlockstate.variant(model_id, true, R0, R90))
-            .with(GBlockstate.when(EDGE, SOUTH_WEST),
-                GBlockstate.variant(model_id, true, R0, R180))
-            .with(GBlockstate.when(EDGE, WEST_NORTH),
-                GBlockstate.variant(model_id, true, R0, R270))
-            /* Z AXIS */
-            .with(GBlockstate.when(EDGE, DOWN_EAST),
-                GBlockstate.variant(side_model_id, true, R0, R90))
-            .with(GBlockstate.when(EDGE, EAST_UP),
-                GBlockstate.variant(reverse_model_id, true, R180, R270))
-            .with(GBlockstate.when(EDGE, UP_WEST),
-                GBlockstate.variant(side_model_id, true, R180, R90))
-            .with(GBlockstate.when(EDGE, WEST_DOWN),
-                GBlockstate.variant(reverse_model_id, true, R0, R270));
-    }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 2);
-        ShapelessRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .input(ReFramed.HALF_STAIR, 2)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedLayerBlock.java

@@ -1,46 +1,32 @@
 package fr.adrien1106.reframed.block;
 
-import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.VoxelHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import org.jetbrains.annotations.Nullable;
 
 import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
 import static net.minecraft.state.property.Properties.FACING;
 import static net.minecraft.state.property.Properties.LAYERS;
 
 public class ReFramedLayerBlock extends ReFramedSlabBlock {
 
     public static final VoxelShape[] LAYER_VOXELS;
-    private record ModelCacheKey(Direction face, int layer) {}
 
     public ReFramedLayerBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(LAYERS, 1));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return new ModelCacheKey(state.get(FACING), state.get(LAYERS));
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 48;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(LAYERS));
@@ -52,8 +38,13 @@ public class ReFramedLayerBlock extends ReFramedSlabBlock {
     }
 
     @Override
-    public boolean canReplace(BlockState state, ItemPlacementContext ctx) {
-        return !(!state.isOf(this) || ctx.getPlayer().isSneaking() || state.get(LAYERS) == 8);
+    public boolean canReplace(BlockState state, ItemPlacementContext context) {
+        if (context.getPlayer() == null) return false;
+        return !(
+            context.getPlayer().isSneaking()
+            || !(context.getStack().getItem() instanceof BlockItem block_item)
+            || !(block_item.getBlock() == this && state.get(LAYERS) < 8)
+        );
     }
 
     @Override
@@ -64,26 +55,13 @@ public class ReFramedLayerBlock extends ReFramedSlabBlock {
     }
 
     @Override
-    public MultipartBlockStateSupplier getMultipart() {
-        String model_pattern = "layer_x_special";
-        MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(this);
-        for (int i = 1; i <= 8; i++) {
-            Identifier model = ReFramed.id(model_pattern.replace("x", i + ""));
-            supplier
-                .with(GBlockstate.when(FACING, Direction.DOWN, LAYERS, i),
-                    GBlockstate.variant(model, true, R0, R0))
-                .with(GBlockstate.when(FACING, Direction.SOUTH, LAYERS, i),
-                    GBlockstate.variant(model, true, R90, R0))
-                .with(GBlockstate.when(FACING, Direction.UP, LAYERS, i),
-                    GBlockstate.variant(model, true, R180, R0))
-                .with(GBlockstate.when(FACING, Direction.NORTH, LAYERS, i),
-                    GBlockstate.variant(model, true, R270, R0))
-                .with(GBlockstate.when(FACING, Direction.WEST, LAYERS, i),
-                    GBlockstate.variant(model, true, R90, R90))
-                .with(GBlockstate.when(FACING, Direction.EAST, LAYERS, i),
-                    GBlockstate.variant(model, true, R90, R270));
-        }
-        return supplier;
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(FACING, rotation.rotate(state.get(FACING)));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(FACING, mirror.apply(state.get(FACING)));
     }
 
     static {

src/main/java/fr/adrien1106/reframed/block/ReFramedPaneBlock.java

@@ -0,0 +1,130 @@
+package fr.adrien1106.reframed.block;
+
+import fr.adrien1106.reframed.util.VoxelHelper;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.PaneBlock;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import org.jetbrains.annotations.Nullable;
+
+import static net.minecraft.state.property.Properties.*;
+
+public class ReFramedPaneBlock extends WaterloggableReFramedBlock {
+
+    public static final VoxelShape[] PANE_VOXELS;
+
+    public ReFramedPaneBlock(Settings settings) {
+        super(settings);
+        setDefaultState(getDefaultState()
+            .with(EAST, false)
+            .with(NORTH, false)
+            .with(WEST, false)
+            .with(SOUTH, false)
+        );
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder.add(EAST, NORTH, SOUTH, WEST));
+    }
+
+    @Override
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction dir, BlockState other_state, WorldAccess world, BlockPos pos, BlockPos moved) {
+        BlockState new_state = super.getStateForNeighborUpdate(state, dir, other_state, world, pos, moved);
+        if (dir == Direction.DOWN) return new_state;
+
+        for (Direction side: Direction.Type.HORIZONTAL) {
+            BlockState neighbor = world.getBlockState(pos.offset(side));
+            new_state = new_state.with(getPaneProperty(side), connectsTo(
+                neighbor,
+                neighbor.isSideSolidFullSquare(world, pos.offset(side), side.getOpposite())
+            ));
+        }
+        return new_state;
+    }
+
+    @Override
+    public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockState state = super.getPlacementState(ctx);
+        World world = ctx.getWorld();
+        BlockPos pos = ctx.getBlockPos();
+
+        for (Direction dir: Direction.Type.HORIZONTAL) {
+            BlockState neighbor = world.getBlockState(pos.offset(dir));
+            state = state.with(getPaneProperty(dir), connectsTo(
+                neighbor,
+                neighbor.isSideSolidFullSquare(world, pos.offset(dir), dir.getOpposite())
+            ));
+        }
+        return state;
+    }
+
+    @Override
+    public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
+        super.onStateReplaced(state, world, pos, newState, moved);
+
+        if(!state.isOf(newState.getBlock())) world.removeBlockEntity(pos);
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        VoxelShape shape = PANE_VOXELS[0];
+        for (Direction dir: Direction.Type.HORIZONTAL) {
+            if (state.get(getPaneProperty(dir)))
+                shape = VoxelShapes.union(shape, PANE_VOXELS[dir.ordinal() - 1]);
+        }
+        return shape;
+    }
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return Direction.Type.HORIZONTAL.stream().reduce(state, (s, dir) ->
+            s.with(getPaneProperty(rotation.rotate(dir)), state.get(getPaneProperty(dir)))
+        , (prev, next) -> next);
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return Direction.Type.HORIZONTAL.stream().reduce(state, (s, dir) ->
+                s.with(getPaneProperty(mirror.apply(dir)), state.get(getPaneProperty(dir)))
+            , (prev, next) -> next);
+    }
+
+    public static boolean connectsTo(BlockState state, boolean fs) {
+        return !cannotConnect(state) && fs || state.getBlock() instanceof PaneBlock || state.isIn(BlockTags.WALLS);
+    }
+
+    public static BooleanProperty getPaneProperty(Direction dir) {
+        return switch (dir) {
+            case NORTH -> NORTH;
+            case EAST -> EAST;
+            case SOUTH -> SOUTH;
+            case WEST -> WEST;
+            default -> null;
+        };
+    }
+
+    static {
+        VoxelShape POST = createCuboidShape(7, 0, 7, 9, 16, 9);
+        VoxelShape SIDE = createCuboidShape(7, 0, 0, 9, 16, 7);
+        PANE_VOXELS = VoxelHelper.VoxelListBuilder.create(POST, 5)
+            .add(SIDE)
+            .add(VoxelHelper::mirrorZ)
+            .add(VoxelHelper::rotateY)
+            .add(VoxelHelper::mirrorX)
+            .build();
+    }
+}

src/main/java/fr/adrien1106/reframed/block/ReFramedPillarBlock.java

@@ -0,0 +1,64 @@
+package fr.adrien1106.reframed.block;
+
+import fr.adrien1106.reframed.util.VoxelHelper;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.state.StateManager;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import org.jetbrains.annotations.Nullable;
+
+import static net.minecraft.state.property.Properties.AXIS;
+
+public class ReFramedPillarBlock extends WaterloggableReFramedBlock {
+
+    public static final VoxelShape[] PILLAR_VOXELS;
+
+    public ReFramedPillarBlock(Settings settings) {
+        super(settings);
+        setDefaultState(getDefaultState().with(AXIS, Direction.Axis.Y));
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder.add(AXIS));
+    }
+
+    @Override
+    public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        return super.getPlacementState(ctx).with(AXIS, ctx.getSide().getAxis());
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        return getPillarShape(state.get(AXIS));
+    }
+
+    public static VoxelShape getPillarShape(Direction.Axis axis) {
+        return PILLAR_VOXELS[axis.ordinal()];
+    }
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(AXIS, rotation.rotate(Direction.get(Direction.AxisDirection.POSITIVE, state.get(AXIS))).getAxis());
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(AXIS, mirror.apply(Direction.get(Direction.AxisDirection.POSITIVE, state.get(AXIS))).getAxis());
+    }
+
+    static {
+        final VoxelShape PILLAR = createCuboidShape(0, 4, 4, 16, 12, 12);
+        PILLAR_VOXELS = VoxelHelper.VoxelListBuilder.create(PILLAR, 3)
+            .add(VoxelHelper::rotateZ)
+            .add(VoxelHelper::rotateX)
+            .build();
+    }
+}

src/main/java/fr/adrien1106/reframed/block/ReFramedPillarsWallBlock.java

@@ -0,0 +1,133 @@
+package fr.adrien1106.reframed.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.block.enums.WallShape;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.state.StateManager;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static fr.adrien1106.reframed.block.ReFramedWallBlock.*;
+import static net.minecraft.state.property.Properties.*;
+import static net.minecraft.util.shape.VoxelShapes.empty;
+
+public class ReFramedPillarsWallBlock extends WaterloggableReFramedDoubleBlock {
+
+    public ReFramedPillarsWallBlock(Settings settings) {
+        super(settings);
+        setDefaultState(getDefaultState()
+            .with(EAST_WALL_SHAPE, WallShape.NONE)
+            .with(NORTH_WALL_SHAPE, WallShape.NONE)
+            .with(WEST_WALL_SHAPE, WallShape.NONE)
+            .with(SOUTH_WALL_SHAPE, WallShape.NONE)
+        );
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder.add(EAST_WALL_SHAPE, NORTH_WALL_SHAPE, SOUTH_WALL_SHAPE, WEST_WALL_SHAPE));
+    }
+
+    @Override
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction dir, BlockState other_state, WorldAccess world, BlockPos pos, BlockPos moved) {
+        BlockState new_state = super.getStateForNeighborUpdate(state, dir, other_state, world, pos, moved);
+        if (dir == Direction.DOWN) return new_state;
+        BlockState top_state = dir == Direction.UP? other_state: world.getBlockState(pos.up());
+        boolean fs = top_state.isSideSolidFullSquare(world, pos.up(), Direction.DOWN);
+        VoxelShape top_shape = fs ? null : top_state.getCollisionShape(world, pos.up()).getFace(Direction.DOWN);
+        Map<Direction, BlockState> neighbors = Direction.Type.HORIZONTAL.stream()
+            .collect(Collectors.toMap(d -> d, d -> {
+                if (d == dir) return other_state;
+                return world.getBlockState(pos.offset(d));
+            }));
+        return getWallState(new_state, top_state, neighbors, top_shape, fs, world, pos);
+    }
+
+    @Override
+    public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockState state = super.getPlacementState(ctx);
+        World world = ctx.getWorld();
+        BlockPos pos = ctx.getBlockPos();
+
+        BlockState top_state = world.getBlockState(pos.up());
+        boolean fs = top_state.isSideSolidFullSquare(world, pos.up(), Direction.DOWN);
+        VoxelShape top_shape = fs ? null : top_state.getCollisionShape(world, pos.up()).getFace(Direction.DOWN);
+
+        Map<Direction, BlockState> neighbors = Direction.Type.HORIZONTAL.stream()
+            .collect(Collectors.toMap(d -> d, d -> world.getBlockState(pos.offset(d))));
+        return getWallState(state, top_state, neighbors, top_shape, fs, world, pos);
+    }
+
+    @Override
+    public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
+        super.onStateReplaced(state, world, pos, newState, moved);
+
+        if(!state.isOf(newState.getBlock())) world.removeBlockEntity(pos);
+    }
+
+    @Override
+    public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
+        if (isGhost(view, pos)) return empty();
+        VoxelShape shape = WALL_VOXELS[9];
+        for (Direction dir : Direction.Type.HORIZONTAL) {
+            if (state.get(getWallShape(dir)) != WallShape.NONE)
+                shape = VoxelShapes.union(shape, WALL_VOXELS[8 + dir.ordinal()]);
+        }
+        return shape;
+    }
+
+    @Override
+    public VoxelShape getCullingShape(BlockState state, BlockView view, BlockPos pos) {
+        return isGhost(view, pos) ? empty(): getOutlineShape(state, view, pos, ShapeContext.absent());
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        VoxelShape shape = WALL_VOXELS[0];
+        for (Direction dir: Direction.Type.HORIZONTAL) {
+            WallShape wall_shape = state.get(getWallShape(dir));
+            if (wall_shape != WallShape.NONE)
+                shape = VoxelShapes.union(shape, WALL_VOXELS[1 + (wall_shape.ordinal()-1) * 4 + (dir.ordinal() - 2)]);
+        }
+        return shape;
+    }
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return Direction.Type.HORIZONTAL.stream().reduce(state, (s, dir) ->
+            s.with(getWallShape(rotation.rotate(dir)), state.get(getWallShape(dir)))
+        , (prev, next) -> next);
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return Direction.Type.HORIZONTAL.stream().reduce(state, (s, dir) ->
+                s.with(getWallShape(mirror.apply(dir)), state.get(getWallShape(dir)))
+            , (prev, next) -> next);
+    }
+
+    @Override
+    public VoxelShape getShape(BlockState state, int i) {
+        if (i == 1) return WALL_VOXELS[0];
+        VoxelShape shape = VoxelShapes.empty();
+        for (Direction dir: Direction.Type.HORIZONTAL) {
+            WallShape wall_shape = state.get(getWallShape(dir));
+            if (wall_shape != WallShape.NONE)
+                shape = VoxelShapes.union(shape, WALL_VOXELS[1 + (wall_shape.ordinal()-1) * 4 + (dir.ordinal() - 2)]);
+        }
+        return shape;
+    }
+}

src/main/java/fr/adrien1106/reframed/block/ReFramedSlabBlock.java

@@ -1,20 +1,14 @@
 package fr.adrien1106.reframed.block;
 
 import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
@@ -22,10 +16,12 @@ import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import org.jetbrains.annotations.Nullable;
 
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import java.util.Map;
+
+import static net.minecraft.state.property.Properties.AXIS;
 import static net.minecraft.state.property.Properties.FACING;
 
-public class ReFramedSlabBlock extends WaterloggableReFramedBlock implements BlockStateProvider {
+public class ReFramedSlabBlock extends WaterloggableReFramedBlock {
 
 	protected static final VoxelShape DOWN = VoxelShapes.cuboid(0f, 0f, 0f, 1f, 0.5f, 1f);
 	protected static final VoxelShape UP = VoxelShapes.cuboid(0f, 0.5f, 0f, 1f, 1f, 1f);
@@ -38,25 +34,39 @@ public class ReFramedSlabBlock extends WaterloggableReFramedBlock implements Blo
 		super(settings);
 		setDefaultState(getDefaultState().with(FACING, Direction.DOWN));
 	}
-
-	@Override
-	public Object getModelCacheKey(BlockState state) {
-		return state.get(FACING);
-	}
-
-	@Override
-	public int getModelStateCount() {
-		return 6;
-	}
 	
 	@Override
 	protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
 		super.appendProperties(builder.add(FACING));
 	}
-	
+
+	@Override
+	public boolean canReplace(BlockState state, ItemPlacementContext context) {
+        if (context.getPlayer() == null) return false;
+		return !(
+			context.getPlayer().isSneaking()
+			|| !(context.getStack().getItem() instanceof BlockItem block_item)
+			|| !(
+				block_item.getBlock() == this
+				&& ((ReFramedSlabsCubeBlock) ReFramed.SLABS_CUBE)
+					.matchesShape(
+						context.getHitPos(),
+						context.getBlockPos(),
+						ReFramed.SLABS_CUBE.getDefaultState().with(AXIS, state.get(FACING).getAxis()),
+						state.get(FACING).getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+					)
+			)
+		);
+	}
+
 	@Nullable
 	@Override
 	public BlockState getPlacementState(ItemPlacementContext ctx) {
+		BlockState current_state = ctx.getWorld().getBlockState(ctx.getBlockPos());
+		if (current_state.isOf(this))
+			return ReFramed.SLABS_CUBE.getDefaultState()
+				.with(AXIS, current_state.get(FACING).getAxis());
+
 		return super.getPlacementState(ctx).with(FACING, ctx.getSide().getOpposite());
 	}
 
@@ -65,6 +75,16 @@ public class ReFramedSlabBlock extends WaterloggableReFramedBlock implements Blo
 		return getSlabShape(state.get(FACING));
 	}
 
+	@Override
+	public BlockState rotate(BlockState state, BlockRotation rotation) {
+		return state.with(FACING, rotation.rotate(state.get(FACING)));
+	}
+
+	@Override
+	public BlockState mirror(BlockState state, BlockMirror mirror) {
+		return state.with(FACING, mirror.apply(state.get(FACING)));
+	}
+
 	public static VoxelShape getSlabShape(Direction side) {
 		return switch (side) {
 			case DOWN -> DOWN;
@@ -77,32 +97,8 @@ public class ReFramedSlabBlock extends WaterloggableReFramedBlock implements Blo
 	}
 
 	@Override
-	public MultipartBlockStateSupplier getMultipart() {
-		Identifier model_id = ReFramed.id("slab_special");
-		return MultipartBlockStateSupplier.create(this)
-			.with(GBlockstate.when(FACING, Direction.DOWN),
-				GBlockstate.variant(model_id, true, R0, R0))
-			.with(GBlockstate.when(FACING, Direction.SOUTH),
-				GBlockstate.variant(model_id, true, R90, R0))
-			.with(GBlockstate.when(FACING, Direction.UP),
-				GBlockstate.variant(model_id, true, R180, R0))
-			.with(GBlockstate.when(FACING, Direction.NORTH),
-				GBlockstate.variant(model_id, true, R270, R0))
-			.with(GBlockstate.when(FACING, Direction.WEST),
-				GBlockstate.variant(model_id, true, R90, R90))
-			.with(GBlockstate.when(FACING, Direction.EAST),
-				GBlockstate.variant(model_id, true, R90, R270));
-	}
-
-	@Override
-	public void setRecipe(RecipeExporter exporter) {
-		RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 2);
-		ShapedRecipeJsonBuilder
-			.create(RecipeCategory.BUILDING_BLOCKS, this, 6)
-			.pattern("III")
-			.input('I', ReFramed.CUBE)
-			.criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-			.criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-			.offerTo(exporter);
+	public Map<Integer, Integer> getThemeMap(BlockState state, BlockState new_state) {
+		if (new_state.isOf(ReFramed.SLABS_CUBE)) return Map.of(1, state.get(FACING).getDirection() == Direction.AxisDirection.POSITIVE ? 2 : 1);
+		return super.getThemeMap(state, new_state);
 	}
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedSlabsCubeBlock.java

@@ -1,45 +1,26 @@
 package fr.adrien1106.reframed.block;
 
-import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import org.jetbrains.annotations.Nullable;
 
 import static fr.adrien1106.reframed.block.ReFramedSlabBlock.*;
-import static net.minecraft.data.client.VariantSettings.Rotation.R0;
-import static net.minecraft.data.client.VariantSettings.Rotation.R90;
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
 import static net.minecraft.state.property.Properties.AXIS;
 
-public class ReFramedSlabsCubeBlock extends ReFramedDoubleBlock implements BlockStateProvider {
+public class ReFramedSlabsCubeBlock extends ReFramedDoubleBlock {
 
     public ReFramedSlabsCubeBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(AXIS, Direction.Axis.Y));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return state.get(AXIS);
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 3;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(AXIS));
@@ -51,41 +32,27 @@ public class ReFramedSlabsCubeBlock extends ReFramedDoubleBlock implements Block
         return super.getPlacementState(ctx).with(AXIS, ctx.getSide().getAxis());
     }
 
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(AXIS, rotation.rotate(Direction.get(Direction.AxisDirection.POSITIVE, state.get(AXIS))).getAxis());
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(AXIS, mirror.apply(Direction.get(Direction.AxisDirection.POSITIVE, state.get(AXIS))).getAxis());
+    }
+
     @Override
     public VoxelShape getShape(BlockState state, int i) {
         return switch (state.get(AXIS)) {
             case Y -> i == 2 ? UP    : DOWN;
-            case Z -> i == 2 ? NORTH : SOUTH;
+            case Z -> i == 2 ? SOUTH : NORTH;
             case X -> i == 2 ? EAST  : WEST;
         };
     }
 
     @Override
     public int getTopThemeIndex(BlockState state) {
-        // when the side is shared just return one
-        return state.get(AXIS) == Direction.Axis.Y ? 2: super.getTopThemeIndex(state);
-    }
-
-    @Override
-    public MultipartBlockStateSupplier getMultipart() {
-        Identifier model_id = ReFramed.id("double_slab_special");
-        return MultipartBlockStateSupplier.create(this)
-            .with(GBlockstate.when(AXIS, Direction.Axis.Y),
-                GBlockstate.variant(model_id, true, R0, R0))
-            .with(GBlockstate.when(AXIS, Direction.Axis.Z),
-                GBlockstate.variant(model_id, true, R90, R0))
-            .with(GBlockstate.when(AXIS, Direction.Axis.X),
-                GBlockstate.variant(model_id, true, R90, R90));
-    }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE);
-        ShapelessRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .input(ReFramed.SLAB, 2)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
+        return 2;
     }
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubeBlock.java

@@ -1,35 +1,33 @@
 package fr.adrien1106.reframed.block;
 
 import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.VoxelHelper;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import fr.adrien1106.reframed.util.blocks.Corner;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.BlockStateSupplier;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import org.jetbrains.annotations.Nullable;
 
-import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
-import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER;
-import static fr.adrien1106.reframed.util.blocks.Corner.*;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import java.util.Map;
 
-public class ReFramedSmallCubeBlock extends WaterloggableReFramedBlock implements BlockStateProvider {
+import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.*;
+import static fr.adrien1106.reframed.util.blocks.Corner.*;
+import static net.minecraft.state.property.Properties.WATERLOGGED;
+
+public class ReFramedSmallCubeBlock extends WaterloggableReFramedBlock {
 
     public static final VoxelShape[] SMALL_CUBE_VOXELS;
 
@@ -38,23 +36,90 @@ public class ReFramedSmallCubeBlock extends WaterloggableReFramedBlock implement
         setDefaultState(getDefaultState().with(CORNER, NORTH_EAST_DOWN));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return state.get(CORNER);
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 8;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(CORNER));
     }
 
+    @Override
+    public boolean canReplace(BlockState state, ItemPlacementContext context) {
+        if (context.getPlayer() == null) return false;
+        Corner corner = state.get(CORNER);
+        return !(
+            context.getPlayer().isSneaking()
+                || !(context.getStack().getItem() instanceof BlockItem block_item)
+                || (
+                    !(
+                        block_item.getBlock() == ReFramed.HALF_STAIR
+                        && !(corner.hasDirection(context.getSide())
+                            || (corner.hasDirection(context.getSide().getOpposite())
+                                && BlockHelper.cursorMatchesFace(
+                                    getOutlineShape(state, context.getWorld(), context.getBlockPos(), null),
+                                    BlockHelper.getRelativePos(context.getHitPos(), context.getBlockPos())
+                                )
+                            )
+                        )
+                    )
+                    && !(
+                        block_item.getBlock() == this
+                        && (
+                            ((ReFramedSmallCubesStepBlock) ReFramed.SMALL_CUBES_STEP)
+                                .matchesShape(
+                                    context.getHitPos(),
+                                    context.getBlockPos(),
+                                    ReFramed.SMALL_CUBES_STEP.getDefaultState().with(EDGE, corner.getEdge(corner.getFirstDirection())),
+                                    corner.getFirstDirection().getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+                                )
+                            || ((ReFramedSmallCubesStepBlock) ReFramed.SMALL_CUBES_STEP)
+                                .matchesShape(
+                                    context.getHitPos(),
+                                    context.getBlockPos(),
+                                    ReFramed.SMALL_CUBES_STEP.getDefaultState().with(EDGE, corner.getEdge(corner.getSecondDirection())),
+                                    corner.getSecondDirection().getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+                                )
+                            || ((ReFramedSmallCubesStepBlock) ReFramed.SMALL_CUBES_STEP)
+                                .matchesShape(
+                                    context.getHitPos(),
+                                    context.getBlockPos(),
+                                    ReFramed.SMALL_CUBES_STEP.getDefaultState().with(EDGE, corner.getEdge(corner.getThirdDirection())),
+                                    corner.getThirdDirection().getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+                                )
+                        )
+                )
+            )
+        );
+    }
+
     @Override
     public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockPos pos = ctx.getBlockPos();
+        BlockState current_state = ctx.getWorld().getBlockState(pos);
+        if (current_state.isOf(ReFramed.HALF_STAIR))
+            return ReFramed.HALF_STAIRS_SLAB.getDefaultState()
+                .with(CORNER, current_state.get(CORNER))
+                .with(CORNER_FACE, current_state.get(CORNER_FACE))
+                .with(WATERLOGGED, current_state.get(WATERLOGGED));
+
+
+        if (current_state.isOf(this)) {
+            Vec3d hit = ctx.getHitPos();
+            Corner corner = current_state.get(CORNER);
+            ReFramedSmallCubesStepBlock block = ((ReFramedSmallCubesStepBlock) ReFramed.SMALL_CUBES_STEP);
+            BlockState state = block.getDefaultState()
+                .with(EDGE, corner.getEdge(corner.getFirstDirection()))
+                .with(WATERLOGGED, current_state.get(WATERLOGGED));
+            if (block.matchesShape(
+                hit, pos, state,
+                corner.getFirstDirection().getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+            )) return state;
+            state = state.with(EDGE, corner.getEdge(corner.getSecondDirection()));
+            if (block.matchesShape(
+                hit, pos, state,
+                corner.getSecondDirection().getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+            )) return state;
+            return state.with(EDGE, corner.getEdge(corner.getThirdDirection()));
+        }
+
         return super.getPlacementState(ctx).with(CORNER, BlockHelper.getPlacementCorner(ctx));
     }
 
@@ -64,36 +129,26 @@ public class ReFramedSmallCubeBlock extends WaterloggableReFramedBlock implement
     }
 
     @Override
-    public BlockStateSupplier getMultipart() {
-        Identifier small_cube_id = ReFramed.id("small_cube_special");
-        return MultipartBlockStateSupplier.create(this)
-            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN),
-                GBlockstate.variant(small_cube_id, true, R0, R0))
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN),
-                GBlockstate.variant(small_cube_id, true, R0, R90))
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN),
-                GBlockstate.variant(small_cube_id, true, R0, R180))
-            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN),
-                GBlockstate.variant(small_cube_id, true, R0, R270))
-            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP),
-                GBlockstate.variant(small_cube_id, true, R180, R0))
-            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP),
-                GBlockstate.variant(small_cube_id, true, R180, R90))
-            .with(GBlockstate.when(CORNER, WEST_NORTH_UP),
-                GBlockstate.variant(small_cube_id, true, R180, R180))
-            .with(GBlockstate.when(CORNER, NORTH_EAST_UP),
-                GBlockstate.variant(small_cube_id, true, R180, R270));
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(CORNER, state.get(CORNER).rotate(rotation));
     }
 
     @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 8);
-        ShapelessRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this, 8)
-            .input(ReFramed.CUBE)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(CORNER, state.get(CORNER).mirror(mirror));
+    }
+
+    @Override
+    public Map<Integer, Integer> getThemeMap(BlockState state, BlockState new_state) {
+        if (new_state.isOf(ReFramed.HALF_STAIRS_SLAB)) return Map.of(1, 2);
+        if (new_state.isOf(ReFramed.SMALL_CUBES_STEP))
+            return Map.of(
+                1,
+                state.get(CORNER)
+                    .getOtherDirection(new_state.get(EDGE))
+                    .getDirection() == Direction.AxisDirection.POSITIVE ? 2 : 1
+            );
+        return super.getThemeMap(state, new_state);
     }
 
     static {

src/main/java/fr/adrien1106/reframed/block/ReFramedSmallCubesStepBlock.java

@@ -1,24 +1,15 @@
 package fr.adrien1106.reframed.block;
 
-import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Corner;
 import fr.adrien1106.reframed.util.blocks.Edge;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.BlockStateSupplier;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
@@ -27,27 +18,15 @@ import org.jetbrains.annotations.Nullable;
 import static fr.adrien1106.reframed.block.ReFramedSmallCubeBlock.SMALL_CUBE_VOXELS;
 import static fr.adrien1106.reframed.block.ReFramedStepBlock.getStepShape;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
-import static fr.adrien1106.reframed.util.blocks.Edge.*;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
 import static net.minecraft.util.shape.VoxelShapes.empty;
 
-public class ReFramedSmallCubesStepBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider {
+public class ReFramedSmallCubesStepBlock extends WaterloggableReFramedDoubleBlock {
 
     public ReFramedSmallCubesStepBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(EDGE, Edge.NORTH_DOWN));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return state.get(EDGE);
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 12;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(EDGE));
@@ -60,7 +39,7 @@ public class ReFramedSmallCubesStepBlock extends WaterloggableReFramedDoubleBloc
     }
 
     @Override
-    public VoxelShape getCullingShape(BlockState state, BlockView view, BlockPos pos) {
+    public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
         return isGhost(view, pos) ? empty(): getStepShape(state.get(EDGE));
     }
 
@@ -69,6 +48,16 @@ public class ReFramedSmallCubesStepBlock extends WaterloggableReFramedDoubleBloc
         return getStepShape(state.get(EDGE));
     }
 
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(EDGE, state.get(EDGE).rotate(rotation));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(EDGE, state.get(EDGE).mirror(mirror));
+    }
+
     @Override
     public VoxelShape getShape(BlockState state, int i) {
         Edge edge = state.get(EDGE);
@@ -85,49 +74,4 @@ public class ReFramedSmallCubesStepBlock extends WaterloggableReFramedDoubleBloc
     public int getTopThemeIndex(BlockState state) {
         return 2;
     }
-
-    @Override
-    public BlockStateSupplier getMultipart() {
-        Identifier model_id = ReFramed.id("small_cubes_step_special");
-        Identifier reverse_model_id = ReFramed.id("small_cubes_step_reverse_special");
-        return MultipartBlockStateSupplier.create(this)
-            /* X AXIS */
-            .with(GBlockstate.when(EDGE, DOWN_EAST),
-                GBlockstate.variant(reverse_model_id, true, R0, R0))
-            .with(GBlockstate.when(EDGE, EAST_UP),
-                GBlockstate.variant(model_id, true, R180, R0))
-            .with(GBlockstate.when(EDGE, UP_WEST),
-                GBlockstate.variant(reverse_model_id, true, R180, R180))
-            .with(GBlockstate.when(EDGE, WEST_DOWN),
-                GBlockstate.variant(model_id, true, R0, R180))
-            /* Y AXIS */
-            .with(GBlockstate.when(EDGE, EAST_SOUTH),
-                GBlockstate.variant(model_id, true, R90, R0))
-            .with(GBlockstate.when(EDGE, SOUTH_WEST),
-                GBlockstate.variant(model_id, true, R90, R90))
-            .with(GBlockstate.when(EDGE, WEST_NORTH),
-                GBlockstate.variant(model_id, true, R90, R180))
-            .with(GBlockstate.when(EDGE, NORTH_EAST),
-                GBlockstate.variant(model_id, true, R90, R270))
-            /* Z AXIS */
-            .with(GBlockstate.when(EDGE, DOWN_SOUTH),
-                GBlockstate.variant(reverse_model_id, true, R0, R90))
-            .with(GBlockstate.when(EDGE, NORTH_DOWN),
-                GBlockstate.variant(model_id, true, R0, R270))
-            .with(GBlockstate.when(EDGE, UP_NORTH),
-                GBlockstate.variant(reverse_model_id, true, R180, R270))
-            .with(GBlockstate.when(EDGE, SOUTH_UP),
-                GBlockstate.variant(model_id, true, R180, R90));
-    }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 4);
-        ShapelessRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .input(ReFramed.SMALL_CUBE, 2)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedStairBlock.java

@@ -1,25 +1,18 @@
 package fr.adrien1106.reframed.block;
 
 import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.VoxelHelper;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Edge;
 import fr.adrien1106.reframed.util.blocks.StairShape;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.client.When;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.function.BooleanBiFunction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -30,39 +23,46 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Map;
 import java.util.stream.Stream;
 
 import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.STAIR_SHAPE;
-import static fr.adrien1106.reframed.util.blocks.Edge.*;
 import static fr.adrien1106.reframed.util.blocks.StairShape.*;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
 
-public class ReFramedStairBlock extends WaterloggableReFramedBlock implements BlockStateProvider {
+public class ReFramedStairBlock extends WaterloggableReFramedBlock {
 	public static final VoxelShape[] STAIR_VOXELS;
-	private record ModelCacheKey(Edge edge, StairShape shape) {}
 
 	public ReFramedStairBlock(Settings settings) {
 		super(settings);
 		setDefaultState(getDefaultState().with(EDGE, Edge.NORTH_DOWN).with(STAIR_SHAPE, STRAIGHT));
 	}
-
-	@Override
-	public Object getModelCacheKey(BlockState state) {
-		return new ModelCacheKey(state.get(EDGE), state.get(STAIR_SHAPE));
-	}
-
-	@Override
-	public int getModelStateCount() {
-		return 108; // Has 12 * 9 state combination and 52 models still reduces cache size
-	}
 	
 	@Override
 	protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
 		super.appendProperties(builder.add(EDGE, STAIR_SHAPE));
 	}
 
+	@Override
+	public boolean canReplace(BlockState state, ItemPlacementContext context) {
+        if (context.getPlayer() == null) return false;
+		return !(
+			context.getPlayer().isSneaking()
+			|| !(context.getStack().getItem() instanceof BlockItem block_item)
+			|| !(
+				block_item.getBlock() == ReFramed.STEP
+				&& ((ReFramedStairsCubeBlock) ReFramed.STAIRS_CUBE)
+					.matchesShape(
+						context.getHitPos(),
+						context.getBlockPos(),
+						state,
+						2
+					)
+			)
+		);
+	}
+
 	@Override
 	public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighbor_state, WorldAccess world, BlockPos pos, BlockPos moved) {
 		return super.getStateForNeighborUpdate(state, direction, neighbor_state, world, pos, moved)
@@ -70,11 +70,20 @@ public class ReFramedStairBlock extends WaterloggableReFramedBlock implements Bl
 	}
 
 	@Nullable
-	@Override // Pretty happy of how clean it is (also got it on first try :) )
+	@Override
 	public BlockState getPlacementState(ItemPlacementContext ctx) {
-		Edge face = BlockHelper.getPlacementEdge(ctx);
-		StairShape shape = BlockHelper.getStairsShape(face, ctx.getWorld(), ctx.getBlockPos());
-		return super.getPlacementState(ctx).with(EDGE, face).with(STAIR_SHAPE, shape);
+		BlockState current_state = ctx.getWorld().getBlockState(ctx.getBlockPos());
+		if (current_state.isOf(ReFramed.STEP)) {
+			Edge edge = current_state.get(EDGE).opposite();
+			StairShape shape = BlockHelper.getStairsShape(edge, ctx.getWorld(), ctx.getBlockPos());
+			return ReFramed.STAIRS_CUBE.getDefaultState()
+				.with(EDGE, edge)
+				.with(STAIR_SHAPE, shape);
+		}
+
+		Edge edge = BlockHelper.getPlacementEdge(ctx);
+		StairShape shape = BlockHelper.getStairsShape(edge, ctx.getWorld(), ctx.getBlockPos());
+		return super.getPlacementState(ctx).with(EDGE, edge).with(STAIR_SHAPE, shape);
 	}
 
 	@Override
@@ -89,250 +98,39 @@ public class ReFramedStairBlock extends WaterloggableReFramedBlock implements Bl
 		return getStairShape(state.get(EDGE), state.get(STAIR_SHAPE));
 	}
 
+	@Override
+	public BlockState rotate(BlockState state, BlockRotation rotation) {
+		Edge prev_edge = state.get(EDGE);
+		Edge edge = prev_edge.rotate(rotation);
+        if (prev_edge.getAxis() == Direction.Axis.Y) return state.with(EDGE, edge);
+
+        if (prev_edge.getFace().getDirection() == edge.getFace().getDirection()) // 90° rotations
+            state = state.with(STAIR_SHAPE, state.get(STAIR_SHAPE).mirror());
+        else state = state.with(STAIR_SHAPE, state.get(STAIR_SHAPE).flip());
+
+        if (prev_edge.getAxis() == edge.getAxis()) // 180° rotation
+            state = state.with(STAIR_SHAPE, state.get(STAIR_SHAPE).mirror());
+
+		return state.with(EDGE, edge);
+	}
+
+	@Override
+	public BlockState mirror(BlockState state, BlockMirror mirror) {
+		Edge prev_edge = state.get(EDGE);
+		Edge edge = prev_edge.mirror(mirror);
+		return state
+            .with(STAIR_SHAPE, prev_edge == edge ? state.get(STAIR_SHAPE).mirror() : state.get(STAIR_SHAPE).flip())
+            .with(EDGE, edge);
+	}
+
 	public static VoxelShape getStairShape(Edge edge, StairShape shape) {
 		return STAIR_VOXELS[edge.getID() * 9 + shape.getID()];
 	}
 
 	@Override
-	public MultipartBlockStateSupplier getMultipart() {
-		return getStairMultipart(this, false);
-	}
-
-	public static MultipartBlockStateSupplier getStairMultipart(Block block, boolean is_double) {
-		String infix = is_double ? "s_cube" : "";
-		Identifier straight_id = ReFramed.id("stair" + infix + "_special");
-		Identifier double_outer_id = ReFramed.id("outers_stair" + infix + "_special");
-		Identifier inner_id = ReFramed.id("inner_stair" + infix + "_special");
-		Identifier outer_id = ReFramed.id("outer_stair" + infix + "_special");
-		Identifier outer_side_id = ReFramed.id("outer_side_stair" + infix + "_special");
-		return MultipartBlockStateSupplier.create(block)
-			/* STRAIGHT X AXIS */
-			.with(GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R0, R0))
-			.with(GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R180, R0))
-			.with(GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R180, R180))
-			.with(GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R0, R180))
-			/* STRAIGHT Y AXIS */
-			.with(GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R90, R0))
-			.with(GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R90, R90))
-			.with(GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R90, R180))
-			.with(GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R90, R270))
-			/* STRAIGHT Z AXIS */
-			.with(GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R0, R90))
-			.with(GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R0, R270))
-			.with(GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R180, R270))
-			.with(GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, STRAIGHT),
-				GBlockstate.variant(straight_id, true, R180, R90))
-			/* INNER BOTTOM */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, INNER_RIGHT),
-			    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, INNER_LEFT)),
-				GBlockstate.variant(inner_id, true, R0, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, INNER_LEFT),
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, INNER_LEFT)),
-				GBlockstate.variant(inner_id, true, R0, R270))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, INNER_LEFT),
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, INNER_RIGHT)),
-				GBlockstate.variant(inner_id, true, R0, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, INNER_RIGHT)),
-				GBlockstate.variant(inner_id, true, R0, R90))
-			/* INNER TOP */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, INNER_LEFT),
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, INNER_LEFT),
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, INNER_LEFT)),
-				GBlockstate.variant(inner_id, true, R180, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, INNER_LEFT),
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, INNER_LEFT)),
-				GBlockstate.variant(inner_id, true, R180, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, INNER_LEFT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, INNER_RIGHT)),
-				GBlockstate.variant(inner_id, true, R180, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, INNER_RIGHT),
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, INNER_LEFT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, INNER_LEFT)),
-				GBlockstate.variant(inner_id, true, R180, R270))
-			/* OUTER BOTTOM */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
-				GBlockstate.variant(outer_id, true, R0, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
-				GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
-				GBlockstate.variant(outer_id, true, R0, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, FIRST_OUTER_RIGHT),
-				GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, FIRST_OUTER_LEFT)),
-				GBlockstate.variant(outer_id, true, R0, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, FIRST_OUTER_LEFT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, SECOND_OUTER_LEFT)),
-				GBlockstate.variant(outer_id, true, R0, R270))
-			/* OUTER TOP */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, FIRST_OUTER_LEFT)),
-				GBlockstate.variant(outer_id, true, R180, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, FIRST_OUTER_LEFT),
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
-				GBlockstate.variant(outer_id, true, R180, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, FIRST_OUTER_RIGHT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
-				GBlockstate.variant(outer_id, true, R180, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, SECOND_OUTER_LEFT)),
-				GBlockstate.variant(outer_id, true, R180, R270))
-			/* OUTER EAST */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R0, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R90, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, FIRST_OUTER_LEFT),
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, SECOND_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R180, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, FIRST_OUTER_RIGHT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, FIRST_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R270, R0))
-			/* OUTER SOUTH */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, SECOND_OUTER_RIGHT),
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R0, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, SECOND_OUTER_LEFT),
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R90, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, FIRST_OUTER_LEFT),
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, SECOND_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R180, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, FIRST_OUTER_RIGHT),
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, FIRST_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R270, R90))
-			/* OUTER WEST */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
-				GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, SECOND_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R0, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, FIRST_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R90, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, FIRST_OUTER_LEFT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R180, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, FIRST_OUTER_RIGHT),
-				GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R270, R180))
-			/* OUTER NORTH */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, SECOND_OUTER_RIGHT),
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, SECOND_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R0, R270))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, SECOND_OUTER_LEFT),
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, FIRST_OUTER_LEFT)),
-				GBlockstate.variant(outer_side_id, true, R90, R270))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, FIRST_OUTER_LEFT),
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R180, R270))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, FIRST_OUTER_RIGHT),
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
-				GBlockstate.variant(outer_side_id, true, R270, R270))
-			/* OUTER BOTTOM */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, OUTER_RIGHT)),
-				GBlockstate.variant(double_outer_id, true, R0, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, OUTER_RIGHT)),
-				GBlockstate.variant(double_outer_id, true, R0, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, OUTER_RIGHT)),
-				GBlockstate.variant(double_outer_id, true, R0, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, OUTER_RIGHT)),
-				GBlockstate.variant(double_outer_id, true, R0, R270))
-			/* OUTER TOP */
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, OUTER_LEFT)),
-				GBlockstate.variant(double_outer_id, true, R180, R0))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, OUTER_LEFT)),
-				GBlockstate.variant(double_outer_id, true, R180, R90))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, OUTER_LEFT)),
-				GBlockstate.variant(double_outer_id, true, R180, R180))
-			.with(When.anyOf(
-				GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, OUTER_RIGHT),
-				GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, OUTER_LEFT),
-				GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, OUTER_LEFT)),
-				GBlockstate.variant(double_outer_id, true, R180, R270));
-	}
-
-	@Override
-	public void setRecipe(RecipeExporter exporter) {
-		RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE);
-		ShapedRecipeJsonBuilder
-			.create(RecipeCategory.BUILDING_BLOCKS, this, 4)
-			.pattern("I  ")
-			.pattern("II ")
-			.pattern("III")
-			.input('I', ReFramed.CUBE)
-			.criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-			.criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-			.offerTo(exporter);
+	public Map<Integer, Integer> getThemeMap(BlockState state, BlockState new_state) {
+		if (new_state.isOf(ReFramed.STAIRS_CUBE)) return Map.of(1, 1);
+		return super.getThemeMap(state, new_state);
 	}
 
 	static {
@@ -382,51 +180,51 @@ public class ReFramedStairBlock extends WaterloggableReFramedBlock implements Bl
 			.add(25, VoxelHelper::rotateCX).add(26, VoxelHelper::rotateCX)
 			// WEST_DOWN
 			.add(0, VoxelHelper::rotateCY)
-			.add(10).add(1)
-			.add(12).add(3)
-			.add(16).add(5)
-			.add(7, VoxelHelper::rotateCY).add(8, VoxelHelper::rotateCY)
+			.add(1).add(10)
+			.add(3).add(12)
+			.add(5).add(16)
+			.add(8, VoxelHelper::rotateCY).add(7, VoxelHelper::rotateCY)
 			// DOWN_EAST
 			.add(36, VoxelHelper::rotateZ)
-			.add(11).add(2)
-			.add(13).add(4)
+			.add(2).add(11)
+			.add(4).add(13)
 			.add(41, VoxelHelper::rotateZ).add(42, VoxelHelper::rotateZ)
-			.add(17).add(6)
+			.add(6).add(17)
 			// EAST_UP
 			.add(45, VoxelHelper::rotateZ)
-			.add(20).add(29)
-			.add(22).add(31)
-			.add(24).add(35)
+			.add(29).add(20)
+			.add(31).add(22)
+			.add(35).add(24)
 			.add(52, VoxelHelper::rotateZ).add(53, VoxelHelper::rotateZ)
 			// UP_WEST
 			.add(54, VoxelHelper::rotateZ)
-			.add(19).add(28)
-			.add(21).add(30)
+			.add(28).add(19)
+			.add(30).add(21)
 			.add(59, VoxelHelper::rotateZ).add(60, VoxelHelper::rotateZ)
-			.add(23).add(34)
+			.add(34).add(23)
 			// WEST_NORTH
 			.add(0, VoxelHelper::rotateCZ)
 			.add(1).add(28)
 			.add(3).add(30)
 			.add(7).add(32)
-			.add(44).add(69)
+			.add(43).add(68)
 			// NORTH_EAST
 			.add(72, VoxelHelper::rotateY)
 			.add(2).add(29)
 			.add(4).add(31)
-			.add(51).add(62)
+			.add(50).add(61)
 			.add(8).add(33)
 			// EAST_SOUTH
 			.add(81, VoxelHelper::rotateY)
 			.add(11).add(20)
 			.add(13).add(22)
 			.add(15).add(26)
-			.add(50).add(61)
+			.add(51).add(62)
 			// SOUTH_WEST
 			.add(90, VoxelHelper::rotateY)
 			.add(10).add(19)
 			.add(12).add(21)
-			.add(43).add(68)
+			.add(44).add(69)
 			.add(14).add(25)
 			.build();
 	}

src/main/java/fr/adrien1106/reframed/block/ReFramedStairsCubeBlock.java

@@ -1,20 +1,14 @@
 package fr.adrien1106.reframed.block;
 
-import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Edge;
 import fr.adrien1106.reframed.util.blocks.StairShape;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
@@ -27,26 +21,15 @@ import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.STAIR_SHAPE;
 
-public class ReFramedStairsCubeBlock extends ReFramedDoubleBlock implements BlockStateProvider {
+public class ReFramedStairsCubeBlock extends ReFramedDoubleBlock {
 
     private static final VoxelShape[] STAIRS_CUBE_VOXELS = VoxelListBuilder.buildFrom(STAIR_VOXELS);
-    private record ModelCacheKey(Edge edge, StairShape shape) {}
 
     public ReFramedStairsCubeBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(EDGE, Edge.NORTH_DOWN).with(STAIR_SHAPE, StairShape.STRAIGHT));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return new ModelCacheKey(state.get(EDGE), state.get(STAIR_SHAPE));
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 108; // Has 12 * 9 state combination and 52 models still reduces cache size
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(EDGE, STAIR_SHAPE));
@@ -67,6 +50,32 @@ public class ReFramedStairsCubeBlock extends ReFramedDoubleBlock implements Bloc
         return super.getPlacementState(ctx).with(EDGE, face).with(STAIR_SHAPE, shape);
     }
 
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        Edge prev_edge = state.get(EDGE);
+        Edge edge = prev_edge.rotate(rotation);
+        if (prev_edge.getAxis() == Direction.Axis.Y) return state.with(EDGE, edge);
+
+        if (prev_edge.getFace().getDirection() == edge.getFace().getDirection()) // 90° rotations
+            state = state.with(STAIR_SHAPE, state.get(STAIR_SHAPE).mirror());
+        else state = state.with(STAIR_SHAPE, state.get(STAIR_SHAPE).flip());
+
+        if (prev_edge.getAxis() == edge.getAxis()) // 180° rotation
+            state = state.with(STAIR_SHAPE, state.get(STAIR_SHAPE).mirror());
+
+        return state.with(EDGE, edge);
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        Edge prev_edge = state.get(EDGE);
+        Edge edge = prev_edge.mirror(mirror);
+        return state
+            .with(STAIR_SHAPE, prev_edge == edge ? state.get(STAIR_SHAPE).mirror() : state.get(STAIR_SHAPE).flip())
+            .with(EDGE, edge);
+    }
+
     @Override
     public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
         super.onStateReplaced(state, world, pos, newState, moved);
@@ -80,21 +89,4 @@ public class ReFramedStairsCubeBlock extends ReFramedDoubleBlock implements Bloc
         StairShape shape = state.get(STAIR_SHAPE);
         return i == 2 ? STAIRS_CUBE_VOXELS[edge.getID() * 9 + shape.getID()] : getStairShape(edge, shape);
     }
-
-    @Override
-    public MultipartBlockStateSupplier getMultipart() {
-        return getStairMultipart(this, true);
-    }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE);
-        ShapelessRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .input(ReFramed.STAIR)
-            .input(ReFramed.STEP)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedStepBlock.java

@@ -1,35 +1,33 @@
 package fr.adrien1106.reframed.block;
 
 import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.VoxelHelper;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Edge;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.BlockStateSupplier;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Map;
+
 import static fr.adrien1106.reframed.util.VoxelHelper.VoxelListBuilder;
 import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
-import static fr.adrien1106.reframed.util.blocks.Edge.*;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.STAIR_SHAPE;
+import static net.minecraft.state.property.Properties.*;
+import static net.minecraft.state.property.Properties.WATERLOGGED;
 
-public class ReFramedStepBlock extends WaterloggableReFramedBlock implements BlockStateProvider {
+public class ReFramedStepBlock extends WaterloggableReFramedBlock {
 
     public static final VoxelShape[] STEP_VOXELS;
 
@@ -38,24 +36,90 @@ public class ReFramedStepBlock extends WaterloggableReFramedBlock implements Blo
         setDefaultState(getDefaultState().with(EDGE, Edge.NORTH_DOWN));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return state.get(EDGE);
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 12;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(EDGE));
     }
 
+    @Override
+    public boolean canReplace(BlockState state, ItemPlacementContext context) {
+        if (context.getPlayer() == null) return false;
+        Edge edge = state.get(EDGE);
+        return !(
+            context.getPlayer().isSneaking()
+            || !(context.getStack().getItem() instanceof BlockItem block_item)
+            || (
+                !(
+                    block_item.getBlock() == ReFramed.STAIR
+                    && ((ReFramedStairsCubeBlock) ReFramed.STAIRS_CUBE)
+                        .matchesShape(
+                            context.getHitPos(),
+                            context.getBlockPos(),
+                            ReFramed.STAIRS_CUBE.getDefaultState().with(EDGE, edge.opposite()),
+                            1
+                        )
+
+                )
+                && !(
+                    block_item.getBlock() == this
+                    && (
+                        ((ReFramedStepsSlabBlock) ReFramed.STEPS_SLAB)
+                            .matchesShape(
+                                context.getHitPos(),
+                                context.getBlockPos(),
+                                ReFramed.STEPS_SLAB.getDefaultState()
+                                    .with(FACING, edge.getFirstDirection())
+                                    .with(AXIS, edge.getSecondDirection().getAxis()),
+                                edge.getSecondDirection().getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+                            )
+                        || ((ReFramedStepsSlabBlock) ReFramed.STEPS_SLAB)
+                            .matchesShape(
+                                context.getHitPos(),
+                                context.getBlockPos(),
+                                ReFramed.STEPS_SLAB.getDefaultState()
+                                    .with(FACING, edge.getSecondDirection())
+                                    .with(AXIS, edge.getFirstDirection().getAxis()),
+                                edge.getFirstDirection().getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+                            )
+                    )
+                )
+            )
+        );
+    }
+
     @Nullable
     @Override
     public BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockPos pos = ctx.getBlockPos();
+        BlockState current_state = ctx.getWorld().getBlockState(pos);
+        if (current_state.isOf(ReFramed.STAIR))
+            return ReFramed.STAIRS_CUBE.getDefaultState()
+                .with(EDGE, current_state.get(EDGE))
+                .with(STAIR_SHAPE, current_state.get(STAIR_SHAPE));
+
+
+        if (current_state.isOf(this)) {
+            Vec3d hit = ctx.getHitPos();
+            Edge edge = current_state.get(EDGE);
+            Direction dir = edge.getFirstDirection();
+            ReFramedStepsSlabBlock block = ((ReFramedStepsSlabBlock) ReFramed.STEPS_SLAB);
+            BlockState state = block.getDefaultState()
+                .with(FACING, dir)
+                .with(AXIS, edge.getOtherDirection(dir).getAxis())
+                .with(WATERLOGGED, current_state.get(WATERLOGGED));
+            if (!block.matchesShape(
+                hit, pos,
+                state,
+                edge.getOtherDirection(dir).getDirection() == Direction.AxisDirection.POSITIVE ? 1 : 2
+            )) {
+                dir = edge.getSecondDirection();
+                state = state
+                    .with(FACING, dir)
+                    .with(AXIS, edge.getOtherDirection(dir).getAxis());
+            }
+            return state;
+        }
+
         return super.getPlacementState(ctx).with(EDGE, BlockHelper.getPlacementEdge(ctx));
     }
 
@@ -64,53 +128,31 @@ public class ReFramedStepBlock extends WaterloggableReFramedBlock implements Blo
         return getStepShape(state.get(EDGE));
     }
 
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(EDGE, state.get(EDGE).rotate(rotation));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(EDGE, state.get(EDGE).mirror(mirror));
+    }
+
     public static VoxelShape getStepShape(Edge edge) {
         return STEP_VOXELS[edge.getID()];
     }
 
     @Override
-    public BlockStateSupplier getMultipart() {
-        Identifier model_id = ReFramed.id("step_special");
-        return MultipartBlockStateSupplier.create(this)
-            /* X AXIS */
-            .with(GBlockstate.when(EDGE, DOWN_EAST),
-                GBlockstate.variant(model_id, true, R0, R0))
-            .with(GBlockstate.when(EDGE, EAST_UP),
-                GBlockstate.variant(model_id, true, R180, R0))
-            .with(GBlockstate.when(EDGE, UP_WEST),
-                GBlockstate.variant(model_id, true, R180, R180))
-            .with(GBlockstate.when(EDGE, WEST_DOWN),
-                GBlockstate.variant(model_id, true, R0, R180))
-            /* Y AXIS */
-            .with(GBlockstate.when(EDGE, EAST_SOUTH),
-                GBlockstate.variant(model_id, true, R90, R0))
-            .with(GBlockstate.when(EDGE, SOUTH_WEST),
-                GBlockstate.variant(model_id, true, R90, R90))
-            .with(GBlockstate.when(EDGE, WEST_NORTH),
-                GBlockstate.variant(model_id, true, R90, R180))
-            .with(GBlockstate.when(EDGE, NORTH_EAST),
-                GBlockstate.variant(model_id, true, R90, R270))
-            /* Z AXIS */
-            .with(GBlockstate.when(EDGE, DOWN_SOUTH),
-                GBlockstate.variant(model_id, true, R0, R90))
-            .with(GBlockstate.when(EDGE, NORTH_DOWN),
-                GBlockstate.variant(model_id, true, R0, R270))
-            .with(GBlockstate.when(EDGE, UP_NORTH),
-                GBlockstate.variant(model_id, true, R180, R270))
-            .with(GBlockstate.when(EDGE, SOUTH_UP),
-                GBlockstate.variant(model_id, true, R180, R90));
-    }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 4);
-        ShapedRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this, 8)
-            .pattern("II")
-            .input('I', ReFramed.CUBE)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
+    public Map<Integer, Integer> getThemeMap(BlockState state, BlockState new_state) {
+        if (new_state.isOf(ReFramed.STAIRS_CUBE)) return Map.of(1, 2);
+        if (new_state.isOf(ReFramed.STEPS_SLAB))
+            return Map.of(
+                1,
+                state.get(EDGE)
+                    .getOtherDirection(new_state.get(FACING))
+                    .getDirection() == Direction.AxisDirection.POSITIVE ? 2 : 1
+            );
+        return super.getThemeMap(state, new_state);
     }
 
     static {

src/main/java/fr/adrien1106/reframed/block/ReFramedStepsSlabBlock.java

@@ -1,22 +1,14 @@
 package fr.adrien1106.reframed.block;
 
-import fr.adrien1106.reframed.ReFramed;
-import fr.adrien1106.reframed.generator.BlockStateProvider;
-import fr.adrien1106.reframed.generator.GBlockstate;
 import fr.adrien1106.reframed.util.blocks.BlockHelper;
 import fr.adrien1106.reframed.util.blocks.Edge;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.data.client.MultipartBlockStateSupplier;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.RecipeProvider;
-import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Direction.Axis;
@@ -27,29 +19,17 @@ import org.jetbrains.annotations.Nullable;
 
 import static fr.adrien1106.reframed.block.ReFramedSlabBlock.getSlabShape;
 import static fr.adrien1106.reframed.block.ReFramedStepBlock.getStepShape;
-import static net.minecraft.data.client.VariantSettings.Rotation.*;
 import static net.minecraft.state.property.Properties.AXIS;
 import static net.minecraft.state.property.Properties.FACING;
 import static net.minecraft.util.shape.VoxelShapes.empty;
 
-public class ReFramedStepsSlabBlock extends WaterloggableReFramedDoubleBlock implements BlockStateProvider {
-    private record ModelCacheKey(Direction facing, Axis axis) {}
+public class ReFramedStepsSlabBlock extends WaterloggableReFramedDoubleBlock {
 
     public ReFramedStepsSlabBlock(Settings settings) {
         super(settings);
         setDefaultState(getDefaultState().with(FACING, Direction.DOWN).with(AXIS, Axis.X));
     }
 
-    @Override
-    public Object getModelCacheKey(BlockState state) {
-        return new ModelCacheKey(state.get(FACING), state.get(AXIS));
-    }
-
-    @Override
-    public int getModelStateCount() {
-        return 18;
-    }
-
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         super.appendProperties(builder.add(FACING, AXIS));
@@ -64,7 +44,7 @@ public class ReFramedStepsSlabBlock extends WaterloggableReFramedDoubleBlock imp
     }
 
     @Override
-    public VoxelShape getCullingShape(BlockState state, BlockView view, BlockPos pos) {
+    public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
         return isGhost(view, pos) ? empty() : getSlabShape(state.get(FACING));
     }
 
@@ -73,6 +53,21 @@ public class ReFramedStepsSlabBlock extends WaterloggableReFramedDoubleBlock imp
         return getSlabShape(state.get(FACING));
     }
 
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state
+            .with(AXIS, rotation.rotate(Direction.get(Direction.AxisDirection.POSITIVE, state.get(AXIS))).getAxis())
+            .with(FACING, rotation.rotate(state.get(FACING)));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        if (state.get(FACING).getAxis() != Axis.Y)
+            return state.with(FACING, mirror.apply(state.get(FACING)));
+
+        return state;
+    }
+
     @Override
     public VoxelShape getShape(BlockState state, int i) {
         Axis axis = state.get(AXIS);
@@ -81,7 +76,7 @@ public class ReFramedStepsSlabBlock extends WaterloggableReFramedDoubleBlock imp
             switch (axis) {
                 case X -> i == 1 ? Direction.WEST : Direction.EAST;
                 case Y -> i == 1 ? Direction.DOWN : Direction.UP;
-                case Z -> i == 1 ? Direction.SOUTH : Direction.NORTH;
+                case Z -> i == 1 ? Direction.NORTH : Direction.SOUTH;
             }
         ));
     }
@@ -90,47 +85,4 @@ public class ReFramedStepsSlabBlock extends WaterloggableReFramedDoubleBlock imp
     public int getTopThemeIndex(BlockState state) {
         return 2;
     }
-
-    @Override
-    public MultipartBlockStateSupplier getMultipart() {
-        Identifier step_id = ReFramed.id("steps_slab_special");
-        Identifier step_side_id = ReFramed.id("steps_slab_side_special");
-        return MultipartBlockStateSupplier.create(this)
-            .with(GBlockstate.when(FACING, Direction.DOWN, AXIS, Axis.X),
-                GBlockstate.variant(step_id, true, R0, R180))
-            .with(GBlockstate.when(FACING, Direction.DOWN, AXIS, Axis.Z),
-                GBlockstate.variant(step_id, true, R0, R90))
-            .with(GBlockstate.when(FACING, Direction.UP, AXIS, Axis.X),
-                GBlockstate.variant(step_id, true, R180, R180))
-            .with(GBlockstate.when(FACING, Direction.UP, AXIS, Axis.Z),
-                GBlockstate.variant(step_id, true, R180, R90))
-
-            .with(GBlockstate.when(FACING, Direction.EAST, AXIS, Axis.Z),
-                GBlockstate.variant(step_side_id, true, R180, R0))
-            .with(GBlockstate.when(FACING, Direction.EAST, AXIS, Axis.Y),
-                GBlockstate.variant(step_side_id, true, R90, R0))
-            .with(GBlockstate.when(FACING, Direction.SOUTH, AXIS, Axis.X),
-                GBlockstate.variant(step_side_id, true, R180, R90))
-            .with(GBlockstate.when(FACING, Direction.SOUTH, AXIS, Axis.Y),
-                GBlockstate.variant(step_side_id, true, R90, R90))
-            .with(GBlockstate.when(FACING, Direction.WEST, AXIS, Axis.Z),
-                GBlockstate.variant(step_side_id, true, R0, R180))
-            .with(GBlockstate.when(FACING, Direction.WEST, AXIS, Axis.Y),
-                GBlockstate.variant(step_side_id, true, R90, R180))
-            .with(GBlockstate.when(FACING, Direction.NORTH, AXIS, Axis.X),
-                GBlockstate.variant(step_side_id, true, R0, R270))
-            .with(GBlockstate.when(FACING, Direction.NORTH, AXIS, Axis.Y),
-                GBlockstate.variant(step_side_id, true, R90, R270));
-    }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, this, ReFramed.CUBE, 2);
-        ShapelessRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .input(ReFramed.STEP, 2)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/block/ReFramedTrapdoorBlock.java

@@ -0,0 +1,159 @@
+package fr.adrien1106.reframed.block;
+
+import fr.adrien1106.reframed.util.VoxelHelper;
+import net.minecraft.block.*;
+import net.minecraft.block.enums.BlockHalf;
+import net.minecraft.entity.ai.pathing.NavigationType;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.fluid.Fluids;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.state.StateManager;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.event.GameEvent;
+import net.minecraft.world.explosion.Explosion;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiConsumer;
+
+import static net.minecraft.state.property.Properties.*;
+
+public class ReFramedTrapdoorBlock extends WaterloggableReFramedBlock {
+
+    public static final VoxelShape[] TRAPDOOR_VOXELS;
+
+    public ReFramedTrapdoorBlock(Settings settings) {
+        super(settings);
+        setDefaultState(getDefaultState()
+            .with(HORIZONTAL_FACING, Direction.NORTH)
+            .with(BLOCK_HALF, BlockHalf.BOTTOM)
+            .with(OPEN, false)
+            .with(POWERED, false)
+        );
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder.add(HORIZONTAL_FACING, BLOCK_HALF, OPEN, POWERED));
+    }
+
+    @Override
+    public void neighborUpdate(BlockState state, World world, BlockPos pos, Block source, BlockPos sourcePos, boolean notify) {
+        if (world.isClient) return;
+        boolean powered = world.isReceivingRedstonePower(pos);
+        if (powered != state.get(POWERED)) {
+            if (state.get(OPEN) != powered) {
+                state = state.with(OPEN, powered);
+                playToggleSound(null, world, pos, powered);
+            }
+
+            world.setBlockState(pos, state.with(POWERED, powered), 2);
+            if (state.get(WATERLOGGED)) {
+                world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world));
+            }
+        }
+    }
+
+    @Override
+    public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockState state = super.getPlacementState(ctx);
+        World world = ctx.getWorld();
+        BlockPos pos = ctx.getBlockPos();
+        Direction side = ctx.getSide();
+
+        if (side.getAxis().isVertical()) state = state
+            .with(HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite())
+            .with(BLOCK_HALF, side == Direction.UP ? BlockHalf.BOTTOM : BlockHalf.TOP);
+        else state = state
+            .with(HORIZONTAL_FACING, side)
+            .with(BLOCK_HALF, ctx.getHitPos().getY() - pos.getY() > 0.5 ? BlockHalf.TOP : BlockHalf.BOTTOM);
+
+        if (world.isReceivingRedstonePower(pos)) state = state.with(OPEN, true).with(POWERED, true);
+
+        return state;
+    }
+
+    @Override
+    public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
+        super.onStateReplaced(state, world, pos, newState, moved);
+
+        if(!state.isOf(newState.getBlock())) world.removeBlockEntity(pos);
+    }
+
+    @Override
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        ActionResult result = super.onUse(state, world, pos, player, hand, hit);
+        if (result.isAccepted()) return result;
+        flip(state, world, pos, player);
+        return ActionResult.success(world.isClient);
+    }
+
+    @Override
+    public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) {
+        return switch (type) {
+            case LAND, AIR -> state.get(OPEN);
+            case WATER -> state.get(WATERLOGGED);
+        };
+    }
+
+    @Override
+    public void onExploded(BlockState state, World world, BlockPos pos, Explosion explosion, BiConsumer<ItemStack, BlockPos> stack_merger) {
+        if (explosion.getDestructionType() == Explosion.DestructionType.TRIGGER_BLOCK
+                && !world.isClient()
+                && !state.get(POWERED)
+        ) flip(state, world, pos, null);
+
+        super.onExploded(state, world, pos, explosion, stack_merger);
+    }
+
+    private void flip(BlockState state, World world, BlockPos pos, @Nullable PlayerEntity player) {
+        state = state.cycle(OPEN);
+        world.setBlockState(pos, state, 2);
+
+        this.playToggleSound(player, world, pos, state.get(OPEN));
+    }
+
+    protected void playToggleSound(@Nullable PlayerEntity player, World world, BlockPos pos, boolean open) {
+        world.playSound(player, pos, open ? BlockSetType.OAK.trapdoorOpen() : BlockSetType.OAK.trapdoorClose(), SoundCategory.BLOCKS, 1.0F, world.getRandom().nextFloat() * 0.1F + 0.9F);
+        world.emitGameEvent(player, open ? GameEvent.BLOCK_OPEN : GameEvent.BLOCK_CLOSE, pos);
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        int index;
+        if (!state.get(OPEN)) index = state.get(BLOCK_HALF) == BlockHalf.BOTTOM ? 0 : 1;
+        else index = state.get(HORIZONTAL_FACING).ordinal();
+        return TRAPDOOR_VOXELS[index];
+    }
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return state.with(HORIZONTAL_FACING, rotation.rotate(state.get(HORIZONTAL_FACING)));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(HORIZONTAL_FACING, mirror.apply(state.get(HORIZONTAL_FACING)));
+    }
+
+    static {
+        VoxelShape SHAPE = createCuboidShape(0, 0, 0, 16, 3, 16);
+        TRAPDOOR_VOXELS = VoxelHelper.VoxelListBuilder.create(SHAPE, 6)
+            .add(VoxelHelper::mirrorY)
+            .add(VoxelHelper::rotateX)
+            .add(VoxelHelper::mirrorZ)
+            .add(VoxelHelper::rotateY)
+            .add(VoxelHelper::mirrorX)
+            .build();
+    }
+}

src/main/java/fr/adrien1106/reframed/block/ReFramedWallBlock.java

@@ -0,0 +1,212 @@
+package fr.adrien1106.reframed.block;
+
+import fr.adrien1106.reframed.util.VoxelHelper;
+import net.minecraft.block.*;
+import net.minecraft.block.enums.WallShape;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.Property;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.function.BooleanBiFunction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.WorldView;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static net.minecraft.state.property.Properties.*;
+
+public class ReFramedWallBlock extends WaterloggableReFramedBlock {
+
+    public static final VoxelShape[] WALL_VOXELS;
+
+    public ReFramedWallBlock(Settings settings) {
+        super(settings);
+        setDefaultState(getDefaultState()
+            .with(UP, true)
+            .with(EAST_WALL_SHAPE, WallShape.NONE)
+            .with(NORTH_WALL_SHAPE, WallShape.NONE)
+            .with(WEST_WALL_SHAPE, WallShape.NONE)
+            .with(SOUTH_WALL_SHAPE, WallShape.NONE)
+        );
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder.add(UP, EAST_WALL_SHAPE, NORTH_WALL_SHAPE, SOUTH_WALL_SHAPE, WEST_WALL_SHAPE));
+    }
+
+    @Override
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction dir, BlockState other_state, WorldAccess world, BlockPos pos, BlockPos moved) {
+        BlockState new_state = super.getStateForNeighborUpdate(state, dir, other_state, world, pos, moved);
+        if (dir == Direction.DOWN) return new_state;
+        BlockState top_state = dir == Direction.UP? other_state: world.getBlockState(pos.up());
+        boolean fs = top_state.isSideSolidFullSquare(world, pos.up(), Direction.DOWN);
+        VoxelShape top_shape = fs ? null : top_state.getCollisionShape(world, pos.up()).getFace(Direction.DOWN);
+
+        Map<Direction, BlockState> neighbors = Direction.Type.HORIZONTAL.stream()
+            .collect(Collectors.toMap(d -> d, d -> {
+                if (d == dir) return other_state;
+                return world.getBlockState(pos.offset(d));
+            }));
+        new_state = getWallState(new_state, top_state, neighbors, top_shape, fs, world, pos);
+        return new_state.with(UP, shouldHavePost(new_state, top_state, top_shape));
+    }
+
+    @Override
+    public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockState state = super.getPlacementState(ctx);
+        World world = ctx.getWorld();
+        BlockPos pos = ctx.getBlockPos();
+
+        BlockState top_state = world.getBlockState(pos.up());
+        boolean fs = top_state.isSideSolidFullSquare(world, pos.up(), Direction.DOWN);
+        VoxelShape top_shape = fs ? null : top_state.getCollisionShape(world, pos.up()).getFace(Direction.DOWN);
+
+        Map<Direction, BlockState> neighbors = Direction.Type.HORIZONTAL.stream()
+            .collect(Collectors.toMap(d -> d, d -> world.getBlockState(pos.offset(d))));
+        state = getWallState(state, top_state, neighbors, top_shape, fs, world, pos);
+        return state.with(UP, shouldHavePost(state, top_state, top_shape));
+    }
+
+    @Override
+    public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState new_state, boolean moved) {
+        super.onStateReplaced(state, world, pos, new_state, moved);
+
+        if(!state.isOf(new_state.getBlock())) world.removeBlockEntity(pos);
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+        VoxelShape shape = state.get(UP) ? WALL_VOXELS[0]: VoxelShapes.empty();
+        for (Direction dir : Direction.Type.HORIZONTAL) {
+            WallShape wall_shape = state.get(getWallShape(dir));
+            if (wall_shape != WallShape.NONE)
+                shape = VoxelShapes.union(shape, WALL_VOXELS[1 + (wall_shape.ordinal()-1) * 4 + (dir.ordinal() - 2)]);
+        }
+        return shape;
+    }
+
+    @Override
+    public VoxelShape getCollisionShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ctx) {
+        if (isGhost(view, pos)) return VoxelShapes.empty();
+        VoxelShape shape = state.get(UP) ? WALL_VOXELS[9]: VoxelShapes.empty();
+        for (Direction dir : Direction.Type.HORIZONTAL) {
+            if (state.get(getWallShape(dir)) != WallShape.NONE)
+                shape = VoxelShapes.union(shape, WALL_VOXELS[8 + dir.ordinal()]);
+        }
+        return shape;
+    }
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return Direction.Type.HORIZONTAL.stream().reduce(state, (s, dir) ->
+                s.with(getWallShape(rotation.rotate(dir)), state.get(getWallShape(dir)))
+            , (prev, next) -> next);
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return Direction.Type.HORIZONTAL.stream().reduce(state, (s, dir) ->
+                s.with(getWallShape(mirror.apply(dir)), state.get(getWallShape(dir)))
+            , (prev, next) -> next);
+    }
+
+    public static BlockState getWallState(BlockState state, BlockState top_state, Map<Direction, BlockState> neighbors, VoxelShape top_shape, boolean fs, WorldView world, BlockPos pos) {
+        for (Direction dir : Direction.Type.HORIZONTAL) {
+            BlockPos offset = pos.offset(dir);
+            BlockState neighbor = neighbors.get(dir);
+            boolean side_full = neighbor.isSideSolidFullSquare(world, offset, dir.getOpposite());
+            Property<WallShape> wall_shape = getWallShape(dir);
+            if (shouldConnectTo(neighbor, side_full, dir.getOpposite())) {
+                state = state.with(
+                    wall_shape,
+                    fs
+                        || (top_state.contains(wall_shape) && top_state.get(wall_shape) != WallShape.NONE)
+                        || shouldUseTall(WALL_VOXELS[dir.ordinal() + 3], top_shape)
+                        ? WallShape.TALL
+                        : WallShape.LOW
+                );
+            } else state = state.with(wall_shape, WallShape.NONE);
+        }
+        return state;
+    }
+
+    public static boolean shouldHavePost(BlockState state, BlockState top_state, VoxelShape top_shape) {
+        // above has post
+        if ((top_state.contains(UP) && top_state.get(UP)) || (!top_state.contains(UP) && top_state.contains(NORTH_WALL_SHAPE))) return true;
+
+        if (Stream.of(Direction.SOUTH, Direction.EAST) // Opposites are different
+            .anyMatch(dir -> state.get(getWallShape(dir)) != state.get(getWallShape(dir.getOpposite())))
+        ) return true;
+
+        // no sides
+        if (Direction.Type.HORIZONTAL.stream().allMatch(dir -> state.get(getWallShape(dir)) == WallShape.NONE))
+            return true;
+
+        // Matching sides
+        if (Stream.of(Direction.SOUTH, Direction.EAST)
+            .anyMatch(dir ->
+                   state.get(getWallShape(dir)) == state.get(getWallShape(dir.getOpposite()))
+            )) return false;
+
+        return top_state.isIn(BlockTags.WALL_POST_OVERRIDE) || top_shape == null || shouldUseTall(WALL_VOXELS[0], top_shape);
+    }
+
+    public static boolean shouldConnectTo(BlockState state, boolean side_full, Direction side) {
+        Block block = state.getBlock();
+        boolean bl = block instanceof FenceGateBlock && FenceGateBlock.canWallConnect(state, side);
+        return state.isIn(BlockTags.WALLS) || !WallBlock.cannotConnect(state) && side_full || block instanceof PaneBlock || bl;
+    }
+
+    public static boolean shouldUseTall(VoxelShape self_shape, VoxelShape other_shape) {
+        return !VoxelShapes.matchesAnywhere(
+            self_shape,
+            other_shape,
+            BooleanBiFunction.ONLY_FIRST
+        );
+    }
+
+    public static Property<WallShape> getWallShape(Direction dir) {
+        return switch (dir) {
+            case EAST -> EAST_WALL_SHAPE;
+            case NORTH -> NORTH_WALL_SHAPE;
+            case WEST -> WEST_WALL_SHAPE;
+            case SOUTH -> SOUTH_WALL_SHAPE;
+            default -> null;
+        };
+    }
+
+    static {
+        VoxelShape POST = createCuboidShape(4, 0, 4, 12, 16, 12);
+        VoxelShape POST_COLLISION = createCuboidShape(4, 0, 4, 12, 24, 12);
+        VoxelShape LOW = createCuboidShape(5, 0, 0, 11, 14, 8);
+        VoxelShape TALL = createCuboidShape(5, 0, 0, 11, 16, 8);
+        VoxelShape SIDE_COLLISION = createCuboidShape(5, 0, 0, 11, 24, 8);
+        WALL_VOXELS = VoxelHelper.VoxelListBuilder.create(POST, 14)
+            .add(LOW)
+            .add(VoxelHelper::mirrorZ)
+            .add(VoxelHelper::rotateY)
+            .add(VoxelHelper::mirrorX)
+            .add(TALL)
+            .add(VoxelHelper::mirrorZ)
+            .add(VoxelHelper::rotateY)
+            .add(VoxelHelper::mirrorX)
+            .add(POST_COLLISION)
+            .add(SIDE_COLLISION)
+            .add(VoxelHelper::mirrorZ)
+            .add(VoxelHelper::rotateY)
+            .add(VoxelHelper::mirrorX)
+            .build();
+    }
+}

src/main/java/fr/adrien1106/reframed/block/WaterloggableReFramedDoubleBlock.java

@@ -16,6 +16,7 @@ import org.jetbrains.annotations.Nullable;
 public class WaterloggableReFramedDoubleBlock extends ReFramedDoubleBlock implements Waterloggable {
     public WaterloggableReFramedDoubleBlock(Settings settings) {
         super(settings);
+        setDefaultState(getDefaultState().with(Properties.WATERLOGGED, false));
     }
 
     @Override

src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java

@@ -27,71 +27,135 @@ public class ReFramedClient implements ClientModInitializer {
 		BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), ReFramed.BLOCKS.toArray(new Block[0]));
 
 		// CUBE
-		HELPER.addReFramedModel("cube_special"                      , HELPER.auto(new Identifier("block/cube")));
+		HELPER.addReFramedModel("cube"                      , HELPER.auto(new Identifier("block/cube")));
 		// SMALL_CUBE
-		HELPER.addReFramedModel("small_cube_special"                , HELPER.auto(ReFramed.id("block/small_cube/base")));
+		HELPER.addReFramedModel("small_cube"                , HELPER.auto(ReFramed.id("block/small_cube/base")));
 		// SMALL_CUBES_STEP
-		HELPER.addReFramedModel("small_cubes_step_special"          , HELPER.autoDouble(ReFramed.id("block/small_cube/base"), ReFramed.id("block/small_cube/step/base")));
-		HELPER.addReFramedModel("small_cubes_step_reverse_special"  , HELPER.autoDouble(ReFramed.id("block/small_cube/step/base"), ReFramed.id("block/small_cube/base")));
+		HELPER.addReFramedModel("small_cubes_step"          , HELPER.autoDouble(ReFramed.id("block/small_cube/base"), ReFramed.id("block/small_cube/step/base")));
+		HELPER.addReFramedModel("small_cubes_step_reverse"  , HELPER.autoDouble(ReFramed.id("block/small_cube/step/base"), ReFramed.id("block/small_cube/base")));
 		// SLAB
-		HELPER.addReFramedModel("slab_special"                      , HELPER.auto(new Identifier("block/slab")));
+		HELPER.addReFramedModel("slab"                      , HELPER.auto(new Identifier("block/slab")));
 		// SLAB_CUBE
-		HELPER.addReFramedModel("double_slab_special"               , HELPER.autoDouble(new Identifier("block/slab"), new Identifier("block/slab_top")));
+		HELPER.addReFramedModel("double_slab"               , HELPER.autoDouble(new Identifier("block/slab"), new Identifier("block/slab_top")));
 		// STAIR
-		HELPER.addReFramedModel("stair_special"                     , HELPER.auto(ReFramed.id("block/stair/straight")));
-		HELPER.addReFramedModel("outers_stair_special"              , HELPER.auto(ReFramed.id("block/stair/double_outer")));
-		HELPER.addReFramedModel("inner_stair_special"               , HELPER.auto(ReFramed.id("block/stair/inner")));
-		HELPER.addReFramedModel("outer_stair_special"               , HELPER.auto(ReFramed.id("block/stair/outer")));
-		HELPER.addReFramedModel("outer_side_stair_special"          , HELPER.auto(ReFramed.id("block/stair/outer_side")));
+		HELPER.addReFramedModel("stair"                     , HELPER.auto(ReFramed.id("block/stair/straight")));
+		HELPER.addReFramedModel("outers_stair"              , HELPER.auto(ReFramed.id("block/stair/double_outer")));
+		HELPER.addReFramedModel("inner_stair"               , HELPER.auto(ReFramed.id("block/stair/inner")));
+		HELPER.addReFramedModel("outer_stair"               , HELPER.auto(ReFramed.id("block/stair/outer")));
+		HELPER.addReFramedModel("outer_side_stair"          , HELPER.auto(ReFramed.id("block/stair/outer_side")));
 		// STAIRS_CUBE
-		HELPER.addReFramedModel("stairs_cube_special"               , HELPER.autoDouble(ReFramed.id("block/stair/straight"), ReFramed.id("block/stair/cube/straight")));
-		HELPER.addReFramedModel("outers_stairs_cube_special"        , HELPER.autoDouble(ReFramed.id("block/stair/double_outer"), ReFramed.id("block/stair/cube/double_outer")));
-		HELPER.addReFramedModel("inner_stairs_cube_special"         , HELPER.autoDouble(ReFramed.id("block/stair/inner"), ReFramed.id("block/stair/cube/inner")));
-		HELPER.addReFramedModel("outer_stairs_cube_special"         , HELPER.autoDouble(ReFramed.id("block/stair/outer"), ReFramed.id("block/stair/cube/outer")));
-		HELPER.addReFramedModel("outer_side_stairs_cube_special"    , HELPER.autoDouble(ReFramed.id("block/stair/outer_side"), ReFramed.id("block/stair/cube/outer_side")));
+		HELPER.addReFramedModel("stairs_cube"               , HELPER.autoDouble(ReFramed.id("block/stair/straight"), ReFramed.id("block/stair/cube/straight")));
+		HELPER.addReFramedModel("outers_stairs_cube"        , HELPER.autoDouble(ReFramed.id("block/stair/double_outer"), ReFramed.id("block/stair/cube/double_outer")));
+		HELPER.addReFramedModel("inner_stairs_cube"         , HELPER.autoDouble(ReFramed.id("block/stair/inner"), ReFramed.id("block/stair/cube/inner")));
+		HELPER.addReFramedModel("outer_stairs_cube"         , HELPER.autoDouble(ReFramed.id("block/stair/outer"), ReFramed.id("block/stair/cube/outer")));
+		HELPER.addReFramedModel("outer_side_stairs_cube"    , HELPER.autoDouble(ReFramed.id("block/stair/outer_side"), ReFramed.id("block/stair/cube/outer_side")));
 		// HALF_STAIR
-		HELPER.addReFramedModel("half_stair_down_special"           , HELPER.auto(ReFramed.id("block/half_stair/down")));
-		HELPER.addReFramedModel("half_stair_side_special"           , HELPER.auto(ReFramed.id("block/half_stair/side")));
+		HELPER.addReFramedModel("half_stair_down"           , HELPER.auto(ReFramed.id("block/half_stair/down")));
+		HELPER.addReFramedModel("half_stair_side"           , HELPER.auto(ReFramed.id("block/half_stair/side")));
 		// HALF_STAIRS_SLAB
-		HELPER.addReFramedModel("half_stairs_slab_down_special"     , HELPER.autoDouble(ReFramed.id("block/half_stair/down"), ReFramed.id("block/half_stair/slab/down")));
-		HELPER.addReFramedModel("half_stairs_slab_side_special"     , HELPER.autoDouble(ReFramed.id("block/half_stair/side"), ReFramed.id("block/half_stair/slab/side")));
+		HELPER.addReFramedModel("half_stairs_slab_down"     , HELPER.autoDouble(ReFramed.id("block/half_stair/down"), ReFramed.id("block/half_stair/slab/down")));
+		HELPER.addReFramedModel("half_stairs_slab_side"     , HELPER.autoDouble(ReFramed.id("block/half_stair/side"), ReFramed.id("block/half_stair/slab/side")));
 		// HALF_STAIRS_STAIR
-		HELPER.addReFramedModel("half_stairs_stair_down_special"    , HELPER.autoDouble(ReFramed.id("block/half_stair/down"), ReFramed.id("block/half_stair/stair/down")));
-		HELPER.addReFramedModel("half_stairs_stair_side_special"    , HELPER.autoDouble(ReFramed.id("block/half_stair/side"), ReFramed.id("block/half_stair/stair/side")));
-		HELPER.addReFramedModel("half_stairs_stair_reverse_special" , HELPER.autoDouble(ReFramed.id("block/half_stair/stair/side"), ReFramed.id("block/half_stair/side")));
+		HELPER.addReFramedModel("half_stairs_stair_down"    , HELPER.autoDouble(ReFramed.id("block/half_stair/down"), ReFramed.id("block/half_stair/stair/down")));
+		HELPER.addReFramedModel("half_stairs_stair_side"    , HELPER.autoDouble(ReFramed.id("block/half_stair/side"), ReFramed.id("block/half_stair/stair/side")));
+		HELPER.addReFramedModel("half_stairs_stair_reverse" , HELPER.autoDouble(ReFramed.id("block/half_stair/stair/side"), ReFramed.id("block/half_stair/side")));
 		// STEP
-		HELPER.addReFramedModel("step_special"                      , HELPER.auto(ReFramed.id("block/step/down")));
+		HELPER.addReFramedModel("step"                      , HELPER.auto(ReFramed.id("block/step/down")));
 		// STEPS_SLAB
-		HELPER.addReFramedModel("steps_slab_special"                , HELPER.autoDouble(ReFramed.id("block/step/down"), ReFramed.id("block/step/slab/down")));
-		HELPER.addReFramedModel("steps_slab_side_special"           , HELPER.autoDouble(ReFramed.id("block/step/side"), ReFramed.id("block/step/slab/side")));
+		HELPER.addReFramedModel("steps_slab"                , HELPER.autoDouble(ReFramed.id("block/step/down"), ReFramed.id("block/step/slab/down")));
+		HELPER.addReFramedModel("steps_slab_side"           , HELPER.autoDouble(ReFramed.id("block/step/side"), ReFramed.id("block/step/slab/side")));
 		// LAYER
-		HELPER.addReFramedModel("layer_1_special"                   , HELPER.auto(new Identifier("block/snow_height2")));
-		HELPER.addReFramedModel("layer_2_special"                   , HELPER.auto(new Identifier("block/snow_height4")));
-		HELPER.addReFramedModel("layer_3_special"                   , HELPER.auto(new Identifier("block/snow_height6")));
-		HELPER.addReFramedModel("layer_4_special"                   , HELPER.auto(new Identifier("block/snow_height8")));
-		HELPER.addReFramedModel("layer_5_special"                   , HELPER.auto(new Identifier("block/snow_height10")));
-		HELPER.addReFramedModel("layer_6_special"                   , HELPER.auto(new Identifier("block/snow_height12")));
-		HELPER.addReFramedModel("layer_7_special"                   , HELPER.auto(new Identifier("block/snow_height14")));
-		HELPER.addReFramedModel("layer_8_special"                   , HELPER.auto(new Identifier("block/cube")));
+		HELPER.addReFramedModel("layer_1"                   , HELPER.auto(new Identifier("block/snow_height2")));
+		HELPER.addReFramedModel("layer_2"                   , HELPER.auto(new Identifier("block/snow_height4")));
+		HELPER.addReFramedModel("layer_3"                   , HELPER.auto(new Identifier("block/snow_height6")));
+		HELPER.addReFramedModel("layer_4"                   , HELPER.auto(new Identifier("block/snow_height8")));
+		HELPER.addReFramedModel("layer_5"                   , HELPER.auto(new Identifier("block/snow_height10")));
+		HELPER.addReFramedModel("layer_6"                   , HELPER.auto(new Identifier("block/snow_height12")));
+		HELPER.addReFramedModel("layer_7"                   , HELPER.auto(new Identifier("block/snow_height14")));
+		HELPER.addReFramedModel("layer_8"                   , HELPER.auto(new Identifier("block/cube")));
+		// PILLAR
+		HELPER.addReFramedModel("pillar"                    , HELPER.auto(ReFramed.id("block/pillar")));
+		// WALL
+		HELPER.addReFramedModel("wall_inventory"            , HELPER.auto(ReFramed.id("block/wall/inventory/default")));
+		// --------------------- pillar
+		HELPER.addReFramedModel("wall_core"                 , HELPER.auto(ReFramed.id("block/wall/pillar/core")));
+		HELPER.addReFramedModel("wall_pillar_low"           , HELPER.auto(ReFramed.id("block/wall/pillar/low")));
+		HELPER.addReFramedModel("wall_pillar_tall"          , HELPER.auto(ReFramed.id("block/wall/pillar/tall")));
+		HELPER.addReFramedModel("wall_pillar_none"          , HELPER.auto(ReFramed.id("block/wall/pillar/none")));
+		// --------------------- side
+		HELPER.addReFramedModel("wall_side_low"             , HELPER.auto(ReFramed.id("block/wall/side/low")));
+		HELPER.addReFramedModel("wall_side_tall"            , HELPER.auto(ReFramed.id("block/wall/side/tall")));
+		// --------------------- junction
+		HELPER.addReFramedModel("wall_low_e"                , HELPER.auto(ReFramed.id("block/wall/junction/low")));
+		HELPER.addReFramedModel("wall_tall_e"               , HELPER.auto(ReFramed.id("block/wall/junction/tall")));
+		// --------------------- junction_i
+		HELPER.addReFramedModel("wall_low_i"                , HELPER.auto(ReFramed.id("block/wall/junction/low_i")));
+		HELPER.addReFramedModel("wall_tall_i"               , HELPER.auto(ReFramed.id("block/wall/junction/tall_i")));
+		HELPER.addReFramedModel("wall_low_tall_i"           , HELPER.auto(ReFramed.id("block/wall/junction/low_tall_i")));
+		// --------------------- junction_c
+		HELPER.addReFramedModel("wall_low_c"                , HELPER.auto(ReFramed.id("block/wall/junction/low_c")));
+		HELPER.addReFramedModel("wall_tall_c"               , HELPER.auto(ReFramed.id("block/wall/junction/tall_c")));
+		HELPER.addReFramedModel("wall_low_tall_c"           , HELPER.auto(ReFramed.id("block/wall/junction/low_tall_c")));
+		HELPER.addReFramedModel("wall_tall_low_c"           , HELPER.auto(ReFramed.id("block/wall/junction/tall_low_c")));
+		// --------------------- junction_t
+		HELPER.addReFramedModel("wall_low_t"                , HELPER.auto(ReFramed.id("block/wall/junction/low_t")));
+		HELPER.addReFramedModel("wall_tall_t"               , HELPER.auto(ReFramed.id("block/wall/junction/tall_t")));
+		HELPER.addReFramedModel("wall_tall_low_c_t"         , HELPER.auto(ReFramed.id("block/wall/junction/tall_low_c_t")));
+		HELPER.addReFramedModel("wall_tall_i_low_t"         , HELPER.auto(ReFramed.id("block/wall/junction/tall_i_low_t")));
+		HELPER.addReFramedModel("wall_low_i_tall_t"         , HELPER.auto(ReFramed.id("block/wall/junction/low_i_tall_t")));
+		HELPER.addReFramedModel("wall_low_tall_c_t"         , HELPER.auto(ReFramed.id("block/wall/junction/low_tall_c_t")));
+		HELPER.addReFramedModel("wall_low_c_tall_t"         , HELPER.auto(ReFramed.id("block/wall/junction/low_c_tall_t")));
+		HELPER.addReFramedModel("wall_tall_c_low_t"         , HELPER.auto(ReFramed.id("block/wall/junction/tall_c_low_t")));
+		// --------------------- junction_x
+		HELPER.addReFramedModel("wall_low_x"                , HELPER.auto(ReFramed.id("block/wall/junction/low_x")));
+		HELPER.addReFramedModel("wall_tall_x"               , HELPER.auto(ReFramed.id("block/wall/junction/tall_x")));
+		HELPER.addReFramedModel("wall_tall_i_low_i_x"       , HELPER.auto(ReFramed.id("block/wall/junction/tall_i_low_i_x")));
+		HELPER.addReFramedModel("wall_tall_low_t_x"         , HELPER.auto(ReFramed.id("block/wall/junction/tall_low_t_x")));
+		HELPER.addReFramedModel("wall_tall_c_low_c_x"       , HELPER.auto(ReFramed.id("block/wall/junction/tall_c_low_c_x")));
+		HELPER.addReFramedModel("wall_tall_t_low_x"         , HELPER.auto(ReFramed.id("block/wall/junction/tall_t_low_x")));
+		// PILLAR WALL
+		HELPER.addReFramedModel("pillars_wall_inventory"    , HELPER.autoDouble(ReFramed.id("block/pillar"), ReFramed.id("block/wall/full/inventory/sides")));
+		HELPER.addReFramedModel("pillars_wall_low"          , HELPER.autoDouble(ReFramed.id("block/wall/full/pillar/low"), ReFramed.id("block/wall/full/side/low")));
+		HELPER.addReFramedModel("pillars_wall_tall"         , HELPER.autoDouble(ReFramed.id("block/wall/full/pillar/tall"), ReFramed.id("block/wall/full/side/tall")));
+        // PANE
+        HELPER.addReFramedModel("pane_inventory"            , HELPER.auto(ReFramed.id("block/pane")));
+        HELPER.addReFramedModel("pane_post"                 , HELPER.auto(new Identifier("block/glass_pane_post")));
+        HELPER.addReFramedModel("pane_side"                 , HELPER.auto(new Identifier("block/glass_pane_side")));
+        HELPER.addReFramedModel("pane_side_alt"             , HELPER.auto(new Identifier("block/glass_pane_side_alt")));
+        HELPER.addReFramedModel("pane_noside"               , HELPER.auto(new Identifier("block/glass_pane_noside")));
+        HELPER.addReFramedModel("pane_noside_alt"           , HELPER.auto(new Identifier("block/glass_pane_noside_alt")));
+        // TRAPDOOR
+        HELPER.addReFramedModel("trapdoor_open"             , HELPER.auto(new Identifier("block/oak_trapdoor_open")));
+        HELPER.addReFramedModel("trapdoor_bottom"           , HELPER.auto(new Identifier("block/oak_trapdoor_bottom")));
+        HELPER.addReFramedModel("trapdoor_top"              , HELPER.auto(new Identifier("block/oak_trapdoor_top")));
+        // DOOR
+        HELPER.addReFramedModel("door_inventory"            , HELPER.auto(ReFramed.id("block/door")));
+
 
 		//item model assignments (in lieu of models/item/___.json)
-		HELPER.assignItemModel("cube_special"                  , ReFramed.CUBE);
-		HELPER.assignItemModel("small_cube_special"            , ReFramed.SMALL_CUBE);
-		HELPER.assignItemModel("small_cubes_step_special"      , ReFramed.SMALL_CUBES_STEP);
-		HELPER.assignItemModel("slab_special"                  , ReFramed.SLAB);
-		HELPER.assignItemModel("double_slab_special"           , ReFramed.SLABS_CUBE);
-		HELPER.assignItemModel("stair_special"                 , ReFramed.STAIR);
-		HELPER.assignItemModel("stairs_cube_special"           , ReFramed.STAIRS_CUBE);
-		HELPER.assignItemModel("half_stair_down_special"       , ReFramed.HALF_STAIR);
-		HELPER.assignItemModel("half_stairs_slab_down_special" , ReFramed.HALF_STAIRS_SLAB);
-		HELPER.assignItemModel("half_stairs_stair_down_special", ReFramed.HALF_STAIRS_STAIR);
-		HELPER.assignItemModel("step_special"                  , ReFramed.STEP);
-		HELPER.assignItemModel("steps_slab_special"            , ReFramed.STEPS_SLAB);
-		HELPER.assignItemModel("layer_1_special"               , ReFramed.LAYER);
+		HELPER.assignItemModel("cube"                  , ReFramed.CUBE);
+		HELPER.assignItemModel("small_cube"            , ReFramed.SMALL_CUBE);
+		HELPER.assignItemModel("small_cubes_step"      , ReFramed.SMALL_CUBES_STEP);
+		HELPER.assignItemModel("slab"                  , ReFramed.SLAB);
+		HELPER.assignItemModel("double_slab"           , ReFramed.SLABS_CUBE);
+		HELPER.assignItemModel("stair"                 , ReFramed.STAIR);
+		HELPER.assignItemModel("stairs_cube"           , ReFramed.STAIRS_CUBE);
+		HELPER.assignItemModel("half_stair_down"       , ReFramed.HALF_STAIR);
+		HELPER.assignItemModel("half_stairs_slab_down" , ReFramed.HALF_STAIRS_SLAB);
+		HELPER.assignItemModel("half_stairs_stair_down", ReFramed.HALF_STAIRS_STAIR);
+		HELPER.assignItemModel("step"                  , ReFramed.STEP);
+		HELPER.assignItemModel("steps_slab"            , ReFramed.STEPS_SLAB);
+		HELPER.assignItemModel("layer_1"               , ReFramed.LAYER);
+		HELPER.assignItemModel("pillar"                , ReFramed.PILLAR);
+		HELPER.assignItemModel("pillars_wall_inventory", ReFramed.PILLARS_WALL);
+		HELPER.assignItemModel("wall_inventory"        , ReFramed.WALL);
+        HELPER.assignItemModel("pane_inventory"        , ReFramed.PANE);
+        HELPER.assignItemModel("trapdoor_bottom"       , ReFramed.TRAPDOOR);
+        HELPER.assignItemModel("door_inventory"        , ReFramed.DOOR);
 	}
 	
 	private void privateInit() {
-		//set up some magic to force chunk rerenders when you change a template (see TemplateEntity)
+		//set up some magic to force chunk re-renders when you change a template (see TemplateEntity)
 		ReFramed.chunkRerenderProxy = (world, pos) -> {
 			if(world == MinecraftClient.getInstance().world) {
 				MinecraftClient.getInstance().worldRenderer.scheduleBlockRender(

src/main/java/fr/adrien1106/reframed/client/ReFramedClientHelper.java

@@ -36,19 +36,22 @@ public class ReFramedClientHelper {
 	}
 
 	public UnbakedModel autoDouble(Identifier first, Identifier second) {
-		return new UnbakedDoubleRetexturedModel(auto(first), auto(second));
+		return new UnbakedDoubleRetexturedModel(
+			auto(first),
+			auto(second)
+		);
 	}
 
 	public void addReFramedModel(String id, UnbakedModel unbaked) {
-		prov.addReFramedModel(ReFramed.id(id), unbaked);
+		prov.addReFramedModel(ReFramed.id(id + "_special"), unbaked);
 	}
 
 	public void assignItemModel(String id, ItemConvertible... item_convertibles) {
-		prov.assignItemModel(ReFramed.id(id), item_convertibles);
+		prov.assignItemModel(ReFramed.id(id + "_special"), item_convertibles);
 	}
 
-	public CamoAppearanceManager getCamoApperanceManager(Function<SpriteIdentifier, Sprite> spriteLookup) {
-		return prov.getCamoApperanceManager(spriteLookup);
+	public CamoAppearanceManager getCamoAppearanceManager(Function<SpriteIdentifier, Sprite> spriteLookup) {
+		return prov.getCamoAppearanceManager(spriteLookup);
 	}
 
 	public @NotNull Renderer getFabricRenderer() {

src/main/java/fr/adrien1106/reframed/client/ReFramedModelProvider.java

@@ -44,7 +44,7 @@ public class ReFramedModelProvider implements ModelResourceProvider, ModelVarian
 	
 	/// camo appearance manager cache
 	
-	public CamoAppearanceManager getCamoApperanceManager(Function<SpriteIdentifier, Sprite> spriteLookup) {
+	public CamoAppearanceManager getCamoAppearanceManager(Function<SpriteIdentifier, Sprite> spriteLookup) {
 		//This is kind of needlessly sketchy using the "volatile double checked locking" pattern.
 		//I'd like all frame models to use the same CamoApperanceManager, despite the model
 		//baking process happening concurrently on several threads, but I also don't want to

src/main/java/fr/adrien1106/reframed/client/model/DoubleRetexturingBakedModel.java

@@ -17,8 +17,8 @@ import java.util.function.Supplier;
 @Environment(EnvType.CLIENT)
 public class DoubleRetexturingBakedModel extends ForwardingBakedModel implements MultiRetexturableModel {
 
-    private final ForwardingBakedModel model_1, model_2;
-    public DoubleRetexturingBakedModel(ForwardingBakedModel model_1, ForwardingBakedModel model_2) {
+    private final RetexturingBakedModel model_1, model_2;
+    public DoubleRetexturingBakedModel(RetexturingBakedModel model_1, RetexturingBakedModel model_2) {
         this.wrapped = model_1.getWrappedModel();
         this.model_1 = model_1;
         this.model_2 = model_2;
@@ -44,7 +44,7 @@ public class DoubleRetexturingBakedModel extends ForwardingBakedModel implements
     }
 
     @Override
-    public List<ForwardingBakedModel> models() {
+    public List<RetexturingBakedModel> models() {
         return List.of(model_1, model_2);
     }
 }

src/main/java/fr/adrien1106/reframed/client/model/MultiRetexturableModel.java

@@ -1,10 +1,8 @@
 package fr.adrien1106.reframed.client.model;
 
-import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
-
 import java.util.List;
 
 public interface MultiRetexturableModel {
 
-    List<ForwardingBakedModel> models();
+    List<RetexturingBakedModel> models();
 }

src/main/java/fr/adrien1106/reframed/client/model/RetexturingBakedModel.java

@@ -1,6 +1,7 @@
 package fr.adrien1106.reframed.client.model;
 
-import fr.adrien1106.reframed.block.ReFramedBlock;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import fr.adrien1106.reframed.block.ReFramedEntity;
 import fr.adrien1106.reframed.client.ReFramedClient;
 import fr.adrien1106.reframed.mixin.MinecraftAccessor;
@@ -28,40 +29,32 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
 public abstract class RetexturingBakedModel extends ForwardingBakedModel {
-	public RetexturingBakedModel(BakedModel base_model, CamoAppearanceManager tam, int theme_index, ModelBakeSettings settings, BlockState item_state, boolean ao) {
+	public RetexturingBakedModel(BakedModel base_model, CamoAppearanceManager tam, int theme_index, ModelBakeSettings settings, BlockState item_state) {
 		this.wrapped = base_model; //field from the superclass; vanilla getQuads etc. will delegate through to this
 
 		this.appearance_manager = tam;
 		this.theme_index = theme_index;
 		this.uv_lock = settings.isUvLocked();
 		this.item_state = item_state;
-		this.ao = ao;
-
-		int cache_size = 64; // default is 64 why don't ask me and it should get overwritten
-		if (item_state.getBlock() instanceof ReFramedBlock frame_block) cache_size = frame_block.getModelStateCount() + 1;
-		BASE_MESH_CACHE = new Object2ObjectLinkedOpenHashMap<>(cache_size, 0.25f) {
-			@Override
-			protected void rehash(int v) {}
-		};
 	}
 
 	protected final CamoAppearanceManager appearance_manager;
 	protected final int theme_index;
 	protected final boolean uv_lock;
-	protected final boolean ao;
 	protected final BlockState item_state;
 
 	protected record MeshCacheKey(Object state_key, CamoAppearance appearance, int model_id) {}
 	/** cache that store retextured models */
-	protected final Object2ObjectLinkedOpenHashMap<MeshCacheKey, Mesh> RETEXTURED_MESH_CACHE =
-		new Object2ObjectLinkedOpenHashMap<>(128, 0.25f) {
+	// self culling cache of the models not made thread local so that it is only computed once
+	protected final Cache<MeshCacheKey, Mesh> RETEXTURED_MESH_CACHE = CacheBuilder.newBuilder().maximumSize(256).build();
+
+	/** cache that stores the base meshes which has the size of the amount of models */
+	protected final Object2ObjectLinkedOpenHashMap<Object, Mesh> BASE_MESH_CACHE =
+		new Object2ObjectLinkedOpenHashMap<>(2, 0.25f) {
 			@Override
 			protected void rehash(int v) {}
 		};
 
-	/** cache that stores the base meshes which has the size of the amount of models */
-	protected final Object2ObjectLinkedOpenHashMap<Object, Mesh> BASE_MESH_CACHE;
-
 	protected static final Direction[] DIRECTIONS_AND_NULL;
 	static {
 		Direction[] values = Direction.values();
@@ -88,17 +81,19 @@ public abstract class RetexturingBakedModel extends ForwardingBakedModel {
 	public Sprite getParticleSprite() {
 		return appearance_manager.getDefaultAppearance(theme_index).getSprites(Direction.UP, 0).get(0).sprite();
 	}
-	
+
+	public int getThemeIndex() {
+		return theme_index;
+	}
+
 	@Override
 	public void emitBlockQuads(BlockRenderView world, BlockState state, BlockPos pos, Supplier<Random> randomSupplier, RenderContext context) {
-		// skip render if block not a frame (which should always be the case
-		if (!(state.getBlock() instanceof ReFramedBlock frame_block)) return;
 		BlockState theme = (world.getBlockEntity(pos) instanceof ThemeableBlockEntity s) ? s.getTheme(theme_index) : null;
 		QuadEmitter quad_emitter = context.getEmitter();
 		if(theme == null || theme.isAir()) {
 			getRetexturedMesh(
 				new MeshCacheKey(
-					frame_block.getModelCacheKey(state),
+					hashCode(),
 					appearance_manager.getDefaultAppearance(theme_index),
 					0
 				),
@@ -114,7 +109,9 @@ public abstract class RetexturingBakedModel extends ForwardingBakedModel {
 		if (camo instanceof WeightedComputedAppearance wca) model_id = wca.getAppearanceIndex(seed);
 
 		int tint = 0xFF000000 | MinecraftClient.getInstance().getBlockColors().getColor(theme, world, pos, 0);
-		Mesh untintedMesh = getRetexturedMesh(new MeshCacheKey(frame_block.getModelCacheKey(state), camo, model_id), state);
+		MeshCacheKey key = new MeshCacheKey(hashCode(), camo, model_id);
+		// do not clutter the cache with single-use meshes
+		Mesh untintedMesh = camo.hashCode() == -1 ? transformMesh(key, state) : getRetexturedMesh(key, state);
 		
 		//The specific tint might vary a lot; imagine grass color smoothly changing. Trying to bake the tint into
 		//the cached mesh will pollute it with a ton of single-use meshes with only slightly different colors.
@@ -153,11 +150,18 @@ public abstract class RetexturingBakedModel extends ForwardingBakedModel {
 			context.popTransform();
 		}
 	}
-	
+
+	public boolean useAmbientOcclusion(BlockRenderView view, BlockPos pos) {
+		if (!(view.getBlockEntity(pos) instanceof ThemeableBlockEntity frame_entity)) return false;
+		CamoAppearance appearance = appearance_manager
+			.getCamoAppearance(view, frame_entity.getTheme(theme_index), pos, theme_index, false);
+		return appearance.getAO(theme_index);
+	}
+
 	protected Mesh getRetexturedMesh(MeshCacheKey key, BlockState state) {
-		if (RETEXTURED_MESH_CACHE.containsKey(key)) return RETEXTURED_MESH_CACHE.getAndMoveToFirst(key);
+		if (RETEXTURED_MESH_CACHE.asMap().containsKey(key)) return RETEXTURED_MESH_CACHE.getIfPresent(key);
 		Mesh mesh = transformMesh(key, state);
-		RETEXTURED_MESH_CACHE.putAndMoveToFirst(key, mesh);
+		RETEXTURED_MESH_CACHE.put(key, mesh);
 		return mesh;
 	}
 	
@@ -170,7 +174,7 @@ public abstract class RetexturingBakedModel extends ForwardingBakedModel {
 			int i = -1;
 			do {
 				emitter.copyFrom(quad);
-				i = key.appearance.transformQuad(emitter, i, quad_index.get(), key.model_id, ao, uv_lock);
+				i = key.appearance.transformQuad(emitter, i, quad_index.get(), key.model_id, uv_lock);
 			} while (i > 0);
 			// kinda weird to do it like that but other directions don't use the quad_index so it doesn't matter
 			if (quad.cullFace() == null) quad_index.getAndIncrement();

src/main/java/fr/adrien1106/reframed/client/model/UnbakedAutoRetexturedModel.java

@@ -33,11 +33,10 @@ public class UnbakedAutoRetexturedModel extends UnbakedRetexturedModel {
 	public BakedModel bake(Baker baker, Function<SpriteIdentifier, Sprite> texture_getter, ModelBakeSettings bake_settings, Identifier identifier) {
 		return new RetexturingBakedModel(
 			baker.bake(parent, bake_settings),
-			ReFramedClient.HELPER.getCamoApperanceManager(texture_getter),
+			ReFramedClient.HELPER.getCamoAppearanceManager(texture_getter),
 			theme_index,
 			bake_settings,
-			item_state,
-			ao
+			item_state
 		) {
 			protected Mesh convertModel(BlockState state) {
 				Renderer r = ReFramedClient.HELPER.getFabricRenderer();

src/main/java/fr/adrien1106/reframed/client/model/UnbakedDoubleRetexturedModel.java

@@ -1,6 +1,5 @@
 package fr.adrien1106.reframed.client.model;
 
-import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.Baker;
 import net.minecraft.client.render.model.ModelBakeSettings;
@@ -41,8 +40,8 @@ public class UnbakedDoubleRetexturedModel implements UnbakedModel {
     @Override
     public BakedModel bake(Baker baker, Function<SpriteIdentifier, Sprite> texture_getter, ModelBakeSettings model_bake_settings, Identifier identifier) {
         return new DoubleRetexturingBakedModel(
-            (ForwardingBakedModel) model_1.bake(baker, texture_getter, model_bake_settings, identifier),
-            (ForwardingBakedModel) model_2.bake(baker, texture_getter, model_bake_settings, identifier)
+            (RetexturingBakedModel) model_1.bake(baker, texture_getter, model_bake_settings, identifier),
+            (RetexturingBakedModel) model_2.bake(baker, texture_getter, model_bake_settings, identifier)
         );
     }
 }

src/main/java/fr/adrien1106/reframed/client/model/UnbakedJsonRetexturedModel.java

@@ -41,11 +41,10 @@ public class UnbakedJsonRetexturedModel extends UnbakedRetexturedModel {
 
 		return new RetexturingBakedModel(
 			baker.bake(parent, bake_settings),
-			ReFramedClient.HELPER.getCamoApperanceManager(spriteLookup),
+			ReFramedClient.HELPER.getCamoAppearanceManager(spriteLookup),
 			theme_index,
 			bake_settings,
-			item_state,
-			ao
+			item_state
 		) {
 			protected Mesh convertModel(BlockState state) {
 				Renderer r = ReFramedClient.HELPER.getFabricRenderer();

src/main/java/fr/adrien1106/reframed/client/model/UnbakedRetexturedModel.java

@@ -14,14 +14,14 @@ public abstract class UnbakedRetexturedModel implements UnbakedModel {
 
     protected int theme_index = 1;
     protected BlockState item_state;
-    protected final boolean ao = true;
 
     public UnbakedRetexturedModel(Identifier parent) {
         this.parent = parent;
     }
 
-    public void setThemeIndex(int theme_index) {
+    public UnbakedRetexturedModel setThemeIndex(int theme_index) {
         this.theme_index = theme_index;
+        return this;
     }
 
     @Override

src/main/java/fr/adrien1106/reframed/client/model/apperance/Appearance.java

@@ -5,4 +5,4 @@ import net.minecraft.util.math.Direction;
 import java.util.List;
 import java.util.Map;
 
-public record Appearance(Map<Direction, List<SpriteProperties>> sprites) {}
+public record Appearance(Map<Direction, List<SpriteProperties>> sprites, boolean use_ao) {}

src/main/java/fr/adrien1106/reframed/client/model/apperance/CamoAppearance.java

@@ -26,12 +26,13 @@ public abstract class CamoAppearance {
 
 	public abstract @NotNull List<SpriteProperties> getSprites(Direction dir, int model_id);
 	public abstract boolean hasColor(Direction dir, int model_id, int index);
+	public abstract boolean getAO(int model_id);
 
 	public @NotNull RenderMaterial getRenderMaterial(boolean ao) {
 		return ao && ao_material != null? ao_material : material;
 	}
 
-	public int transformQuad(QuadEmitter quad, int i, int quad_index, int model_id, boolean ao, boolean uv_lock) {
+	public int transformQuad(QuadEmitter quad, int i, int quad_index, int model_id, boolean uv_lock) {
 		if(quad.tag() == 0) return 0; // Pass the quad through unmodified.
 
 		Direction direction = quad.nominalFace();
@@ -44,7 +45,7 @@ public abstract class CamoAppearance {
 		QuadPosBounds bounds = properties.bounds();
 
 		if (bounds == null) { // sprite applies anywhere e.g. default behaviour
-			quad.material(getRenderMaterial(ao));
+			quad.material(getRenderMaterial(getAO(model_id)));
 			quad.spriteBake(
 				properties.sprite(),
 				MutableQuadView.BAKE_NORMALIZED
@@ -61,7 +62,7 @@ public abstract class CamoAppearance {
 		if (!bounds.matches(origin_bounds)) return i;
 
 		// apply new quad shape
-		quad.material(getRenderMaterial(ao));
+		quad.material(getRenderMaterial(getAO(model_id)));
 		bounds.intersection(origin_bounds, direction.getAxis()).apply(quad, origin_bounds);
 		quad.spriteBake( // seems to work without the flags and break with it
 			properties.sprite(),

src/main/java/fr/adrien1106/reframed/client/model/apperance/CamoAppearanceManager.java

@@ -64,12 +64,12 @@ public class CamoAppearanceManager {
 		this.accent_appearance = new SingleSpriteAppearance(sprite, materials.get(BlendMode.CUTOUT), serial_number.getAndIncrement());
 
 		sprite = spriteLookup.apply(BARRIER_SPRITE_ID);
-		this.barrierItemAppearance = new SingleSpriteAppearance(sprite, materials.get(BlendMode.CUTOUT), serial_number.getAndIncrement());
+		this.barrier_appearance = new SingleSpriteAppearance(sprite, materials.get(BlendMode.CUTOUT), serial_number.getAndIncrement());
 	}
 	
 	private final CamoAppearance default_appearance;
 	private final CamoAppearance accent_appearance;
-	private final CamoAppearance barrierItemAppearance;
+	private final CamoAppearance barrier_appearance;
 
 	private final AtomicInteger serial_number = new AtomicInteger(0); //Mutable
 	
@@ -95,7 +95,7 @@ public class CamoAppearanceManager {
 			model = dynamic_model.computeQuads(world, state, pos, theme_index);
 			// if model isn't rebaked its just wrapped (i.e. not dynamic and may be cached)
 			if (model instanceof RebakedModel) {
-				CamoAppearance appearance = computeAppearance(model, state);
+				CamoAppearance appearance = computeAppearance(model, state, !item);
 				if (item) APPEARANCE_CACHE.put(state, appearance);
 				return appearance;
 			}
@@ -104,7 +104,7 @@ public class CamoAppearanceManager {
 		// refresh cache
 		if (APPEARANCE_CACHE.asMap().containsKey(state)) return APPEARANCE_CACHE.getIfPresent(state);
 
-		CamoAppearance appearance = computeAppearance(model, state);
+		CamoAppearance appearance = computeAppearance(model, state, false);
 		APPEARANCE_CACHE.put(state, appearance);
 		return appearance;
 	}
@@ -118,15 +118,15 @@ public class CamoAppearanceManager {
 	// The computeIfAbsent map update will work without corrupting the map, but there will be some "wasted effort" computing the value twice.
 	// The results are going to be the same, apart from their serialNumbers differing (= their equals & hashCode differing).
 	// Tiny amount of wasted space in some caches if CamoAppearances are used as a map key, then. IMO it's not a critical issue.
-	private CamoAppearance computeAppearance(BakedModel model, BlockState state) {
-		if(state.getBlock() == Blocks.BARRIER) return barrierItemAppearance;
+	private CamoAppearance computeAppearance(BakedModel model, BlockState state, boolean is_dynamic) {
+		if(state.getBlock() == Blocks.BARRIER) return barrier_appearance;
 
 		if (!(model instanceof WeightedBakedModelAccessor weighted_model)) {
 			return new ComputedAppearance(
 				getAppearance(model),
 				getCachedMaterial(state, true),
 				getCachedMaterial(state, false),
-				serial_number.getAndIncrement()
+				is_dynamic ? -1 : serial_number.getAndIncrement()
 			);
 		}
 		List<Weighted.Present<Appearance>> appearances = weighted_model.getModels().stream()
@@ -137,7 +137,7 @@ public class CamoAppearanceManager {
 			appearances,
 			getCachedMaterial(state, true),
 			getCachedMaterial(state, false),
-			serial_number.getAndIncrement()
+			is_dynamic ? -1 : serial_number.getAndIncrement()
 		);
 	}
 
@@ -175,7 +175,7 @@ public class CamoAppearanceManager {
 			});
 		});
 
-		return new Appearance(sprites);
+		return new Appearance(sprites, model.useAmbientOcclusion());
 	}
 
 	private static int getBakeFlags(QuadEmitter emitter, Sprite sprite) {

src/main/java/fr/adrien1106/reframed/client/model/apperance/ComputedAppearance.java

@@ -16,7 +16,6 @@ public class ComputedAppearance extends CamoAppearance {
         super(ao_material, material, id);
         this.appearance = appearance;
     }
-
     @Override
     public @NotNull List<SpriteProperties> getSprites(Direction dir, int model_id) {
         return appearance.sprites().get(dir);
@@ -29,6 +28,12 @@ public class ComputedAppearance extends CamoAppearance {
         return properties.get(index).has_colors();
     }
 
+    @Override
+    public boolean getAO(int model_id) {
+        return appearance.use_ao();
+    }
+
+
     @Override
     public boolean equals(Object o) {
         if(this == o) return true;

src/main/java/fr/adrien1106/reframed/client/model/apperance/SingleSpriteAppearance.java

@@ -35,6 +35,12 @@ public class SingleSpriteAppearance extends CamoAppearance {
         return id == that.id;
     }
 
+    @Override
+    public boolean getAO(int model_id) {
+        return false;
+    }
+
+
     @Override
     public String toString() {
         return "SingleSpriteAppearance[defaultSprite=%s, mat=%s, id=%d]".formatted(defaultSprite, material, id);

src/main/java/fr/adrien1106/reframed/client/model/apperance/WeightedComputedAppearance.java

@@ -46,6 +46,12 @@ public class WeightedComputedAppearance extends CamoAppearance {
         return properties.get(index).has_colors();
     }
 
+    @Override
+    public boolean getAO(int model_id) {
+        return getAppearance(model_id).use_ao();
+    }
+
+
     @Override
     public boolean equals(Object o) {
         if(this == o) return true;

src/main/java/fr/adrien1106/reframed/client/util/RenderHelper.java

@@ -5,6 +5,7 @@ import com.google.common.cache.CacheBuilder;
 import fr.adrien1106.reframed.block.ReFramedBlock;
 import fr.adrien1106.reframed.client.ReFramedClient;
 import fr.adrien1106.reframed.client.model.QuadPosBounds;
+import fr.adrien1106.reframed.client.model.RetexturingBakedModel;
 import fr.adrien1106.reframed.util.blocks.ThemeableBlockEntity;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -31,20 +32,19 @@ import static net.minecraft.util.shape.VoxelShapes.combine;
 @Environment(EnvType.CLIENT)
 public class RenderHelper {
 
-
     // self culling cache of the models not made thread local so that it is only computed once
-    private static final Cache<CullElement, Integer[]> INNER_CULL_MAP = CacheBuilder.newBuilder().maximumSize(1024).build();
-    private record CullElement(Block block, Object state_key, int model) {}
+    private static final Cache<CullElement, Integer[]> INNER_CULL_MAP = CacheBuilder.newBuilder().build();
+    private record CullElement(Block block, Object state_key, int model) { }
 
     /**
      * compute which quad might cull with another model quad
-     * @param state - the state of the model
+     * @param state  - the state of the model
      * @param models - list of models on the same block
+     * @param hash   - the hash of main model
      */
-    public static void computeInnerCull(BlockState state, List<ForwardingBakedModel> models) {
+    public static void computeInnerCull(BlockState state, List<RetexturingBakedModel> models, int hash) {
         if (!(state.getBlock() instanceof ReFramedBlock frame_block)) return;
-        Object key = frame_block.getModelCacheKey(state);
-        if (INNER_CULL_MAP.asMap().containsKey(new CullElement(frame_block, key, 1))) return;
+        if (INNER_CULL_MAP.asMap().containsKey(new CullElement(frame_block, hash, 1))) return;
 
         Renderer r = ReFramedClient.HELPER.getFabricRenderer();
         QuadEmitter quad_emitter = r.meshBuilder().getEmitter();
@@ -61,12 +61,12 @@ public class RenderHelper {
             }).toList()).toList();
 
         Integer[] cull_array;
-        for(int self_id = 1; self_id <= model_bounds.size(); self_id++) {
+        for (int self_id = 1; self_id <= model_bounds.size(); self_id++) {
             List<QuadPosBounds> self_bounds = model_bounds.get(self_id - 1);
             cull_array = new Integer[self_bounds.size()];
             for (int self_quad = 0; self_quad < cull_array.length; self_quad++) {
                 QuadPosBounds self_bound = self_bounds.get(self_quad);
-                for(int other_id = 1; other_id <= model_bounds.size(); other_id++) {
+                for (int other_id = 1; other_id <= model_bounds.size(); other_id++) {
                     if (other_id == self_id) continue;
                     if (model_bounds.get(other_id - 1).stream().anyMatch(other_bound -> other_bound.equals(self_bound))) {
                         cull_array[self_quad] = other_id;
@@ -74,15 +74,15 @@ public class RenderHelper {
                     }
                 }
             }
-            INNER_CULL_MAP.put(new CullElement(frame_block, key, self_id), cull_array);
+            INNER_CULL_MAP.put(new CullElement(frame_block, hash, self_id), cull_array);
         }
     }
 
-    public static boolean shouldDrawInnerFace(BlockState state, BlockRenderView view, BlockPos pos, int quad_index, int theme_index) {
-        if ( !(state.getBlock() instanceof ReFramedBlock frame_block)
+    public static boolean shouldDrawInnerFace(BlockState state, BlockRenderView view, BlockPos pos, int quad_index, int theme_index, int hash) {
+        if (!(state.getBlock() instanceof ReFramedBlock frame_block)
             || !(view.getBlockEntity(pos) instanceof ThemeableBlockEntity frame_entity)
         ) return true;
-        CullElement key = new CullElement(frame_block, frame_block.getModelCacheKey(state), theme_index);
+        CullElement key = new CullElement(frame_block, hash, theme_index);
         if (!INNER_CULL_MAP.asMap().containsKey(key)) return true;
 
         // needs to be Integer object because array is initialized with null not 0

src/main/java/fr/adrien1106/reframed/compat/RebakedModel.java

@@ -14,9 +14,11 @@ import java.util.Map;
 
 public class RebakedModel implements BakedModel {
     protected final Map<Direction, List<BakedQuad>> face_quads;
+    protected boolean ambient_occlusion;
 
-    public RebakedModel(Map<Direction, List<BakedQuad>> face_quads) {
+    public RebakedModel(Map<Direction, List<BakedQuad>> face_quads, boolean ambient_occlusion) {
         this.face_quads = face_quads;
+        this.ambient_occlusion = ambient_occlusion;
     }
 
     @Override
@@ -26,7 +28,7 @@ public class RebakedModel implements BakedModel {
 
     @Override
     public boolean useAmbientOcclusion() {
-        return true;
+        return ambient_occlusion;
     }
 
     @Override

src/main/java/fr/adrien1106/reframed/generator/BlockStateProvider.java

@@ -1,7 +1,8 @@
 package fr.adrien1106.reframed.generator;
 
+import net.minecraft.block.Block;
 import net.minecraft.data.client.BlockStateSupplier;
 
 public interface BlockStateProvider {
-    BlockStateSupplier getMultipart();
+    BlockStateSupplier getMultipart(Block block);
 }

src/main/java/fr/adrien1106/reframed/generator/GBlockTag.java

@@ -1,14 +1,25 @@
 package fr.adrien1106.reframed.generator;
 
 import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.block.*;
+import fr.adrien1106.reframed.generator.block.*;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider.BlockTagProvider;
+import net.minecraft.block.Block;
 import net.minecraft.registry.RegistryWrapper.WrapperLookup;
 import net.minecraft.registry.tag.BlockTags;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 public class GBlockTag extends BlockTagProvider {
+    private static final Map<Class<? extends Block>, TagGetter> providers = new HashMap<>();
+    static {
+        providers.put(ReFramedPillarsWallBlock.class, new PillarsWall());
+        providers.put(ReFramedWallBlock.class, new Wall());
+        providers.put(ReFramedPaneBlock.class, new Pane());
+    }
 
     public GBlockTag(FabricDataOutput output, CompletableFuture<WrapperLookup> registries) {
         super(output, registries);
@@ -17,6 +28,10 @@ public class GBlockTag extends BlockTagProvider {
     @Override
     protected void configure(WrapperLookup arg) {
         FabricTagBuilder builder = getOrCreateTagBuilder(BlockTags.AXE_MINEABLE);
-        ReFramed.BLOCKS.forEach(builder::add);
+        ReFramed.BLOCKS.forEach((block) -> {
+            if (providers.containsKey(block.getClass()))
+                providers.get(block.getClass()).getTags().forEach((tag) -> getOrCreateTagBuilder(tag).add(block));
+            builder.add(block);
+        });
     }
 }

src/main/java/fr/adrien1106/reframed/generator/GBlockstate.java

@@ -1,17 +1,43 @@
 package fr.adrien1106.reframed.generator;
 
 import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.block.*;
+import fr.adrien1106.reframed.generator.block.*;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
+import net.minecraft.block.Block;
 import net.minecraft.data.client.*;
 import net.minecraft.state.property.Property;
 import net.minecraft.util.Identifier;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 import static net.minecraft.data.client.VariantSettings.Rotation.R0;
 
 public class GBlockstate extends FabricModelProvider {
+    private static final Map<Class<? extends Block>, BlockStateProvider> providers = new HashMap<>();
+    static {
+        providers.put(ReFramedHalfStairBlock.class, new HalfStair());
+        providers.put(ReFramedHalfStairsSlabBlock.class, new HalfStairsSlab());
+        providers.put(ReFramedHalfStairsStairBlock.class, new HalfStairsStair());
+        providers.put(ReFramedLayerBlock.class, new Layer());
+        providers.put(ReFramedPillarBlock.class, new Pillar());
+        providers.put(ReFramedSlabBlock.class, new Slab());
+        providers.put(ReFramedSlabsCubeBlock.class, new SlabsCube());
+        providers.put(ReFramedSmallCubeBlock.class, new SmallCube());
+        providers.put(ReFramedSmallCubesStepBlock.class, new SmallCubesStep());
+        providers.put(ReFramedStairBlock.class, new Stair());
+        providers.put(ReFramedStairsCubeBlock.class, new StairsCube());
+        providers.put(ReFramedStepBlock.class, new Step());
+        providers.put(ReFramedStepsSlabBlock.class, new StepsSlab());
+        providers.put(ReFramedPillarsWallBlock.class, new PillarsWall());
+        providers.put(ReFramedWallBlock.class, new Wall());
+        providers.put(ReFramedPaneBlock.class, new Pane());
+        providers.put(ReFramedTrapdoorBlock.class, new Trapdoor());
+        providers.put(ReFramedDoorBlock.class, new Door());
+    }
 
     public GBlockstate(FabricDataOutput output) {
         super(output);
@@ -23,7 +49,7 @@ public class GBlockstate extends FabricModelProvider {
             .forEach(model_generator::excludeFromSimpleItemModelGeneration);
         ReFramed.BLOCKS.stream()
             .map(block -> {
-                if (block instanceof BlockStateProvider multipart_block) return multipart_block.getMultipart();
+                if (providers.containsKey(block.getClass())) return providers.get(block.getClass()).getMultipart(block);
                 return VariantsBlockStateSupplier.create(
                     block,
                     GBlockstate.variant(
@@ -54,11 +80,57 @@ public class GBlockstate extends FabricModelProvider {
         return When.create().set(property_1, value_1);
     }
 
-    public static <T extends Comparable<T>, U extends Comparable<U>>  When when(Property<T> property_1, T value_1, Property<U> property_2, U value_2) {
-        return When.allOf(when(property_1, value_1), when(property_2, value_2));
+    public static <T extends Comparable<T>,
+        U extends Comparable<U>>  When when(Property<T> property_1, T value_1,
+                                            Property<U> property_2, U value_2) {
+        return When.allOf(
+            when(property_1, value_1),
+            when(property_2, value_2)
+        );
     }
 
-    public static <T extends Comparable<T>, U extends Comparable<U>, V extends Comparable<V>> When when(Property<T> property_1, T value_1, Property<U> property_2, U value_2, Property<V> property_3, V value_3) {
-        return When.allOf(when(property_1, value_1), when(property_2, value_2), when(property_3, value_3));
+    public static <T extends Comparable<T>,
+        U extends Comparable<U>,
+        V extends Comparable<V>> When when(Property<T> property_1, T value_1,
+                                           Property<U> property_2, U value_2,
+                                           Property<V> property_3, V value_3) {
+        return When.allOf(
+            when(property_1, value_1),
+            when(property_2, value_2),
+            when(property_3, value_3)
+        );
+    }
+
+    public static <T extends Comparable<T>,
+        U extends Comparable<U>,
+        V extends Comparable<V>,
+        W extends Comparable<W>> When when(Property<T> property_1, T value_1,
+                                           Property<U> property_2, U value_2,
+                                           Property<V> property_3, V value_3,
+                                           Property<W> property_4, W value_4) {
+        return When.allOf(
+            when(property_1, value_1),
+            when(property_2, value_2),
+            when(property_3, value_3),
+            when(property_4, value_4)
+        );
+    }
+
+    public static <T extends Comparable<T>,
+        U extends Comparable<U>,
+        V extends Comparable<V>,
+        W extends Comparable<W>,
+        X extends Comparable<X>> When when(Property<T> property_1, T value_1,
+                                           Property<U> property_2, U value_2,
+                                           Property<V> property_3, V value_3,
+                                           Property<W> property_4, W value_4,
+                                           Property<X> property_5, X value_5) {
+        return When.allOf(
+            when(property_1, value_1),
+            when(property_2, value_2),
+            when(property_3, value_3),
+            when(property_4, value_4),
+            when(property_5, value_5)
+        );
     }
 }

src/main/java/fr/adrien1106/reframed/generator/GRecipe.java

@@ -1,11 +1,49 @@
 package fr.adrien1106.reframed.generator;
 
 import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.block.*;
+import fr.adrien1106.reframed.generator.block.*;
+import fr.adrien1106.reframed.generator.item.Blueprint;
+import fr.adrien1106.reframed.generator.item.Hammer;
+import fr.adrien1106.reframed.generator.item.Screwdriver;
+import fr.adrien1106.reframed.item.ReFramedBlueprintItem;
+import fr.adrien1106.reframed.item.ReFramedHammerItem;
+import fr.adrien1106.reframed.item.ReFramedScrewdriverItem;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.item.ItemConvertible;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class GRecipe extends FabricRecipeProvider {
+    private static final Map<Class<? extends ItemConvertible>, RecipeSetter> providers = new HashMap<>();
+    static {
+        providers.put(ReFramedBlock.class, new Cube());
+        providers.put(ReFramedHalfStairBlock.class, new HalfStair());
+        providers.put(ReFramedHalfStairsSlabBlock.class, new HalfStairsSlab());
+        providers.put(ReFramedHalfStairsStairBlock.class, new HalfStairsStair());
+        providers.put(ReFramedLayerBlock.class, new Layer());
+        providers.put(ReFramedPillarBlock.class, new Pillar());
+        providers.put(ReFramedSlabBlock.class, new Slab());
+        providers.put(ReFramedSlabsCubeBlock.class, new SlabsCube());
+        providers.put(ReFramedSmallCubeBlock.class, new SmallCube());
+        providers.put(ReFramedSmallCubesStepBlock.class, new SmallCubesStep());
+        providers.put(ReFramedStairBlock.class, new Stair());
+        providers.put(ReFramedStairsCubeBlock.class, new StairsCube());
+        providers.put(ReFramedStepBlock.class, new Step());
+        providers.put(ReFramedStepsSlabBlock.class, new StepsSlab());
+        providers.put(ReFramedPillarsWallBlock.class, new PillarsWall());
+        providers.put(ReFramedWallBlock.class, new Wall());
+        providers.put(ReFramedPaneBlock.class, new Pane());
+        providers.put(ReFramedTrapdoorBlock.class, new Trapdoor());
+        providers.put(ReFramedDoorBlock.class, new Door());
+        providers.put(ReFramedBlueprintItem.class, new Blueprint());
+        providers.put(ReFramedHammerItem.class, new Hammer());
+        providers.put(ReFramedScrewdriverItem.class, new Screwdriver());
+    }
+
     public GRecipe(FabricDataOutput output) {
         super(output);
     }
@@ -13,10 +51,10 @@ public class GRecipe extends FabricRecipeProvider {
     @Override
     public void generate(RecipeExporter exporter) {
         ReFramed.BLOCKS.forEach(block -> {
-            if (block instanceof RecipeSetter provider) provider.setRecipe(exporter);
+            if (providers.containsKey(block.getClass())) providers.get(block.getClass()).setRecipe(exporter, block);
         });
         ReFramed.ITEMS.forEach(item -> {
-            if (item instanceof RecipeSetter provider) provider.setRecipe(exporter);
+            if (providers.containsKey(item.getClass())) providers.get(item.getClass()).setRecipe(exporter, item);
         });
     }
 }

src/main/java/fr/adrien1106/reframed/generator/RecipeSetter.java

@@ -1,8 +1,9 @@
 package fr.adrien1106.reframed.generator;
 
 import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.item.ItemConvertible;
 
 public interface RecipeSetter {
 
-    void setRecipe(RecipeExporter exporter);
+    void setRecipe(RecipeExporter exporter, ItemConvertible convertible);
 }

src/main/java/fr/adrien1106/reframed/generator/TagGetter.java

@@ -0,0 +1,11 @@
+package fr.adrien1106.reframed.generator;
+
+import net.minecraft.block.Block;
+import net.minecraft.registry.tag.TagKey;
+
+import java.util.List;
+
+public interface TagGetter {
+
+    List<TagKey<Block>> getTags();
+}

src/main/java/fr/adrien1106/reframed/generator/block/Cube.java

@@ -0,0 +1,26 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.item.Items;
+import net.minecraft.recipe.book.RecipeCategory;
+
+public class Cube implements RecipeSetter {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible)
+            .pattern("III")
+            .pattern("I~I")
+            .pattern("III")
+            .input('I', Items.BAMBOO)
+            .input('~', Items.STRING)
+            .criterion(FabricRecipeProvider.hasItem(Items.BAMBOO), FabricRecipeProvider.conditionsFromItem(Items.BAMBOO))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Door.java

@@ -0,0 +1,73 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.client.When;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import static net.minecraft.block.enums.DoorHinge.*;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.state.property.Properties.*;
+
+public class Door implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 1);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 3)
+            .pattern("II")
+            .pattern("II")
+            .pattern("II")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier door = ReFramed.id("trapdoor_open_special");
+        return MultipartBlockStateSupplier.create(block)
+            // SOUTH
+            .with(When.anyOf(
+                    GBlockstate.when(OPEN, false, HORIZONTAL_FACING, Direction.SOUTH),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.EAST, DOOR_HINGE, LEFT),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.WEST, DOOR_HINGE, RIGHT)
+                ),
+                GBlockstate.variant(door, true, R0, R0))
+            // WEST
+            .with(When.anyOf(
+                    GBlockstate.when(OPEN, false, HORIZONTAL_FACING, Direction.WEST),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.SOUTH, DOOR_HINGE, LEFT),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.NORTH, DOOR_HINGE, RIGHT)
+                ),
+                GBlockstate.variant(door, true, R0, R90))
+            // NORTH
+            .with(When.anyOf(
+                    GBlockstate.when(OPEN, false, HORIZONTAL_FACING, Direction.NORTH),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.WEST, DOOR_HINGE, LEFT),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.EAST, DOOR_HINGE, RIGHT)
+                ),
+                GBlockstate.variant(door, true, R0, R180))
+            // EAST
+            .with(When.anyOf(
+                    GBlockstate.when(OPEN, false, HORIZONTAL_FACING, Direction.EAST),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.NORTH, DOOR_HINGE, LEFT),
+                    GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.SOUTH, DOOR_HINGE, RIGHT)
+                ),
+                GBlockstate.variant(door, true, R0, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/HalfStair.java

@@ -0,0 +1,106 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER;
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER_FACE;
+import static fr.adrien1106.reframed.util.blocks.Corner.*;
+import static fr.adrien1106.reframed.util.blocks.Corner.NORTH_EAST_UP;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+
+public class HalfStair implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 2);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 4)
+            .pattern("I ")
+            .pattern("II")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        return getMultipart(
+            block,
+            ReFramed.id("half_stair_down_special"),
+            ReFramed.id("half_stair_side_special")
+        );
+    }
+
+    public static BlockStateSupplier getMultipart(Block block, Identifier model_down, Identifier model_side) {
+        return MultipartBlockStateSupplier.create(block)
+            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R0, R0))
+            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R90, R270))
+            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R0, R0))
+
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R0, R90))
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R90, R0))
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R0, R90))
+
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R0, R180))
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R90, R90))
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R0, R180))
+
+            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R0, R270))
+            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R90, R180))
+            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R0, R270))
+
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R180, R0))
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R270, R90))
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R180, R0))
+
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R180, R90))
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R270, R180))
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R180, R90))
+
+            .with(GBlockstate.when(CORNER, WEST_NORTH_UP, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R180, R180))
+            .with(GBlockstate.when(CORNER, WEST_NORTH_UP, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R270, R270))
+            .with(GBlockstate.when(CORNER, WEST_NORTH_UP, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R180, R180))
+
+            .with(GBlockstate.when(CORNER, NORTH_EAST_UP, CORNER_FACE, 0),
+                GBlockstate.variant(model_side, true, R180, R270))
+            .with(GBlockstate.when(CORNER, NORTH_EAST_UP, CORNER_FACE, 1),
+                GBlockstate.variant(model_side, true, R270, R0))
+            .with(GBlockstate.when(CORNER, NORTH_EAST_UP, CORNER_FACE, 2),
+                GBlockstate.variant(model_down, true, R180, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/HalfStairsSlab.java

@@ -0,0 +1,37 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+
+public class HalfStairsSlab implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 2);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible)
+            .input(ReFramed.HALF_STAIR)
+            .input(ReFramed.SMALL_CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        return HalfStair.getMultipart(
+            block,
+            ReFramed.id("half_stairs_slab_down_special"),
+            ReFramed.id("half_stairs_slab_side_special")
+        );
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/HalfStairsStair.java

@@ -0,0 +1,70 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
+import static fr.adrien1106.reframed.util.blocks.Edge.*;
+import static fr.adrien1106.reframed.util.blocks.Edge.WEST_DOWN;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+
+public class HalfStairsStair implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 2);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible)
+            .input(ReFramed.HALF_STAIR, 2)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier model_id = ReFramed.id("half_stairs_stair_down_special");
+        Identifier side_model_id = ReFramed.id("half_stairs_stair_side_special");
+        Identifier reverse_model_id = ReFramed.id("half_stairs_stair_reverse_special");
+        return MultipartBlockStateSupplier.create(block)
+            /* X AXIS */
+            .with(GBlockstate.when(EDGE, NORTH_DOWN),
+                GBlockstate.variant(side_model_id, true, R90, R180))
+            .with(GBlockstate.when(EDGE, DOWN_SOUTH),
+                GBlockstate.variant(side_model_id, true, R0, R180))
+            .with(GBlockstate.when(EDGE, SOUTH_UP),
+                GBlockstate.variant(side_model_id, true, R270, R180))
+            .with(GBlockstate.when(EDGE, UP_NORTH),
+                GBlockstate.variant(side_model_id, true, R180, R180))
+            /* Y AXIS */
+            .with(GBlockstate.when(EDGE, NORTH_EAST),
+                GBlockstate.variant(model_id, true, R0, R0))
+            .with(GBlockstate.when(EDGE, EAST_SOUTH),
+                GBlockstate.variant(model_id, true, R0, R90))
+            .with(GBlockstate.when(EDGE, SOUTH_WEST),
+                GBlockstate.variant(model_id, true, R0, R180))
+            .with(GBlockstate.when(EDGE, WEST_NORTH),
+                GBlockstate.variant(model_id, true, R0, R270))
+            /* Z AXIS */
+            .with(GBlockstate.when(EDGE, DOWN_EAST),
+                GBlockstate.variant(reverse_model_id, true, R0, R90))
+            .with(GBlockstate.when(EDGE, EAST_UP),
+                GBlockstate.variant(side_model_id, true, R180, R270))
+            .with(GBlockstate.when(EDGE, UP_WEST),
+                GBlockstate.variant(reverse_model_id, true, R180, R90))
+            .with(GBlockstate.when(EDGE, WEST_DOWN),
+                GBlockstate.variant(side_model_id, true, R0, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Layer.java

@@ -0,0 +1,58 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.state.property.Properties.FACING;
+import static net.minecraft.state.property.Properties.LAYERS;
+
+public class Layer implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 8);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 16)
+            .pattern("II")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public MultipartBlockStateSupplier getMultipart(Block block) {
+        String model_pattern = "layer_x_special";
+        MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(block);
+        for (int i = 1; i <= 8; i++) {
+            Identifier model = ReFramed.id(model_pattern.replace("x", i + ""));
+            supplier
+                .with(GBlockstate.when(FACING, Direction.DOWN, LAYERS, i),
+                    GBlockstate.variant(model, true, R0, R0))
+                .with(GBlockstate.when(FACING, Direction.SOUTH, LAYERS, i),
+                    GBlockstate.variant(model, true, R90, R0))
+                .with(GBlockstate.when(FACING, Direction.UP, LAYERS, i),
+                    GBlockstate.variant(model, true, R180, R0))
+                .with(GBlockstate.when(FACING, Direction.NORTH, LAYERS, i),
+                    GBlockstate.variant(model, true, R270, R0))
+                .with(GBlockstate.when(FACING, Direction.WEST, LAYERS, i),
+                    GBlockstate.variant(model, true, R90, R90))
+                .with(GBlockstate.when(FACING, Direction.EAST, LAYERS, i),
+                    GBlockstate.variant(model, true, R90, R270));
+        }
+        return supplier;
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Pane.java

@@ -0,0 +1,76 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import fr.adrien1106.reframed.generator.TagGetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+import java.util.List;
+
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.state.property.Properties.*;
+
+public class Pane implements RecipeSetter, TagGetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 4);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 32)
+            .pattern("III")
+            .pattern("I I")
+            .pattern("III")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public List<TagKey<Block>> getTags() {
+        return List.of(BlockTags.WALLS);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier
+            pane_side = ReFramed.id("pane_side_special"),
+            pane_side_alt = ReFramed.id("pane_side_alt_special"),
+            pane_noside = ReFramed.id("pane_noside_special"),
+            pane_noside_alt = ReFramed.id("pane_noside_alt_special");
+        return MultipartBlockStateSupplier.create(block)
+            // PILLAR CORE
+            .with(GBlockstate.variant(ReFramed.id("pane_post_special"), true, R0, R0))
+            // SIDE
+            .with(GBlockstate.when(NORTH, true),
+                GBlockstate.variant(pane_side, true, R0, R0))
+            .with(GBlockstate.when(EAST, true),
+                GBlockstate.variant(pane_side, true, R0, R90))
+            .with(GBlockstate.when(SOUTH, true),
+                GBlockstate.variant(pane_side_alt, true, R0, R0))
+            .with(GBlockstate.when(WEST, true),
+                GBlockstate.variant(pane_side_alt, true, R0, R90))
+            // NOSIDE
+            .with(GBlockstate.when(NORTH, false),
+                GBlockstate.variant(pane_noside, true, R0, R0))
+            .with(GBlockstate.when(EAST, false),
+                GBlockstate.variant(pane_noside_alt, true, R0, R0))
+            .with(GBlockstate.when(SOUTH, false),
+                GBlockstate.variant(pane_noside_alt, true, R0, R90))
+            .with(GBlockstate.when(WEST, false),
+                GBlockstate.variant(pane_noside, true, R0, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Pillar.java

@@ -0,0 +1,49 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import static net.minecraft.data.client.VariantSettings.Rotation.R0;
+import static net.minecraft.data.client.VariantSettings.Rotation.R90;
+import static net.minecraft.state.property.Properties.AXIS;
+
+public class Pillar implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 4);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 8)
+            .pattern("I")
+            .pattern("I")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier model_id = ReFramed.id("pillar_special");
+        return MultipartBlockStateSupplier.create(block)
+            .with(GBlockstate.when(AXIS, Direction.Axis.X),
+                GBlockstate.variant(model_id, true, R90, R90))
+            .with(GBlockstate.when(AXIS, Direction.Axis.Y),
+                GBlockstate.variant(model_id, true, R0, R0))
+            .with(GBlockstate.when(AXIS, Direction.Axis.Z),
+                GBlockstate.variant(model_id, true, R90, R0));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/PillarsWall.java

@@ -0,0 +1,82 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import fr.adrien1106.reframed.generator.TagGetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+import java.util.List;
+
+import static net.minecraft.block.enums.WallShape.*;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.state.property.Properties.*;
+
+public class PillarsWall implements RecipeSetter, TagGetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 1);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 2)
+            .input(ReFramed.WALL, 2)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public List<TagKey<Block>> getTags() {
+        return List.of(BlockTags.WALLS);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier
+            low = ReFramed.id("pillars_wall_low_special"),
+            tall = ReFramed.id("pillars_wall_tall_special"),
+            none = ReFramed.id("wall_pillar_none_special");
+        return MultipartBlockStateSupplier.create(block)
+            // PILLAR CORE
+            .with(GBlockstate.variant(ReFramed.id("wall_core_special"), true, R0, R0))
+            // LOW
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, LOW),
+                GBlockstate.variant(low, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, LOW),
+                GBlockstate.variant(low, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, LOW),
+                GBlockstate.variant(low, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, LOW),
+                GBlockstate.variant(low, true, R0, R270))
+            // TALL
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, TALL),
+                GBlockstate.variant(tall, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, TALL),
+                GBlockstate.variant(tall, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, TALL),
+                GBlockstate.variant(tall, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, TALL),
+                GBlockstate.variant(tall, true, R0, R270))
+            // PILLAR NONE
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, NONE),
+                GBlockstate.variant(none, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, NONE),
+                GBlockstate.variant(none, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, NONE),
+                GBlockstate.variant(none, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, NONE),
+                GBlockstate.variant(none, true, R0, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Slab.java

@@ -0,0 +1,52 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.state.property.Properties.FACING;
+
+public class Slab implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 2);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 6)
+            .pattern("III")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public MultipartBlockStateSupplier getMultipart(Block block) {
+        Identifier model_id = ReFramed.id("slab_special");
+        return MultipartBlockStateSupplier.create(block)
+            .with(GBlockstate.when(FACING, Direction.DOWN),
+                GBlockstate.variant(model_id, true, R0, R0))
+            .with(GBlockstate.when(FACING, Direction.SOUTH),
+                GBlockstate.variant(model_id, true, R90, R0))
+            .with(GBlockstate.when(FACING, Direction.UP),
+                GBlockstate.variant(model_id, true, R180, R0))
+            .with(GBlockstate.when(FACING, Direction.NORTH),
+                GBlockstate.variant(model_id, true, R270, R0))
+            .with(GBlockstate.when(FACING, Direction.WEST),
+                GBlockstate.variant(model_id, true, R90, R90))
+            .with(GBlockstate.when(FACING, Direction.EAST),
+                GBlockstate.variant(model_id, true, R90, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/SlabsCube.java

@@ -0,0 +1,46 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.data.client.VariantSettings.Rotation.R90;
+import static net.minecraft.state.property.Properties.AXIS;
+
+public class SlabsCube implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible)
+            .input(ReFramed.SLAB, 2)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public MultipartBlockStateSupplier getMultipart(Block block) {
+        Identifier model_id = ReFramed.id("double_slab_special");
+        return MultipartBlockStateSupplier.create(block)
+            .with(GBlockstate.when(AXIS, Direction.Axis.Y),
+                GBlockstate.variant(model_id, true, R0, R0))
+            .with(GBlockstate.when(AXIS, Direction.Axis.Z),
+                GBlockstate.variant(model_id, true, R270, R0))
+            .with(GBlockstate.when(AXIS, Direction.Axis.X),
+                GBlockstate.variant(model_id, true, R90, R90));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/SmallCube.java

@@ -0,0 +1,57 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.CORNER;
+import static fr.adrien1106.reframed.util.blocks.Corner.*;
+import static fr.adrien1106.reframed.util.blocks.Corner.NORTH_EAST_UP;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+
+public class SmallCube implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 8);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 8)
+            .input(ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier small_cube_id = ReFramed.id("small_cube_special");
+        return MultipartBlockStateSupplier.create(block)
+            .with(GBlockstate.when(CORNER, NORTH_EAST_DOWN),
+                GBlockstate.variant(small_cube_id, true, R0, R0))
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_DOWN),
+                GBlockstate.variant(small_cube_id, true, R0, R90))
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_DOWN),
+                GBlockstate.variant(small_cube_id, true, R0, R180))
+            .with(GBlockstate.when(CORNER, WEST_NORTH_DOWN),
+                GBlockstate.variant(small_cube_id, true, R0, R270))
+            .with(GBlockstate.when(CORNER, EAST_SOUTH_UP),
+                GBlockstate.variant(small_cube_id, true, R180, R0))
+            .with(GBlockstate.when(CORNER, SOUTH_WEST_UP),
+                GBlockstate.variant(small_cube_id, true, R180, R90))
+            .with(GBlockstate.when(CORNER, WEST_NORTH_UP),
+                GBlockstate.variant(small_cube_id, true, R180, R180))
+            .with(GBlockstate.when(CORNER, NORTH_EAST_UP),
+                GBlockstate.variant(small_cube_id, true, R180, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/SmallCubesStep.java

@@ -0,0 +1,69 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
+import static fr.adrien1106.reframed.util.blocks.Edge.*;
+import static fr.adrien1106.reframed.util.blocks.Edge.SOUTH_UP;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+
+public class SmallCubesStep implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 4);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible)
+            .input(ReFramed.SMALL_CUBE, 2)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier model_id = ReFramed.id("small_cubes_step_special");
+        Identifier reverse_model_id = ReFramed.id("small_cubes_step_reverse_special");
+        return MultipartBlockStateSupplier.create(block)
+            /* X AXIS */
+            .with(GBlockstate.when(EDGE, DOWN_EAST),
+                GBlockstate.variant(model_id, true, R0, R0))
+            .with(GBlockstate.when(EDGE, EAST_UP),
+                GBlockstate.variant(reverse_model_id, true, R180, R0))
+            .with(GBlockstate.when(EDGE, UP_WEST),
+                GBlockstate.variant(model_id, true, R180, R180))
+            .with(GBlockstate.when(EDGE, WEST_DOWN),
+                GBlockstate.variant(reverse_model_id, true, R0, R180))
+            /* Y AXIS */
+            .with(GBlockstate.when(EDGE, EAST_SOUTH),
+                GBlockstate.variant(model_id, true, R90, R0))
+            .with(GBlockstate.when(EDGE, SOUTH_WEST),
+                GBlockstate.variant(model_id, true, R90, R90))
+            .with(GBlockstate.when(EDGE, WEST_NORTH),
+                GBlockstate.variant(model_id, true, R90, R180))
+            .with(GBlockstate.when(EDGE, NORTH_EAST),
+                GBlockstate.variant(model_id, true, R90, R270))
+            /* Z AXIS */
+            .with(GBlockstate.when(EDGE, DOWN_SOUTH),
+                GBlockstate.variant(reverse_model_id, true, R0, R90))
+            .with(GBlockstate.when(EDGE, NORTH_DOWN),
+                GBlockstate.variant(model_id, true, R0, R270))
+            .with(GBlockstate.when(EDGE, UP_NORTH),
+                GBlockstate.variant(reverse_model_id, true, R180, R270))
+            .with(GBlockstate.when(EDGE, SOUTH_UP),
+                GBlockstate.variant(model_id, true, R180, R90));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Stair.java

@@ -0,0 +1,267 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.client.When;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.STAIR_SHAPE;
+import static fr.adrien1106.reframed.util.blocks.Edge.*;
+import static fr.adrien1106.reframed.util.blocks.StairShape.*;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+
+public class Stair implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 4)
+            .pattern("I  ")
+            .pattern("II ")
+            .pattern("III")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public MultipartBlockStateSupplier getMultipart(Block block) {
+        return getMultipart(block, false);
+    }
+
+    public static MultipartBlockStateSupplier getMultipart(Block block, boolean is_double) {
+        String infix = is_double ? "s_cube" : "";
+        Identifier straight_id = ReFramed.id("stair" + infix + "_special");
+        Identifier double_outer_id = ReFramed.id("outers_stair" + infix + "_special");
+        Identifier inner_id = ReFramed.id("inner_stair" + infix + "_special");
+        Identifier outer_id = ReFramed.id("outer_stair" + infix + "_special");
+        Identifier outer_side_id = ReFramed.id("outer_side_stair" + infix + "_special");
+        return MultipartBlockStateSupplier.create(block)
+            /* STRAIGHT X AXIS */
+            .with(GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R0, R0))
+            .with(GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R180, R0))
+            .with(GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R180, R180))
+            .with(GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R0, R180))
+            /* STRAIGHT Y AXIS */
+            .with(GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R90, R0))
+            .with(GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R90, R90))
+            .with(GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R90, R180))
+            .with(GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R90, R270))
+            /* STRAIGHT Z AXIS */
+            .with(GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R0, R90))
+            .with(GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R0, R270))
+            .with(GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R180, R270))
+            .with(GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, STRAIGHT),
+                GBlockstate.variant(straight_id, true, R180, R90))
+            /* INNER BOTTOM */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, INNER_RIGHT)),
+                GBlockstate.variant(inner_id, true, R0, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, INNER_LEFT),
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, INNER_RIGHT)),
+                GBlockstate.variant(inner_id, true, R0, R270))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, INNER_LEFT),
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, INNER_LEFT)),
+                GBlockstate.variant(inner_id, true, R0, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, INNER_LEFT)),
+                GBlockstate.variant(inner_id, true, R0, R90))
+            /* INNER TOP */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, INNER_LEFT),
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, INNER_LEFT)),
+                GBlockstate.variant(inner_id, true, R180, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, INNER_LEFT),
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, INNER_LEFT),
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, INNER_LEFT)),
+                GBlockstate.variant(inner_id, true, R180, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, INNER_LEFT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, INNER_LEFT)),
+                GBlockstate.variant(inner_id, true, R180, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, INNER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, INNER_LEFT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, INNER_RIGHT)),
+                GBlockstate.variant(inner_id, true, R180, R270))
+            /* OUTER BOTTOM */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, SECOND_OUTER_LEFT)),
+                GBlockstate.variant(outer_id, true, R0, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, FIRST_OUTER_LEFT)),
+                GBlockstate.variant(outer_id, true, R0, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, FIRST_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
+                GBlockstate.variant(outer_id, true, R0, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, FIRST_OUTER_LEFT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
+                GBlockstate.variant(outer_id, true, R0, R270))
+            /* OUTER TOP */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
+                GBlockstate.variant(outer_id, true, R180, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, FIRST_OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, FIRST_OUTER_LEFT)),
+                GBlockstate.variant(outer_id, true, R180, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, FIRST_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, SECOND_OUTER_LEFT)),
+                GBlockstate.variant(outer_id, true, R180, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
+                GBlockstate.variant(outer_id, true, R180, R270))
+            /* OUTER EAST */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, FIRST_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R0, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, SECOND_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R90, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, FIRST_OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R180, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, FIRST_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R270, R0))
+            /* OUTER SOUTH */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, SECOND_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R0, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, SECOND_OUTER_LEFT),
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R90, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, FIRST_OUTER_LEFT),
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, SECOND_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R180, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, FIRST_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, FIRST_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R270, R90))
+            /* OUTER WEST */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, SECOND_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R0, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, SECOND_OUTER_LEFT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R90, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, FIRST_OUTER_LEFT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, FIRST_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R180, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, FIRST_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, SECOND_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R270, R180))
+            /* OUTER NORTH */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, SECOND_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, SECOND_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R0, R270))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, SECOND_OUTER_LEFT),
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, FIRST_OUTER_LEFT)),
+                GBlockstate.variant(outer_side_id, true, R90, R270))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, FIRST_OUTER_LEFT),
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, FIRST_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R180, R270))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, FIRST_OUTER_RIGHT),
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, SECOND_OUTER_RIGHT)),
+                GBlockstate.variant(outer_side_id, true, R270, R270))
+            /* OUTER BOTTOM */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, OUTER_RIGHT)),
+                GBlockstate.variant(double_outer_id, true, R0, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, DOWN_SOUTH, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, OUTER_RIGHT)),
+                GBlockstate.variant(double_outer_id, true, R0, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_DOWN, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, OUTER_RIGHT)),
+                GBlockstate.variant(double_outer_id, true, R0, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, NORTH_DOWN, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, DOWN_EAST, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, OUTER_RIGHT)),
+                GBlockstate.variant(double_outer_id, true, R0, R270))
+            /* OUTER TOP */
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, NORTH_EAST, STAIR_SHAPE, OUTER_LEFT)),
+                GBlockstate.variant(double_outer_id, true, R180, R0))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_UP, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, EAST_SOUTH, STAIR_SHAPE, OUTER_LEFT)),
+                GBlockstate.variant(double_outer_id, true, R180, R90))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, SOUTH_UP, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, OUTER_LEFT),
+                    GBlockstate.when(EDGE, SOUTH_WEST, STAIR_SHAPE, OUTER_LEFT)),
+                GBlockstate.variant(double_outer_id, true, R180, R180))
+            .with(When.anyOf(
+                    GBlockstate.when(EDGE, UP_NORTH, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, UP_WEST, STAIR_SHAPE, OUTER_RIGHT),
+                    GBlockstate.when(EDGE, WEST_NORTH, STAIR_SHAPE, OUTER_LEFT)),
+                GBlockstate.variant(double_outer_id, true, R180, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/StairsCube.java

@@ -0,0 +1,33 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+
+public class StairsCube implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible)
+            .input(ReFramed.STAIR)
+            .input(ReFramed.STEP)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public MultipartBlockStateSupplier getMultipart(Block block) {
+        return Stair.getMultipart(block, true);
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Step.java

@@ -0,0 +1,69 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+
+import static fr.adrien1106.reframed.util.blocks.BlockProperties.EDGE;
+import static fr.adrien1106.reframed.util.blocks.Edge.*;
+import static fr.adrien1106.reframed.util.blocks.Edge.SOUTH_UP;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+
+public class Step implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 4);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 8)
+            .pattern("II")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier model_id = ReFramed.id("step_special");
+        return MultipartBlockStateSupplier.create(block)
+            /* X AXIS */
+            .with(GBlockstate.when(EDGE, DOWN_EAST),
+                GBlockstate.variant(model_id, true, R0, R0))
+            .with(GBlockstate.when(EDGE, EAST_UP),
+                GBlockstate.variant(model_id, true, R180, R0))
+            .with(GBlockstate.when(EDGE, UP_WEST),
+                GBlockstate.variant(model_id, true, R180, R180))
+            .with(GBlockstate.when(EDGE, WEST_DOWN),
+                GBlockstate.variant(model_id, true, R0, R180))
+            /* Y AXIS */
+            .with(GBlockstate.when(EDGE, EAST_SOUTH),
+                GBlockstate.variant(model_id, true, R90, R0))
+            .with(GBlockstate.when(EDGE, SOUTH_WEST),
+                GBlockstate.variant(model_id, true, R90, R90))
+            .with(GBlockstate.when(EDGE, WEST_NORTH),
+                GBlockstate.variant(model_id, true, R90, R180))
+            .with(GBlockstate.when(EDGE, NORTH_EAST),
+                GBlockstate.variant(model_id, true, R90, R270))
+            /* Z AXIS */
+            .with(GBlockstate.when(EDGE, DOWN_SOUTH),
+                GBlockstate.variant(model_id, true, R0, R90))
+            .with(GBlockstate.when(EDGE, NORTH_DOWN),
+                GBlockstate.variant(model_id, true, R0, R270))
+            .with(GBlockstate.when(EDGE, UP_NORTH),
+                GBlockstate.variant(model_id, true, R180, R270))
+            .with(GBlockstate.when(EDGE, SOUTH_UP),
+                GBlockstate.variant(model_id, true, R180, R90));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/StepsSlab.java

@@ -0,0 +1,66 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.data.client.VariantSettings.Rotation.R270;
+import static net.minecraft.state.property.Properties.AXIS;
+import static net.minecraft.state.property.Properties.FACING;
+
+public class StepsSlab implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 2);
+        ShapelessRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible)
+            .input(ReFramed.STEP, 2)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public MultipartBlockStateSupplier getMultipart(Block block) {
+        Identifier step_id = ReFramed.id("steps_slab_special");
+        Identifier step_side_id = ReFramed.id("steps_slab_side_special");
+        return MultipartBlockStateSupplier.create(block)
+            .with(GBlockstate.when(FACING, Direction.DOWN, AXIS, Direction.Axis.X),
+                GBlockstate.variant(step_id, true, R0, R180))
+            .with(GBlockstate.when(FACING, Direction.DOWN, AXIS, Direction.Axis.Z),
+                GBlockstate.variant(step_id, true, R0, R270))
+            .with(GBlockstate.when(FACING, Direction.UP, AXIS, Direction.Axis.X),
+                GBlockstate.variant(step_id, true, R180, R180))
+            .with(GBlockstate.when(FACING, Direction.UP, AXIS, Direction.Axis.Z),
+                GBlockstate.variant(step_id, true, R180, R270))
+            .with(GBlockstate.when(FACING, Direction.EAST, AXIS, Direction.Axis.Z),
+                GBlockstate.variant(step_side_id, true, R0, R0))
+            .with(GBlockstate.when(FACING, Direction.EAST, AXIS, Direction.Axis.Y),
+                GBlockstate.variant(step_side_id, true, R90, R0))
+            .with(GBlockstate.when(FACING, Direction.SOUTH, AXIS, Direction.Axis.X),
+                GBlockstate.variant(step_side_id, true, R180, R90))
+            .with(GBlockstate.when(FACING, Direction.SOUTH, AXIS, Direction.Axis.Y),
+                GBlockstate.variant(step_side_id, true, R90, R90))
+            .with(GBlockstate.when(FACING, Direction.WEST, AXIS, Direction.Axis.Z),
+                GBlockstate.variant(step_side_id, true, R180, R180))
+            .with(GBlockstate.when(FACING, Direction.WEST, AXIS, Direction.Axis.Y),
+                GBlockstate.variant(step_side_id, true, R90, R180))
+            .with(GBlockstate.when(FACING, Direction.NORTH, AXIS, Direction.Axis.X),
+                GBlockstate.variant(step_side_id, true, R0, R270))
+            .with(GBlockstate.when(FACING, Direction.NORTH, AXIS, Direction.Axis.Y),
+                GBlockstate.variant(step_side_id, true, R90, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Trapdoor.java

@@ -0,0 +1,56 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.block.enums.BlockHalf;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.state.property.Properties.*;
+
+public class Trapdoor implements RecipeSetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 2);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 2)
+            .pattern("  I")
+            .pattern("III")
+            .pattern("II ")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier open = ReFramed.id("trapdoor_open_special");
+        return MultipartBlockStateSupplier.create(block)
+            .with(GBlockstate.when(OPEN, false, BLOCK_HALF, BlockHalf.BOTTOM),
+                GBlockstate.variant(ReFramed.id("trapdoor_bottom_special"), true, R0, R0))
+            .with(GBlockstate.when(OPEN, false, BLOCK_HALF, BlockHalf.TOP),
+                GBlockstate.variant(ReFramed.id("trapdoor_top_special"), true, R0, R0))
+            .with(GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.NORTH),
+                GBlockstate.variant(open, true, R0, R0))
+            .with(GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.EAST),
+                GBlockstate.variant(open, true, R0, R90))
+            .with(GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.SOUTH),
+                GBlockstate.variant(open, true, R0, R180))
+            .with(GBlockstate.when(OPEN, true, HORIZONTAL_FACING, Direction.WEST),
+                GBlockstate.variant(open, true, R0, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/block/Wall.java

@@ -0,0 +1,788 @@
+package fr.adrien1106.reframed.generator.block;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.BlockStateProvider;
+import fr.adrien1106.reframed.generator.GBlockstate;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import fr.adrien1106.reframed.generator.TagGetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.block.Block;
+import net.minecraft.data.client.BlockStateSupplier;
+import net.minecraft.data.client.MultipartBlockStateSupplier;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.RecipeProvider;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.recipe.book.RecipeCategory;
+import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+import java.util.List;
+
+import static net.minecraft.block.enums.WallShape.*;
+import static net.minecraft.data.client.VariantSettings.Rotation.*;
+import static net.minecraft.state.property.Properties.*;
+
+public class Wall implements RecipeSetter, TagGetter, BlockStateProvider {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        RecipeProvider.offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, convertible, ReFramed.CUBE, 1);
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.BUILDING_BLOCKS, convertible, 4)
+            .pattern("III")
+            .pattern("III")
+            .input('I', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+
+    @Override
+    public List<TagKey<Block>> getTags() {
+        return List.of(BlockTags.WALLS);
+    }
+
+    @Override
+    public BlockStateSupplier getMultipart(Block block) {
+        Identifier
+            side_low = ReFramed.id("wall_side_low_special"),
+            side_tall = ReFramed.id("wall_side_tall_special"),
+            pillar_low = ReFramed.id("wall_pillar_low_special"),
+            pillar_tall = ReFramed.id("wall_pillar_tall_special"),
+            pillar_none = ReFramed.id("wall_pillar_none_special"),
+            low_e = ReFramed.id("wall_low_e_special"),
+            tall_e = ReFramed.id("wall_tall_e_special"),
+            low_i = ReFramed.id("wall_low_i_special"),
+            tall_i = ReFramed.id("wall_tall_i_special"),
+            low_tall_i = ReFramed.id("wall_low_tall_i_special"),
+            low_c = ReFramed.id("wall_low_c_special"),
+            tall_c = ReFramed.id("wall_tall_c_special"),
+            low_tall_c = ReFramed.id("wall_low_tall_c_special"),
+            tall_low_c = ReFramed.id("wall_tall_low_c_special"),
+            low_t = ReFramed.id("wall_low_t_special"),
+            tall_t = ReFramed.id("wall_tall_t_special"),
+            tall_low_c_t = ReFramed.id("wall_tall_low_c_t_special"),
+            tall_i_low_t = ReFramed.id("wall_tall_i_low_t_special"),
+            low_i_tall_t = ReFramed.id("wall_low_i_tall_t_special"),
+            low_tall_c_t = ReFramed.id("wall_low_tall_c_t_special"),
+            low_c_tall_t = ReFramed.id("wall_low_c_tall_t_special"),
+            tall_c_low_t = ReFramed.id("wall_tall_c_low_t_special"),
+            tall_i_low_i_x = ReFramed.id("wall_tall_i_low_i_x_special"),
+            tall_low_t_x = ReFramed.id("wall_tall_low_t_x_special"),
+            tall_c_low_c_x = ReFramed.id("wall_tall_c_low_c_x_special"),
+            tall_t_low_x = ReFramed.id("wall_tall_t_low_x_special");
+        return MultipartBlockStateSupplier.create(block)
+            // PILLAR CORE
+            .with(GBlockstate.when(UP, true),
+                GBlockstate.variant(ReFramed.id("wall_core_special"), true, R0, R0))
+            // LOW
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, LOW),
+                GBlockstate.variant(side_low, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, LOW),
+                GBlockstate.variant(side_low, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, LOW),
+                GBlockstate.variant(side_low, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, LOW),
+                GBlockstate.variant(side_low, true, R0, R270))
+            // TALL
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, TALL),
+                GBlockstate.variant(side_tall, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, TALL),
+                GBlockstate.variant(side_tall, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, TALL),
+                GBlockstate.variant(side_tall, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, TALL),
+                GBlockstate.variant(side_tall, true, R0, R270))
+            // PILLAR LOW
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, LOW, UP, true),
+                GBlockstate.variant(pillar_low, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, LOW, UP, true),
+                GBlockstate.variant(pillar_low, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, LOW, UP, true),
+                GBlockstate.variant(pillar_low, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, LOW, UP, true),
+                GBlockstate.variant(pillar_low, true, R0, R270))
+            // PILLAR TALL
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, TALL, UP, true),
+                GBlockstate.variant(pillar_tall, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, TALL, UP, true),
+                GBlockstate.variant(pillar_tall, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, TALL, UP, true),
+                GBlockstate.variant(pillar_tall, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, TALL, UP, true),
+                GBlockstate.variant(pillar_tall, true, R0, R270))
+            // PILLAR NONE
+            .with(GBlockstate.when(NORTH_WALL_SHAPE, NONE, UP, true),
+                GBlockstate.variant(pillar_none, true, R0, R0))
+            .with(GBlockstate.when(EAST_WALL_SHAPE, NONE, UP, true),
+                GBlockstate.variant(pillar_none, true, R0, R90))
+            .with(GBlockstate.when(SOUTH_WALL_SHAPE, NONE, UP, true),
+                GBlockstate.variant(pillar_none, true, R0, R180))
+            .with(GBlockstate.when(WEST_WALL_SHAPE, NONE, UP, true),
+                GBlockstate.variant(pillar_none, true, R0, R270))
+            // JUNCTION LOW
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_e, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_e, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_e, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_e, true, R0, R270))
+            // JUNCTION TALL
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_e, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_e, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_e, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_e, true, R0, R270))
+            // JUNCTION LOW I
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_i, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_i, true, R0, R90))
+            // JUNCTION TALL I
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i, true, R0, R90))
+            // JUNCTION LOW TALL I
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_i, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_i, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_i, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_i, true, R0, R270))
+            // JUNCTION LOW C
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c, true, R0, R270))
+            // JUNCTION TALL C
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c, true, R0, R270))
+            // JUNCTION LOW TALL C
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c, true, R0, R270))
+            // JUNCTION TALL LOW C
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c, true, R0, R270))
+            // JUNCTION LOW T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_t, true, R0, R270))
+            // JUNCTION TALL T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t, true, R0, R270))
+            // JUNCTION TALL LOW C T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_c_t, true, R0, R270))
+            // JUNCTION TALL I LOW T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i_low_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i_low_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i_low_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i_low_t, true, R0, R270))
+            // JUNCTION LOW I TALL T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_i_tall_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_i_tall_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_i_tall_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(low_i_tall_t, true, R0, R270))
+            // JUNCTION LOW TALL C T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(low_tall_c_t, true, R0, R270))
+            // JUNCTION LOW C TALL T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c_tall_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c_tall_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c_tall_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(low_c_tall_t, true, R0, R270))
+            // JUNCTION TALL C LOW T
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, NONE,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_t, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, NONE,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_t, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, NONE,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_t, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, NONE,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_t, true, R0, R270))
+            // JUNCTION X
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(ReFramed.id("wall_low_x_special"), true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(ReFramed.id("wall_tall_x_special"), true, R0, R0))
+            // JUNCTION I X
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i_low_i_x, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_i_low_i_x, true, R0, R90))
+            // JUNCTION TALL LOW T X
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_t_x, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_t_x, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_t_x, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_low_t_x, true, R0, R270))
+            // JUNCTION TALL C LOW C X
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_c_x, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_c_x, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_c_x, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_c_low_c_x, true, R0, R270))
+            // JUNCTION TALL C LOW C X
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, LOW,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t_low_x, true, R0, R0))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, LOW,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t_low_x, true, R0, R90))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, LOW,
+                    EAST_WALL_SHAPE, TALL,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t_low_x, true, R0, R180))
+            .with(GBlockstate.when(
+                    NORTH_WALL_SHAPE, TALL,
+                    EAST_WALL_SHAPE, LOW,
+                    SOUTH_WALL_SHAPE, TALL,
+                    WEST_WALL_SHAPE, TALL,
+                    UP, false
+                ),
+                GBlockstate.variant(tall_t_low_x, true, R0, R270));
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/item/Blueprint.java

@@ -0,0 +1,25 @@
+package fr.adrien1106.reframed.generator.item;
+
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.item.Items;
+import net.minecraft.recipe.book.RecipeCategory;
+
+public class Blueprint implements RecipeSetter {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.TOOLS, convertible, 3)
+            .pattern("PI")
+            .pattern("PP")
+            .input('P', Items.PAPER)
+            .input('I', Items.INK_SAC)
+            .criterion(FabricRecipeProvider.hasItem(Items.PAPER), FabricRecipeProvider.conditionsFromItem(Items.PAPER))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/item/Hammer.java

@@ -0,0 +1,28 @@
+package fr.adrien1106.reframed.generator.item;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.item.Items;
+import net.minecraft.recipe.book.RecipeCategory;
+
+public class Hammer implements RecipeSetter {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.TOOLS, convertible)
+            .pattern(" CI")
+            .pattern(" ~C")
+            .pattern("~  ")
+            .input('I', Items.IRON_INGOT)
+            .input('C', ReFramed.CUBE)
+            .input('~', Items.STICK)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+}

src/main/java/fr/adrien1106/reframed/generator/item/Screwdriver.java

@@ -0,0 +1,27 @@
+package fr.adrien1106.reframed.generator.item;
+
+import fr.adrien1106.reframed.ReFramed;
+import fr.adrien1106.reframed.generator.RecipeSetter;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
+import net.minecraft.data.server.recipe.RecipeExporter;
+import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.item.Items;
+import net.minecraft.recipe.book.RecipeCategory;
+
+public class Screwdriver implements RecipeSetter {
+
+    @Override
+    public void setRecipe(RecipeExporter exporter, ItemConvertible convertible) {
+        ShapedRecipeJsonBuilder
+            .create(RecipeCategory.TOOLS, convertible)
+            .pattern("  I")
+            .pattern(" I ")
+            .pattern("C  ")
+            .input('I', Items.IRON_INGOT)
+            .input('C', ReFramed.CUBE)
+            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
+            .criterion(FabricRecipeProvider.hasItem(convertible), FabricRecipeProvider.conditionsFromItem(convertible))
+            .offerTo(exporter);
+    }
+}

src/main/java/fr/adrien1106/reframed/item/ReFramedBlueprintItem.java

@@ -2,23 +2,17 @@ package fr.adrien1106.reframed.item;
 
 import fr.adrien1106.reframed.ReFramed;
 import fr.adrien1106.reframed.block.ReFramedEntity;
-import fr.adrien1106.reframed.generator.RecipeSetter;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.Blocks;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
-import net.minecraft.item.Items;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-public class ReFramedBlueprintItem extends Item implements RecipeSetter {
+public class ReFramedBlueprintItem extends Item {
     public ReFramedBlueprintItem(Settings settings) {
         super(settings);
     }
@@ -39,17 +33,4 @@ public class ReFramedBlueprintItem extends Item implements RecipeSetter {
 
         return ActionResult.SUCCESS;
     }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        ShapedRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this, 3)
-            .pattern("PI")
-            .pattern("PP")
-            .input('P', Items.PAPER)
-            .input('I', Items.INK_SAC)
-            .criterion(FabricRecipeProvider.hasItem(Items.PAPER), FabricRecipeProvider.conditionsFromItem(Items.PAPER))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/item/ReFramedHammerItem.java

@@ -2,26 +2,20 @@ package fr.adrien1106.reframed.item;
 
 import fr.adrien1106.reframed.ReFramed;
 import fr.adrien1106.reframed.block.ReFramedDoubleBlock;
-import fr.adrien1106.reframed.generator.RecipeSetter;
 import fr.adrien1106.reframed.util.blocks.ThemeableBlockEntity;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
-import net.minecraft.item.Items;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-public class ReFramedHammerItem extends Item implements RecipeSetter {
+public class ReFramedHammerItem extends Item {
     public ReFramedHammerItem(Settings settings) {
         super(settings);
     }
@@ -52,19 +46,4 @@ public class ReFramedHammerItem extends Item implements RecipeSetter {
         ReFramed.chunkRerenderProxy.accept(world, pos);
         return ActionResult.SUCCESS;
     }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        ShapedRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .pattern(" CI")
-            .pattern(" ~C")
-            .pattern("~  ")
-            .input('I', Items.IRON_INGOT)
-            .input('C', ReFramed.CUBE)
-            .input('~', Items.STICK)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/item/ReFramedScrewdriverItem.java

@@ -2,17 +2,11 @@ package fr.adrien1106.reframed.item;
 
 import fr.adrien1106.reframed.ReFramed;
 import fr.adrien1106.reframed.block.ReFramedDoubleBlock;
-import fr.adrien1106.reframed.generator.RecipeSetter;
 import fr.adrien1106.reframed.util.blocks.ThemeableBlockEntity;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.block.BlockState;
-import net.minecraft.data.server.recipe.RecipeExporter;
-import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemUsageContext;
-import net.minecraft.item.Items;
-import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.state.property.Properties;
@@ -21,7 +15,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
-public class ReFramedScrewdriverItem extends Item implements RecipeSetter {
+public class ReFramedScrewdriverItem extends Item {
 
     public ReFramedScrewdriverItem(Settings settings) {
         super(settings);
@@ -61,18 +55,4 @@ public class ReFramedScrewdriverItem extends Item implements RecipeSetter {
         ReFramed.chunkRerenderProxy.accept(world, pos);
         return ActionResult.SUCCESS;
     }
-
-    @Override
-    public void setRecipe(RecipeExporter exporter) {
-        ShapedRecipeJsonBuilder
-            .create(RecipeCategory.BUILDING_BLOCKS, this)
-            .pattern("  I")
-            .pattern(" I ")
-            .pattern("C  ")
-            .input('I', Items.IRON_INGOT)
-            .input('C', ReFramed.CUBE)
-            .criterion(FabricRecipeProvider.hasItem(ReFramed.CUBE), FabricRecipeProvider.conditionsFromItem(ReFramed.CUBE))
-            .criterion(FabricRecipeProvider.hasItem(this), FabricRecipeProvider.conditionsFromItem(this))
-            .offerTo(exporter);
-    }
 }

src/main/java/fr/adrien1106/reframed/mixin/CompatMixinPlugin.java

@@ -17,7 +17,7 @@ public class CompatMixinPlugin implements IMixinConfigPlugin {
 
     private static final FabricLoader LOADER = FabricLoader.getInstance();
     private static final Logger LOGGER = LoggerFactory.getLogger("ReFramed MIXIN");
-    private static final List<String> COMPAT_MOD = List.of("athena", "indium", "sodium", "special-model-loader", "continuity");
+    private static final List<String> COMPAT_MOD = List.of("athena", "indium", "sodium", "special-model-loader", "continuity", "axiom");
     private static final Map<String, Supplier<Boolean>> CONDITIONS = new HashMap<>();
     static {
         CONDITIONS.put("fr.adrien1106.reframed.mixin.compat.AthenaBakedModelMixin", () -> LOADER.isModLoaded(COMPAT_MOD.get(0)));
@@ -33,6 +33,7 @@ public class CompatMixinPlugin implements IMixinConfigPlugin {
         CONDITIONS.put("fr.adrien1106.reframed.mixin.compat.ContinuityCTMBakedModelMixin", () -> LOADER.isModLoaded(COMPAT_MOD.get(4)));
         CONDITIONS.put("fr.adrien1106.reframed.mixin.compat.ContinuityCTMQuadTransformMixin", () -> LOADER.isModLoaded(COMPAT_MOD.get(4)));
         CONDITIONS.put("fr.adrien1106.reframed.mixin.compat.ContinuityModelWrappingHandlerMixin", () -> LOADER.isModLoaded(COMPAT_MOD.get(4)));
+        CONDITIONS.put("fr.adrien1106.reframed.mixin.compat.AxiomClientBlockEntitySerializerMixin", () -> LOADER.isModLoaded(COMPAT_MOD.get(5)));
     }
 
 

src/main/java/fr/adrien1106/reframed/mixin/compat/AthenaBakedModelMixin.java

@@ -32,6 +32,8 @@ public abstract class AthenaBakedModelMixin implements DynamicBakedModel, BakedM
 
     @Shadow(remap = false) @Final private Int2ObjectMap<Sprite> textures;
 
+    @Shadow public abstract boolean useAmbientOcclusion();
+
     /**
      * Reuses the emitQuad method to compute the quads to be used by the frame
      *
@@ -77,6 +79,6 @@ public abstract class AthenaBakedModelMixin implements DynamicBakedModel, BakedM
                 }));
         });
 
-        return new RebakedModel(face_quads);
+        return new RebakedModel(face_quads, useAmbientOcclusion());
     }
 }

src/main/java/fr/adrien1106/reframed/mixin/compat/AxiomClientBlockEntitySerializerMixin.java

@@ -0,0 +1,26 @@
+package fr.adrien1106.reframed.mixin.compat;
+
+import com.moulberry.axiom.world_modification.ClientBlockEntitySerializer;
+import fr.adrien1106.reframed.util.blocks.ThemeableBlockEntity;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.registry.RegistryWrapper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ClientBlockEntitySerializer.class)
+public class AxiomClientBlockEntitySerializerMixin {
+
+    @Inject(
+        method = "serialize",
+        at = @At("HEAD"),
+        remap = false,
+        cancellable = true
+    )
+    private static void serialize(BlockEntity blockEntity, RegistryWrapper.WrapperLookup provider, CallbackInfoReturnable<NbtCompound> cir) {
+        if (!(blockEntity instanceof ThemeableBlockEntity)) return;
+        cir.setReturnValue(blockEntity.createNbt());
+    }
+}

src/main/java/fr/adrien1106/reframed/mixin/compat/ContinuityCTMBakedModelMixin.java

@@ -89,6 +89,6 @@ public abstract class ContinuityCTMBakedModelMixin extends ForwardingBakedModel
         transform.getProcessingContext().reset(); // reset instead of outputting to emitter
         transform.invokeReset();
 
-        return new RebakedModel(face_quads);
+        return new RebakedModel(face_quads, useAmbientOcclusion());
     }
 }

src/main/java/fr/adrien1106/reframed/mixin/compat/IndiumAbstractBlockRenderContextMixin.java

@@ -24,6 +24,6 @@ public abstract class IndiumAbstractBlockRenderContextMixin {
     private boolean shouldDrawInnerQuad(AbstractBlockRenderContext instance, Direction face, @Local(argsOnly = true) MutableQuadViewImpl quad) {
         if (face != null || quad.tag() == 0 || !(blockInfo instanceof IBlockRenderInfoMixin info) || info.getThemeIndex() == 0) return isFaceCulled(face);
 
-        return !RenderHelper.shouldDrawInnerFace(blockInfo.blockState, blockInfo.blockView, blockInfo.blockPos, quad.tag() >>> 8, info.getThemeIndex());
+        return !RenderHelper.shouldDrawInnerFace(blockInfo.blockState, blockInfo.blockView, blockInfo.blockPos, quad.tag() >>> 8, info.getThemeIndex(), info.getModelHash());
     }
 }

src/main/java/fr/adrien1106/reframed/mixin/compat/IndiumTerrainBlockRenderInfoMixin.java

@@ -19,6 +19,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 public abstract class IndiumTerrainBlockRenderInfoMixin extends BlockRenderInfo implements IBlockRenderInfoMixin {
 
     @Unique private int theme_index = 0;
+    @Unique private int model_hash = 0;
 
     @Redirect(
         method = "shouldDrawFaceInner",
@@ -36,8 +37,9 @@ public abstract class IndiumTerrainBlockRenderInfoMixin extends BlockRenderInfo
     }
 
     @Override
-    public void prepareForBlock(BlockState blockState, BlockPos blockPos, long seed, boolean modelAo, int theme_index) {
+    public void prepareForBlock(BlockState blockState, BlockPos blockPos, long seed, boolean modelAo, int theme_index, int model_hash) {
         this.theme_index = theme_index;
+        this.model_hash = model_hash;
         prepareForBlock(blockState, blockPos, seed, modelAo);
     }
 
@@ -45,4 +47,9 @@ public abstract class IndiumTerrainBlockRenderInfoMixin extends BlockRenderInfo
     public int getThemeIndex() {
         return theme_index;
     }
+
+    @Override
+    public int getModelHash() {
+        return model_hash;
+    }
 }

src/main/java/fr/adrien1106/reframed/mixin/compat/IndiumTerrainRenderContextMixin.java

@@ -1,15 +1,19 @@
 package fr.adrien1106.reframed.mixin.compat;
 
 import fr.adrien1106.reframed.client.model.MultiRetexturableModel;
+import fr.adrien1106.reframed.client.model.RetexturingBakedModel;
 import fr.adrien1106.reframed.client.util.RenderHelper;
 import fr.adrien1106.reframed.util.mixin.IBlockRenderInfoMixin;
 import fr.adrien1106.reframed.util.mixin.IMultipartBakedModelMixin;
+import link.infra.indium.renderer.aocalc.AoCalculator;
 import link.infra.indium.renderer.render.AbstractBlockRenderContext;
+import link.infra.indium.renderer.render.BlockRenderInfo;
 import link.infra.indium.renderer.render.TerrainRenderContext;
 import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderContext;
-import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
 import net.minecraft.client.render.model.BakedModel;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -28,18 +32,34 @@ public abstract class IndiumTerrainRenderContextMixin extends AbstractBlockRende
         ), remap = false,
         cancellable = true)
     private void renderMultipleModels(BlockRenderContext ctx, CallbackInfo ci) {
-        if (!(ctx.model() instanceof IMultipartBakedModelMixin wrapped)
-            || !(wrapped.getModel(ctx.state()) instanceof MultiRetexturableModel retexturing_model)) return;
+        if (!(ctx.model() instanceof IMultipartBakedModelMixin wrapped)) return;
+        List<BakedModel> models = wrapped.getModels(ctx.state());
+        if (models.stream().noneMatch(bakedModel ->
+            bakedModel instanceof MultiRetexturableModel
+                || bakedModel instanceof RetexturingBakedModel
+        )) return;
 
-        List<ForwardingBakedModel> models = retexturing_model.models();
-        RenderHelper.computeInnerCull(ctx.state(), models);
-        int i = 0;
-        for (BakedModel model : models) {
-            i++;
-            aoCalc.clear();
-            ((IBlockRenderInfoMixin) blockInfo).prepareForBlock(ctx.state(), ctx.pos(), ctx.seed(), model.useAmbientOcclusion(), i);
-            model.emitBlockQuads(blockInfo.blockView, blockInfo.blockState, blockInfo.blockPos, blockInfo.randomSupplier, this);
-        }
+        models.forEach(model -> {
+            if (model instanceof MultiRetexturableModel multi_model) {
+                RenderHelper.computeInnerCull(ctx.state(), multi_model.models(), model.hashCode());
+                multi_model.models().forEach(rexteruable_model ->
+                    renderModel(ctx, rexteruable_model, aoCalc, blockInfo, this, model.hashCode())
+                );
+            } else if (model instanceof RetexturingBakedModel rexteruable_model)
+                renderModel(ctx, rexteruable_model, aoCalc, blockInfo, this, model.hashCode());
+            else model.emitBlockQuads(blockInfo.blockView, blockInfo.blockState, blockInfo.blockPos, blockInfo.randomSupplier, this);
+        });
         ci.cancel();
     }
+
+    @Unique
+    private static void renderModel(BlockRenderContext ctx, RetexturingBakedModel model, AoCalculator aoCalc, BlockRenderInfo block_info, RenderContext context, int model_hash) {
+        aoCalc.clear();
+        ((IBlockRenderInfoMixin) block_info).prepareForBlock(
+            ctx.state(), ctx.pos(), ctx.seed(),
+            model.useAmbientOcclusion(block_info.blockView, ctx.pos()),
+            model.getThemeIndex(), model_hash
+        );
+        model.emitBlockQuads(block_info.blockView, block_info.blockState, block_info.blockPos, block_info.randomSupplier, context);
+    }
 }

src/main/java/fr/adrien1106/reframed/mixin/logic/BlockItemMixin.java

@@ -0,0 +1,57 @@
+package fr.adrien1106.reframed.mixin.logic;
+
+import fr.adrien1106.reframed.block.ReFramedBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BlockItem.class)
+public class BlockItemMixin {
+
+    @Unique private final ThreadLocal<BlockState> old_state = new ThreadLocal<>();
+    @Unique private final ThreadLocal<BlockEntity> old_entity = new ThreadLocal<>();
+
+    @Redirect(
+        method = "place(Lnet/minecraft/item/ItemPlacementContext;)Lnet/minecraft/util/ActionResult;",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/block/Block;onPlaced(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;)V"
+        )
+    )
+    private void placeMoreInfo(Block block, World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+        if (!(block instanceof ReFramedBlock frame_block)) {
+            block.onPlaced(world, pos, state, placer, itemStack);
+            return;
+        }
+        frame_block.onPlaced(world, pos, state, placer, itemStack, old_state.get(), old_entity.get());
+    }
+
+    @Inject(
+        method = "place(Lnet/minecraft/item/ItemPlacementContext;)Lnet/minecraft/util/ActionResult;",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/item/BlockItem;place(Lnet/minecraft/item/ItemPlacementContext;Lnet/minecraft/block/BlockState;)Z",
+            shift = At.Shift.BEFORE
+        )
+    )
+    private void savePreviousInfo(ItemPlacementContext context, CallbackInfoReturnable<ActionResult> cir) {
+        World world = context.getWorld();
+        BlockPos pos = context.getBlockPos();
+        old_state.set(world.getBlockState(pos));
+        old_entity.set(world.getBlockEntity(pos));
+    }
+
+}

src/main/java/fr/adrien1106/reframed/mixin/render/AbstractBlockRenderContextMixin.java

@@ -29,8 +29,12 @@ public abstract class AbstractBlockRenderContextMixin {
         )
     )
     private boolean shouldDrawInnerQuad(AbstractBlockRenderContext instance, Direction face, @Local(argsOnly = true) MutableQuadViewImpl quad) {
-        if (face != null || quad.tag() == 0 || !(blockInfo instanceof IBlockRenderInfoMixin info) || info.getThemeIndex() == 0) return isFaceCulled(face);
+        if (face != null
+            || quad.tag() == 0
+            || !(blockInfo instanceof IBlockRenderInfoMixin info)
+            || info.getThemeIndex() == 0
+        ) return isFaceCulled(face);
 
-        return !RenderHelper.shouldDrawInnerFace(blockInfo.blockState, blockInfo.blockView, blockInfo.blockPos, quad.tag() >>> 8, info.getThemeIndex());
+        return !RenderHelper.shouldDrawInnerFace(blockInfo.blockState, blockInfo.blockView, blockInfo.blockPos, quad.tag() >>> 8, info.getThemeIndex(), info.getModelHash());
     }
 }

src/main/java/fr/adrien1106/reframed/mixin/render/BlockRenderInfoMixin.java

@@ -25,6 +25,7 @@ public abstract class BlockRenderInfoMixin implements IBlockRenderInfoMixin {
 
     @Shadow public BlockRenderView blockView;
     @Unique private int theme_index = 0;
+    @Unique private int model_hash = 0;
 
     @ModifyArg(method = "prepareForBlock",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayers;" +
@@ -42,8 +43,9 @@ public abstract class BlockRenderInfoMixin implements IBlockRenderInfoMixin {
 
     @Override
     @Unique
-    public void prepareForBlock(BlockState state, BlockPos pos, boolean ao, int theme_index) {
+    public void prepareForBlock(BlockState state, BlockPos pos, boolean ao, int theme_index, int model_hash) {
         this.theme_index = theme_index;
+        this.model_hash = model_hash;
         prepareForBlock(state, pos, ao);
     }
 
@@ -51,4 +53,9 @@ public abstract class BlockRenderInfoMixin implements IBlockRenderInfoMixin {
     public int getThemeIndex() {
         return theme_index;
     }
+
+    @Override
+    public int getModelHash() {
+        return model_hash;
+    }
 }

src/main/java/fr/adrien1106/reframed/mixin/render/MultipartBakedModelMixin.java

@@ -19,7 +19,7 @@ public class MultipartBakedModelMixin implements IMultipartBakedModelMixin {
     @Shadow @Final private List<Pair<Predicate<BlockState>, BakedModel>> components;
 
     @Override
-    public BakedModel getModel(BlockState state) {
-        return components.stream().map(pair -> pair.getLeft().test(state) ? pair.getRight(): null).filter(Objects::nonNull).findAny().orElse(null);
+    public List<BakedModel> getModels(BlockState state) {
+        return components.stream().map(pair -> pair.getLeft().test(state) ? pair.getRight(): null).filter(Objects::nonNull).toList();
     }
 }

src/main/java/fr/adrien1106/reframed/mixin/render/TerrainRenderContextMixin.java

@@ -1,17 +1,21 @@
 package fr.adrien1106.reframed.mixin.render;
 
 import fr.adrien1106.reframed.client.model.MultiRetexturableModel;
+import fr.adrien1106.reframed.client.model.RetexturingBakedModel;
 import fr.adrien1106.reframed.client.util.RenderHelper;
 import fr.adrien1106.reframed.util.mixin.IBlockRenderInfoMixin;
 import fr.adrien1106.reframed.util.mixin.IMultipartBakedModelMixin;
-import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
+import net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.AoCalculator;
 import net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractBlockRenderContext;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo;
 import net.fabricmc.fabric.impl.client.indigo.renderer.render.TerrainRenderContext;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -27,18 +31,34 @@ public abstract class TerrainRenderContextMixin extends AbstractBlockRenderConte
         ), remap = false,
         cancellable = true)
     private void renderMultipleModels(BlockState state, BlockPos pos, BakedModel wrapper, MatrixStack matrixStack, CallbackInfo ci) {
-        if (!(wrapper instanceof IMultipartBakedModelMixin wrapped)
-            || !(wrapped.getModel(state) instanceof MultiRetexturableModel retexturing_model)) return;
+        if (!(wrapper instanceof IMultipartBakedModelMixin wrapped)) return;
+        List<BakedModel> models = wrapped.getModels(state);
+        if (models.stream().noneMatch(bakedModel ->
+            bakedModel instanceof MultiRetexturableModel
+            || bakedModel instanceof RetexturingBakedModel
+        )) return;
 
-        List<ForwardingBakedModel> models = retexturing_model.models();
-        RenderHelper.computeInnerCull(state, models);
-        int i = 0;
-        for (BakedModel model : models) {
-            i++;
-            aoCalc.clear();
-            ((IBlockRenderInfoMixin) blockInfo).prepareForBlock(state, pos, model.useAmbientOcclusion(), i);
-            model.emitBlockQuads(blockInfo.blockView, blockInfo.blockState, blockInfo.blockPos, blockInfo.randomSupplier, this);
-        }
+        models.forEach(model -> {
+            if (model instanceof MultiRetexturableModel multi_model) {
+                RenderHelper.computeInnerCull(state, multi_model.models(), model.hashCode());
+                multi_model.models().forEach(retexturable_model ->
+                    renderModel(state, retexturable_model, pos, aoCalc, blockInfo, this, model.hashCode())
+                );
+            } else if (model instanceof RetexturingBakedModel retexturable_model)
+                renderModel(state, retexturable_model, pos, aoCalc, blockInfo, this, model.hashCode());
+            else model.emitBlockQuads(blockInfo.blockView, blockInfo.blockState, blockInfo.blockPos, blockInfo.randomSupplier, this);
+        });
         ci.cancel();
     }
+
+    @Unique
+    private static void renderModel(BlockState state, RetexturingBakedModel model, BlockPos pos, AoCalculator aoCalc, BlockRenderInfo block_info, RenderContext context, int model_hash) {
+        aoCalc.clear();
+        ((IBlockRenderInfoMixin) block_info).prepareForBlock(
+            state, pos,
+            model.useAmbientOcclusion(block_info.blockView, pos),
+            model.getThemeIndex(), model_hash
+        );
+        model.emitBlockQuads(block_info.blockView, block_info.blockState, block_info.blockPos, block_info.randomSupplier, context);
+    }
 }

src/main/java/fr/adrien1106/reframed/util/blocks/BlockHelper.java

@@ -130,14 +130,14 @@ public class BlockHelper {
         return shape;
     }
 
-    public static String getNeighborPos(Edge face, Direction direction, Boolean reverse, Direction reference, BlockView world, BlockPos pos) {
+    public static String getNeighborPos(Edge edge, Direction direction, Boolean reverse, Direction reference, BlockView world, BlockPos pos) {
         BlockState block_state = world.getBlockState(
             pos.offset(reverse ? direction.getOpposite() : direction)
         );
 
         if (isStair(block_state) && block_state.get(EDGE).hasDirection(reference)) {
-            if (block_state.get(EDGE).hasDirection(face.getLeftDirection())) return "left";
-            else if (block_state.get(EDGE).hasDirection(face.getRightDirection())) return "right";
+            if (block_state.get(EDGE).hasDirection(edge.getLeftDirection())) return "left";
+            else if (block_state.get(EDGE).hasDirection(edge.getRightDirection())) return "right";
         }
         return "";
     }

src/main/java/fr/adrien1106/reframed/util/blocks/Corner.java

@@ -1,5 +1,7 @@
 package fr.adrien1106.reframed.util.blocks;
 
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.Direction;
 
@@ -37,6 +39,18 @@ public enum Corner implements StringIdentifiable {
         return asString();
     }
 
+    public Direction getFirstDirection() {
+        return first_direction;
+    }
+
+    public Direction getSecondDirection() {
+        return second_direction;
+    }
+
+    public Direction getThirdDirection() {
+        return third_direction;
+    }
+
     public boolean hasDirection(Direction direction) {
         return this.first_direction.equals(direction)
             || this.second_direction.equals(direction)
@@ -94,4 +108,33 @@ public enum Corner implements StringIdentifiable {
         Direction other_2 = second_direction == direction || first_direction == direction ? third_direction : second_direction;
         return getByDirections(direction, other_1.getOpposite(), other_2.getOpposite());
     }
+
+    public Edge getEdge(Direction direction) {
+        return Edge.getByDirections(
+            first_direction == direction ? second_direction : first_direction,
+            second_direction == direction || first_direction == direction ? third_direction : second_direction
+        );
+    }
+
+    public Direction getOtherDirection(Edge edge) {
+        if (edge.getFirstDirection() != second_direction && edge.getSecondDirection() != second_direction) return second_direction;
+        if (edge.getFirstDirection() != third_direction && edge.getSecondDirection() != third_direction) return third_direction;
+        return first_direction;
+    }
+
+    public Corner rotate(BlockRotation rotation) {
+        return getByDirections(
+            rotation.rotate(first_direction),
+            rotation.rotate(second_direction),
+            rotation.rotate(third_direction)
+        );
+    }
+
+    public Corner mirror(BlockMirror mirror) {
+        return getByDirections(
+            mirror.apply(first_direction),
+            mirror.apply(second_direction),
+            mirror.apply(third_direction)
+        );
+    }
 }

src/main/java/fr/adrien1106/reframed/util/blocks/Edge.java

@@ -1,5 +1,7 @@
 package fr.adrien1106.reframed.util.blocks;
 
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.Direction;
 
@@ -48,19 +50,17 @@ public enum Edge implements StringIdentifiable {
     public Direction getSecondDirection() {
         return second_direction;
     }
+
     public Direction getRightDirection() {
-        return switch (axis) {
-            case X -> Direction.WEST;
-            case Y -> Direction.DOWN;
-            case Z -> Direction.SOUTH;
-        };
+        return Direction.from(axis, Direction.AxisDirection.NEGATIVE);
     }
+
     public Direction getLeftDirection() {
-        return switch (axis) {
-            case X -> Direction.EAST;
-            case Y -> Direction.UP;
-            case Z -> Direction.NORTH;
-        };
+        return Direction.from(axis, Direction.AxisDirection.POSITIVE);
+    }
+
+    public Direction getFace() {
+        return first_direction == Direction.UP || first_direction == Direction.DOWN ? second_direction : first_direction;
     }
 
     public boolean hasDirection(Direction direction) {
@@ -68,16 +68,32 @@ public enum Edge implements StringIdentifiable {
             || this.second_direction.equals(direction);
     }
 
+    public Direction.Axis getAxis() {
+        return this.axis;
+    }
+
     public int getID() {
         return this.ID;
     }
 
+    public Edge opposite() {
+        return getByDirections(first_direction.getOpposite(), second_direction.getOpposite());
+    }
+
     public static Edge getByDirections(Direction direction_1, Direction direction_2) {
         return Arrays.stream(Edge.values())
             .filter(value -> value.hasDirection(direction_1) && value.hasDirection(direction_2))
             .findFirst().orElse(Edge.NORTH_DOWN);
     }
 
+    public boolean isSide(Direction side) {
+        return getRightDirection() == side || getLeftDirection() == side;
+    }
+
+    public Direction getOtherDirection(Direction direction) {
+        return first_direction == direction ? second_direction : first_direction;
+    }
+
     public static Edge fromId(int id) {
         return Arrays.stream(Edge.values())
             .filter(value -> value.getID() == id)
@@ -89,4 +105,18 @@ public enum Edge implements StringIdentifiable {
             .filter(value -> value.name().equals(name))
             .findFirst().orElse(Edge.NORTH_DOWN);
     }
+
+    public Edge rotate(BlockRotation rotation) {
+        return getByDirections(
+            rotation.rotate(first_direction),
+            rotation.rotate(second_direction)
+        );
+    }
+
+    public Edge mirror(BlockMirror mirror) {
+        return getByDirections(
+            mirror.apply(first_direction),
+            mirror.apply(second_direction)
+        );
+    }
 }

src/main/java/fr/adrien1106/reframed/util/blocks/StairShape.java

@@ -48,4 +48,31 @@ public enum StairShape implements StringIdentifiable {
             .findFirst().orElse(StairShape.STRAIGHT);
     }
 
+    public StairShape mirror() {
+        return switch (this) {
+            case STRAIGHT -> STRAIGHT;
+            case INNER_RIGHT -> INNER_LEFT;
+            case INNER_LEFT -> INNER_RIGHT;
+            case OUTER_RIGHT -> OUTER_LEFT;
+            case OUTER_LEFT -> OUTER_RIGHT;
+            case FIRST_OUTER_RIGHT -> FIRST_OUTER_LEFT;
+            case FIRST_OUTER_LEFT -> FIRST_OUTER_RIGHT;
+            case SECOND_OUTER_RIGHT -> SECOND_OUTER_LEFT;
+            case SECOND_OUTER_LEFT -> SECOND_OUTER_RIGHT;
+        };
+    }
+
+    public StairShape flip() {
+        return switch (this) {
+            case STRAIGHT -> STRAIGHT;
+            case INNER_RIGHT -> INNER_RIGHT;
+            case INNER_LEFT -> INNER_LEFT;
+            case OUTER_RIGHT -> OUTER_RIGHT;
+            case OUTER_LEFT -> OUTER_LEFT;
+            case FIRST_OUTER_RIGHT -> SECOND_OUTER_RIGHT;
+            case FIRST_OUTER_LEFT -> SECOND_OUTER_LEFT;
+            case SECOND_OUTER_RIGHT -> FIRST_OUTER_RIGHT;
+            case SECOND_OUTER_LEFT -> FIRST_OUTER_LEFT;
+        };
+    }
 }

src/main/java/fr/adrien1106/reframed/util/mixin/IBlockRenderInfoMixin.java

@@ -5,9 +5,11 @@ import net.minecraft.util.math.BlockPos;
 
 public interface IBlockRenderInfoMixin {
 
-    void prepareForBlock(BlockState state, BlockPos pos, boolean ao, int theme_index);
+    void prepareForBlock(BlockState state, BlockPos pos, boolean ao, int theme_index, int model_hash);
 
-    void prepareForBlock(BlockState state, BlockPos pos, long seed, boolean ao, int theme_index);
+    void prepareForBlock(BlockState state, BlockPos pos, long seed, boolean ao, int theme_index, int model_hash);
 
     int getThemeIndex();
+
+    int getModelHash();
 }

src/main/java/fr/adrien1106/reframed/util/mixin/IMultipartBakedModelMixin.java

@@ -3,7 +3,9 @@ package fr.adrien1106.reframed.util.mixin;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
 
+import java.util.List;
+
 public interface IMultipartBakedModelMixin {
 
-    BakedModel getModel(BlockState state);
+    List<BakedModel> getModels(BlockState state);
 }

src/main/resources/assets/reframed/models/block/door.json

@@ -0,0 +1,34 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [14, 0, 0],
+			"to": [16, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 0]},
+			"faces": {
+				"north": {"uv": [0, 0, 2, 16], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"},
+				"south": {"uv": [14, 0, 16, 16], "texture": "#side", "cullface": "south"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
+				"down": {"uv": [14, 0, 16, 16], "texture": "#bottom", "cullface": "down"}
+			}
+		},
+		{
+			"from": [14, 16, 0],
+			"to": [16, 32, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [7, 16, 0]},
+			"faces": {
+				"north": {"uv": [0, 0, 2, 0], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"},
+				"south": {"uv": [14, 0, 16, 0], "texture": "#side", "cullface": "south"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
+				"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"}
+			}
+		}
+	],
+	"display": {}
+}

src/main/resources/assets/reframed/models/block/pane.json

@@ -0,0 +1,21 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [7, 0, 0],
+			"to": [9, 16, 16],
+			"faces": {
+				"north": {"uv": [7, 0, 9, 16], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#side"},
+				"south": {"uv": [7, 0, 9, 16], "texture": "#side", "cullface": "south"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
+				"up": {"uv": [7, 0, 9, 16], "texture": "#top", "cullface": "up"},
+				"down": {"uv": [7, 0, 9, 16], "texture": "#bottom", "cullface": "down"}
+			}
+		}
+	]
+}

src/main/resources/assets/reframed/models/block/pillar.json

@@ -0,0 +1,21 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [4, 0, 4],
+			"to": [12, 16, 12],
+			"faces": {
+				"north": {"uv": [4, 0, 12, 16], "texture": "#side"},
+				"east": {"uv": [4, 0, 12, 16], "texture": "#side"},
+				"south": {"uv": [4, 0, 12, 16], "texture": "#side"},
+				"west": {"uv": [4, 0, 12, 16], "texture": "#side"},
+				"up": {"uv": [4, 4, 12, 12], "texture": "#top", "cullface": "up"},
+				"down": {"uv": [4, 4, 12, 12], "texture": "#bottom", "cullface": "down"}
+			}
+		}
+	]
+}

src/main/resources/assets/reframed/models/block/wall/full/inventory/sides.json

@@ -0,0 +1,33 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [5, 0, 0],
+			"to": [11, 14, 4],
+			"faces": {
+				"north": {"uv": [5, 2, 11, 16], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [12, 2, 16, 16], "texture": "#side"},
+				"south": {"uv": [5, 2, 11, 16], "texture": "#side"},
+				"west": {"uv": [0, 2, 4, 16], "texture": "#side"},
+				"up": {"uv": [5, 0, 11, 4], "texture": "#top"},
+				"down": {"uv": [5, 12, 11, 16], "texture": "#bottom"}
+			}
+		},
+		{
+			"from": [5, 0, 12],
+			"to": [11, 14, 16],
+			"faces": {
+				"north": {"uv": [5, 2, 11, 16], "texture": "#side"},
+				"east": {"uv": [0, 2, 4, 16], "texture": "#side"},
+				"south": {"uv": [5, 2, 11, 16], "texture": "#side", "cullface": "south"},
+				"west": {"uv": [12, 2, 16, 16], "texture": "#side"},
+				"up": {"uv": [5, 12, 11, 16], "texture": "#top"},
+				"down": {"uv": [5, 0, 11, 4], "texture": "#bottom"}
+			}
+		}
+	]
+}

src/main/resources/assets/reframed/models/block/wall/full/pillar/low.json

@@ -0,0 +1,35 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [4, 0, 4],
+			"to": [5, 14, 5],
+			"faces": {
+				"north": {"uv": [11, 2, 12, 16], "texture": "#side"},
+				"west": {"uv": [4, 2, 5, 16], "texture": "#side"},
+				"down": {"uv": [4, 11, 5, 12], "texture": "#bottom", "cullface": "down"}
+			}
+		},
+		{
+			"from": [5, 0, 4],
+			"to": [11, 14, 5],
+			"faces": {
+				"north": {"uv": [5, 2, 11, 16], "texture": "#side"},
+				"down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"}
+			}
+		},
+		{
+			"from": [4, 14, 4],
+			"to": [11, 16, 5],
+			"faces": {
+				"north": {"uv": [5, 0, 12, 2], "texture": "#side"},
+				"west": {"uv": [4, 0, 5, 2], "texture": "#side"},
+				"up": {"uv": [5, 4, 12, 5], "texture": "#top", "cullface": "up"}
+			}
+		}
+	]
+}

src/main/resources/assets/reframed/models/block/wall/full/pillar/tall.json

@@ -0,0 +1,28 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [4, 0, 4],
+			"to": [5, 16, 5],
+			"faces": {
+				"north": {"uv": [11, 0, 12, 16], "texture": "#side"},
+				"west": {"uv": [4, 0, 5, 16], "texture": "#side"},
+				"up": {"uv": [4, 4, 5, 5], "texture": "#top", "cullface": "up"},
+				"down": {"uv": [4, 11, 5, 12], "texture": "#bottom", "cullface": "down"}
+			}
+		},
+		{
+			"from": [5, 0, 4],
+			"to": [11, 16, 5],
+			"faces": {
+				"north": {"uv": [5, 0, 11, 16], "texture": "#side"},
+				"up": {"uv": [5, 4, 11, 5], "texture": "#top", "cullface": "up"},
+				"down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"}
+			}
+		}
+	]
+}

src/main/resources/assets/reframed/models/block/wall/full/side/low.json

@@ -0,0 +1,21 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [5, 0, 0],
+			"to": [11, 14, 4],
+			"faces": {
+				"north": {"uv": [5, 2, 11, 16], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [12, 2, 16, 16], "texture": "#side"},
+				"south": {"uv": [5, 2, 11, 16], "texture": "#side"},
+				"west": {"uv": [0, 2, 4, 16], "texture": "#side"},
+				"up": {"uv": [5, 0, 11, 4], "texture": "#top"},
+				"down": {"uv": [5, 12, 11, 16], "texture": "#bottom", "cullface": "down"}
+			}
+		}
+	]
+}

src/main/resources/assets/reframed/models/block/wall/full/side/tall.json

@@ -0,0 +1,21 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#side"
+	},
+	"elements": [
+		{
+			"from": [5, 0, 0],
+			"to": [11, 16, 4],
+			"faces": {
+				"north": {"uv": [5, 0, 11, 16], "texture": "#side", "cullface": "north"},
+				"east": {"uv": [12, 0, 16, 16], "texture": "#side"},
+				"south": {"uv": [5, 0, 11, 16], "texture": "#side"},
+				"west": {"uv": [0, 0, 4, 16], "texture": "#side"},
+				"up": {"uv": [5, 0, 11, 4], "texture": "#top", "cullface": "up"},
+				"down": {"uv": [5, 12, 11, 16], "texture": "#bottom", "cullface": "down"}
+			}
+		}
+	]
+}