Added rebar concrete tile stairs. Added treated wood window sill. Added decomposition recipes for stairs and tiles. Changed stair recipe yield quantity from 9 to 6.

.gitignore

@@ -30,3 +30,4 @@ src/main/resources/assets/minecraft
 .gimp
 *.xcf
 desktop.ini
+/*.txt

1.12/.gitignore

@@ -30,3 +30,4 @@ src/main/resources/assets/minecraft
 .gimp
 *.xcf
 desktop.ini
+/*.txt

1.12/gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.12.2
 version_forge=14.23.5.2768
-version_engineersdecor=1.0.2-b1
+version_engineersdecor=1.0.2-b2
 #
 # jar signing data loaded from signing.properties in the project root.
 #

1.12/meta/update.json

@@ -1,6 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.12.2": {
+    "1.0.2-b2": "[A] Added rebar concrete tile stairs.\n[A] Added treated wood window sill.\n[A] Added decomposition recipes for stairs and tiles.\n[M] Changed stair recipe yield quantity from 9 to 6.",
     "1.0.2-b1": "[A] Added rebar concrete tile.\n[A] Added panzer glass (explosion-resistant reinforced glass).\n[M] Treated wood crafting table supports shift-click to transfer stacks between player inventory and crafting table storage (thanks majijn for the hint).",
     "1.0.1": "[R] Release based on v1.0.1-b4 * Treated wood crafting table * Clinker brick wall * Treated wood stool * Inset spot light * Recipe fixes * Logo updated",
     "1.0.1-b4": "[M] Crafting table keeps inventory and has eight storage slots.\n[M] Adapted inset light strength and harvest tool.\n[M] Crafting table recipe adapted.",
@@ -15,6 +16,6 @@
   },
   "promos": {
     "1.12.2-recommended": "1.0.1",
-    "1.12.2-latest": "1.0.2-b1"
+    "1.12.2-latest": "1.0.2-b2"
   }
 }

1.12/readme.md

@@ -10,6 +10,11 @@ Mod sources for Minecraft version 1.12.2.
 ----
 ## Revision history
 
+    - v1.0.2-b2 [A] Added rebar concrete tile stairs.
+                [A] Added treated wood window sill.
+                [A] Added decomposition recipes for stairs and tiles.
+                [M] Changed stair recipe yield quantity from 9 to 6.
+
     - v1.0.2-b1 [A] Added rebar concrete tile.
                 [A] Added panzer glass (explosion-resistant reinforced glass).
                 [M] Treated wood crafting table supports shift-click to transfer

1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java

@@ -41,13 +41,15 @@ public class BlockDecor extends Block
   // The config combines some aspects of blocks, allowing to define different behaviour at construction time, without excessive polymorphy.
   // It's an old school flag set as it is used internally only and shall not have as littlt impact on performance as possible.
   public final long config;
-  public static final long CFG_DEFAULT                = 0x0000000000000000L; // no special config
+  public static final long CFG_DEFAULT                    = 0x0000000000000000L; // no special config
-  public static final long CFG_CUTOUT                 = 0x0000000000000001L; // cutout rendering
+  public static final long CFG_CUTOUT                     = 0x0000000000000001L; // cutout rendering
-  public static final long CFG_HORIZIONTAL            = 0x0000000000000002L; // horizontal block, affects bounding box calculation at construction time
+  public static final long CFG_HORIZIONTAL                = 0x0000000000000002L; // horizontal block, affects bounding box calculation at construction time and placement
-  public static final long CFG_HORIZIONTAL_PLACEMENT  = 0x0000000000000004L; // placed in the horizontzal direction the player is looking when placing.
+  public static final long CFG_LOOK_PLACEMENT             = 0x0000000000000004L; // placed in direction the player is looking when placing.
-  public static final long CFG_OPPOSITE_PLACEMENT     = 0x0000000000000008L; // placed placed in the opposite direction of the face the player clicked.
+  public static final long CFG_FACING_PLACEMENT           = 0x0000000000000008L; // placed on the facing the player has clicked.
-  public static final long CFG_LIGHT_VALUE_MASK       = 0x00000000000000f0L; // fixed value for getLightValue()
+  public static final long CFG_OPPOSITE_PLACEMENT         = 0x0000000000000020L; // placed placed in the opposite direction of the face the player clicked.
-  public static final long CFG_LIGHT_VALUE_SHIFT      = 4L;
+
+  public static final long CFG_LIGHT_VALUE_MASK           = 0x0000000000000f00L; // fixed value for getLightValue()
+  public static final long CFG_LIGHT_VALUE_SHIFT          = 8L;
 
   public BlockDecor(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound)
   {

1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDirected.java

@@ -105,16 +105,31 @@ public class BlockDecorDirected extends BlockDecor
   public IBlockState withMirror(IBlockState state, Mirror mirrorIn)
   { return state.withRotation(mirrorIn.toRotation((EnumFacing)state.getValue(FACING))); }
 
+  @Override
+  @SuppressWarnings("deprecation")
+  public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side)
+  {
+    if(!super.canPlaceBlockOnSide(world, pos, side)) return false;
+    return !(((config & (CFG_HORIZIONTAL|CFG_LOOK_PLACEMENT))==(CFG_HORIZIONTAL)) && ((side==EnumFacing.UP)||(side==EnumFacing.DOWN)));
+  }
+
   @Override
   @SuppressWarnings("deprecation")
   public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
   {
-    if((config & CFG_HORIZIONTAL_PLACEMENT)!=0) {
+    if((config & (CFG_HORIZIONTAL|CFG_LOOK_PLACEMENT)) == (CFG_HORIZIONTAL|CFG_LOOK_PLACEMENT)) {
-      // placement in direction the player is facing
+      // horizontal placement in direction the player is looking
-      return getDefaultState().withProperty(FACING, placer.getHorizontalFacing());
+      facing = placer.getHorizontalFacing();
+    } else if((config & (CFG_HORIZIONTAL|CFG_LOOK_PLACEMENT)) == (CFG_HORIZIONTAL)) {
+      // horizontal placement on a face
+      facing = ((facing==EnumFacing.UP)||(facing==EnumFacing.DOWN)) ? (EnumFacing.NORTH) : facing;
+    } else if((config & CFG_LOOK_PLACEMENT)!=0) {
+      // placement in direction the player is looking, with up and down
+      facing = EnumFacing.getDirectionFromEntityLiving(pos, placer);
     } else {
       // default: placement on the face the player clicking
-      return getDefaultState().withProperty(FACING, ((config & CFG_OPPOSITE_PLACEMENT)==0) ? facing : facing.getOpposite());
     }
+    if((config & CFG_OPPOSITE_PLACEMENT)!=0) facing = facing.getOpposite();
+    return getDefaultState().withProperty(FACING, facing);
   }
 }

1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java

@@ -46,6 +46,7 @@ public class ModBlocks
   public static final BlockDecorStairs REBAR_CONCRETE_STAIRS = new BlockDecorStairs("rebar_concrete_stairs", REBAR_CONCRETE_BLOCK.getDefaultState());
   public static final BlockDecorWall REBAR_CONCRETE_WALL = new BlockDecorWall("rebar_concrete_wall", BlockDecor.CFG_DEFAULT, Material.ROCK, 8f, 2000f, SoundType.STONE);
   public static final BlockDecorFull REBAR_CONCRETE_TILE = new BlockDecorFull("rebar_concrete_tile", 0, Material.ROCK, 8f, 2000f, SoundType.STONE);
+  public static final BlockDecorStairs REBAR_CONCRETE_TILE_STAIRS = new BlockDecorStairs("rebar_concrete_tile_stairs", REBAR_CONCRETE_TILE.getDefaultState());
 
   public static final BlockDecorWall CONCRETE_WALL = new BlockDecorWall("concrete_wall", BlockDecor.CFG_DEFAULT, Material.ROCK, 8f, 50f, SoundType.STONE);
 
@@ -57,26 +58,26 @@ public class ModBlocks
 
   public static final BlockDecorDirected TREATED_WOOD_POLE = new BlockDecorDirected(
     "treated_wood_pole",
-    BlockDecor.CFG_CUTOUT,
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_FACING_PLACEMENT,
     Material.WOOD, 1.0f, 15f, SoundType.WOOD,
     ModAuxiliaries.getPixeledAABB(5.8,5.8,0, 10.2,10.2,16)
   );
 
   public static final BlockDecor TREATED_WOOD_TABLE = new BlockDecor(
     "treated_wood_table",
-    BlockDecor.CFG_CUTOUT,
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT,
     Material.WOOD, 1.0f, 15f, SoundType.WOOD
   );
   public static final BlockDecorChair TREATED_WOOD_STOOL = new BlockDecorChair(
     "treated_wood_stool",
-    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL_PLACEMENT|BlockDecor.CFG_HORIZIONTAL,
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT,
     Material.WOOD, 1.0f, 15f, SoundType.WOOD,
     ModAuxiliaries.getPixeledAABB(4.1,0,4.1, 11.8,8.8,11.8)
   );
 
   public static final BlockDecorCraftingTable TREATED_WOOD_CRAFTING_TABLE = new BlockDecorCraftingTable(
     "treated_wood_crafting_table",
-    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL_PLACEMENT|BlockDecor.CFG_HORIZIONTAL,
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT,
     Material.WOOD, 1.0f, 15f, SoundType.WOOD,
     ModAuxiliaries.getPixeledAABB(0.0,0,0, 16,15.9,16)
   );
@@ -88,29 +89,38 @@ public class ModBlocks
     ModAuxiliaries.getPixeledAABB(5.2,5.2,15.7, 10.8,10.8,16.0)
   );
 
+  public static final BlockDecorDirected TREATED_WOOD_WINDOWSILL = new BlockDecorDirected(
+    "treated_wood_windowsill",
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_FACING_PLACEMENT,
+    Material.WOOD, 1.0f, 15f, SoundType.WOOD,
+    ModAuxiliaries.getPixeledAABB(0.5,15,10.5, 15.5,16,16)
+  );
+
   public static final BlockDecorFull IRON_SHEET_ROOF_FULLBLOCK = new BlockDecorFull("iron_sheet_roof_block", 0, Material.IRON, 1.8f, 25f, SoundType.METAL);
   public static final BlockDecorStairs IRON_SHEET_ROOF = new BlockDecorStairs("iron_sheet_roof", IRON_SHEET_ROOF_FULLBLOCK.getDefaultState());
 
   private static final Block modBlocks[] = {
-    SLAG_BRICK_BLOCK,
+    TREATED_WOOD_CRAFTING_TABLE,
     CLINKER_BRICK_BLOCK,
-    METAL_RUNG_LADDER,
-    METAL_RUNG_STEPS,
-    TREATED_WOOD_LADDER,
     CLINKER_BRICK_STAIRS,
+    CLINKER_BRICK_WALL,
+    SLAG_BRICK_BLOCK,
     SLAG_BRICK_STAIRS,
-    TREATED_WOOD_POLE,
-    TREATED_WOOD_TABLE,
     REBAR_CONCRETE_BLOCK,
     REBAR_CONCRETE_STAIRS,
     REBAR_CONCRETE_WALL,
     REBAR_CONCRETE_TILE,
-    CLINKER_BRICK_WALL,
+    REBAR_CONCRETE_TILE_STAIRS,
-    TREATED_WOOD_STOOL,
+    CONCRETE_WALL,
-    TREATED_WOOD_CRAFTING_TABLE,
-    INSET_LIGHT_IRON,
     PANZERGLASS_BLOCK,
-    CONCRETE_WALL
+    METAL_RUNG_LADDER,
+    METAL_RUNG_STEPS,
+    TREATED_WOOD_LADDER,
+    TREATED_WOOD_POLE,
+    TREATED_WOOD_TABLE,
+    TREATED_WOOD_STOOL,
+    TREATED_WOOD_WINDOWSILL,
+    INSET_LIGHT_IRON,
   };
 
   private static final Block devBlocks[] = {

1.12/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_tile_stairs.json

@@ -0,0 +1,56 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:stairs/decor_straight_stairs_model",
+    "textures": {
+      "particle": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture0",
+      "bottom": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture0",
+      "top": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture0",
+      "side": "engineersdecor:blocks/concrete/rebar_concrete_tile_texture0"
+    }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "facing=east,half=bottom,shape=straight":  { "model": "engineersdecor:stairs/decor_straight_stairs_model" },
+    "facing=west,half=bottom,shape=straight":  { "model": "engineersdecor:stairs/decor_straight_stairs_model", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "engineersdecor:stairs/decor_outer_stairs_model" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "y": 180, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "engineersdecor:stairs/decor_inner_stairs_model" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 180, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 90, "uvlock": true },
+    "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 270, "uvlock": true },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 270, "uvlock": true },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 90, "uvlock": true },
+    "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "y": 180, "uvlock": true },
+    "facing=east,half=top,shape=straight":  { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=straight":  { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=straight": { "model": "engineersdecor:stairs/decor_straight_stairs_model", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=outer_right":  { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=outer_right":  { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=outer_left":  { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=outer_left":  { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:stairs/decor_outer_stairs_model", "x": 180, "y": 270, "uvlock": true },
+    "facing=east,half=top,shape=inner_right":  { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 90, "uvlock": true },
+    "facing=west,half=top,shape=inner_right":  { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 270, "uvlock": true },
+    "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 180, "uvlock": true },
+    "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "uvlock": true },
+    "facing=east,half=top,shape=inner_left":  { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "uvlock": true },
+    "facing=west,half=top,shape=inner_left":  { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 180, "uvlock": true },
+    "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 90, "uvlock": true },
+    "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:stairs/decor_inner_stairs_model", "x": 180, "y": 270, "uvlock": true }
+  }
+}

1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_windowsill.json

@@ -0,0 +1,11 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "engineersdecor:furniture/treated_wood_windowsill_model"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}],
+    "facing": { "north": {"y":0}, "south": {"y":180}, "west": {"y":-90}, "east": {"y":90}, "up":{}, "down":{} }
+  }
+}

1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang

@@ -43,6 +43,8 @@ tile.engineersdecor.slag_brick_stairs.name=Clinker brick stairs
 tile.engineersdecor.slag_brick_stairs.help=§6Looks slightly darker and more color intensive than the vanilla brick block.
 tile.engineersdecor.rebar_concrete_stairs.name=Rebar concrete stairs
 tile.engineersdecor.rebar_concrete_stairs.help=§6Steel reinforced concrete stairs.§r Expensive but Creeper-proof like obsidian.
+tile.engineersdecor.rebar_concrete_tile_stairs.name=Rebar concrete tile stairs
+tile.engineersdecor.rebar_concrete_tile_stairs.help=§6Steel reinforced concrete tile stairs.§r Expensive but Creeper-proof like obsidian.
 #-----------------------------------------------------------------------------------------------------------
 tile.engineersdecor.treated_wood_pole.name=Straight treated wood pole
 tile.engineersdecor.treated_wood_pole.help=§6Straight pole fragment with the diameter of a wire relay.§r\n\
@@ -54,11 +56,13 @@ tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r
 tile.engineersdecor.treated_wood_stool.name=Treated wood stool
 tile.engineersdecor.treated_wood_stool.help=§6Robust wood stool.§r Indoor and outdoor use.
 tile.engineersdecor.treated_wood_crafting_table.name=Treated wood crafting table
-tile.engineersdecor.treated_wood_crafting_table.help=§6Robust and weather-proof.
+tile.engineersdecor.treated_wood_crafting_table.help=§6Robust and weather-proof. Eight storage slots. Keeps inventory.
 tile.engineersdecor.iron_inset_light.name=Inset light
 tile.engineersdecor.iron_inset_light.help=§6Small glowstone light source, sunk into the floor, ceiling or wall.§r\n\
                                                Useful to light up places where electrical light installations are problematic.\
                                                Light level like a torch.
+tile.engineersdecor.treated_wood_windowsill.name=Treated wood window sill
+tile.engineersdecor.treated_wood_windowsill.help=§6Simple window decoration.
 #-----------------------------------------------------------------------------------------------------------
 tile.engineersdecor.iron_sheet_roof.name=Iron sheet metal roof
 tile.engineersdecor.iron_sheet_roof.help=§6Well, it's a roof.

1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_model.json

@@ -0,0 +1,78 @@
+{
+	"parent": "block/cube",
+	"textures": {
+		"o": "engineersdecor:blocks/iestyle/treated_wood_rough_texture",
+		"particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture"
+	},
+	"elements": [
+		{
+			"from": [2, 11.75, 14.375],
+			"to": [3, 15.75, 15.375],
+			"rotation": {"angle": -45, "axis": "x", "origin": [2.5, 13, 14.125]},
+			"faces": {
+				"north": {"uv": [6, 3, 7, 7], "texture": "#o"},
+				"east": {"uv": [1.375, 3, 2.375, 7], "texture": "#o"},
+				"south": {"uv": [9, 3, 10, 7], "texture": "#o"},
+				"west": {"uv": [13.625, 3, 14.625, 7], "texture": "#o"}
+			}
+		},
+		{
+			"from": [13, 11.75, 14.375],
+			"to": [14, 15.75, 15.375],
+			"rotation": {"angle": -45, "axis": "x", "origin": [13.5, 13, 14.125]},
+			"faces": {
+				"north": {"uv": [4, 3, 5, 7], "texture": "#o"},
+				"east": {"uv": [1.375, 3, 2.375, 7], "texture": "#o"},
+				"south": {"uv": [11, 3, 12, 7], "texture": "#o"},
+				"west": {"uv": [13.625, 3, 14.625, 7], "texture": "#o"}
+			}
+		},
+		{
+			"from": [0.5, 15, 10.5],
+			"to": [15.5, 16, 16],
+			"faces": {
+				"north": {"uv": [0.5, 0, 15.5, 1], "texture": "#o"},
+				"east": {"uv": [0, 0, 5.5, 1], "texture": "#o"},
+				"south": {"uv": [0.5, 0, 15.5, 1], "texture": "#o"},
+				"west": {"uv": [10.5, 0, 16, 1], "texture": "#o"},
+				"up": {"uv": [0.5, 10.5, 15.5, 16], "texture": "#o"},
+				"down": {"uv": [0.5, 0, 15.5, 5.5], "texture": "#o"}
+			}
+		},
+		{
+			"from": [1.875, 12, 15],
+			"to": [3.125, 15, 16],
+			"faces": {
+				"north": {"uv": [14, 1, 15, 4], "texture": "#o"},
+				"east": {"uv": [0, 1, 1, 4], "texture": "#o"},
+				"south": {"uv": [1, 1, 2, 4], "texture": "#o"},
+				"west": {"uv": [15, 1, 16, 4], "texture": "#o"},
+				"down": {"uv": [1, 0, 2, 1], "texture": "#o"}
+			}
+		},
+		{
+			"from": [12.875, 12, 15],
+			"to": [14.125, 15, 16],
+			"faces": {
+				"north": {"uv": [2, 1, 3, 4], "texture": "#o"},
+				"east": {"uv": [0, 1, 1, 4], "texture": "#o"},
+				"south": {"uv": [13, 1, 14, 4], "texture": "#o"},
+				"west": {"uv": [15, 1, 16, 4], "texture": "#o"},
+				"down": {"uv": [13, 0, 14, 1], "texture": "#o"}
+			}
+		}
+	],
+	"display": {
+		"ground": {
+			"scale": [0.2, 0.2, 0.2]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+      "scale": [0.9, 0.9, 0.9],
+      "translation": [ 3, -8, -3]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+  }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe.json

@@ -19,6 +19,6 @@
   },
   "result": {
     "item": "engineersdecor:clinker_brick_stairs",
-    "count": 9
+    "count": 6
   }
 }

1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json

@@ -18,6 +18,6 @@
   },
   "result": {
     "item": "engineersdecor:clinker_brick_block",
-    "count": 3
+    "count": 4
   }
 }

1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe.json

@@ -19,6 +19,6 @@
   },
   "result": {
     "item": "engineersdecor:rebar_concrete_stairs",
-    "count": 9
+    "count": 6
   }
 }

1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_stairs_recipe_decompose.json

@@ -0,0 +1,23 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:rebar_concrete"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SS",
+    "SS"
+  ],
+  "key": {
+    "S": {
+      "item": "engineersdecor:rebar_concrete_stairs",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:rebar_concrete",
+    "count": 4
+  }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_recipe_decompose.json

@@ -0,0 +1,23 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:rebar_concrete"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "CC",
+    "CC"
+  ],
+  "key": {
+    "C": {
+      "item": "engineersdecor:rebar_concrete_tile",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:rebar_concrete",
+    "count": 4
+  }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe.json

@@ -0,0 +1,24 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:rebar_concrete_tile_stairs"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "C  ",
+    "CC ",
+    "CCC"
+  ],
+  "key": {
+    "C": {
+      "item": "engineersdecor:rebar_concrete_tile",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:rebar_concrete_tile_stairs",
+    "count": 6
+  }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_tile_stairs_recipe_decompose.json

@@ -0,0 +1,23 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:rebar_concrete_tile"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SS",
+    "SS"
+  ],
+  "key": {
+    "S": {
+      "item": "engineersdecor:rebar_concrete_tile_stairs",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:rebar_concrete_tile",
+    "count": 4
+  }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe.json

@@ -19,6 +19,6 @@
   },
   "result": {
     "item": "engineersdecor:slag_brick_stairs",
-    "count": 9
+    "count": 6
   }
 }

1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_stairs_recipe_decompose.json

@@ -0,0 +1,23 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:slag_brick_block"
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SS",
+    "SS"
+  ],
+  "key": {
+    "S": {
+      "item": "engineersdecor:slag_brick_stairs",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:slag_brick_block",
+    "count": 4
+  }
+}

1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json

@@ -0,0 +1,29 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:treated_wood_windowsill",
+      "required": ["immersiveengineering:material"]
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "WWW",
+    "S S",
+    "   "
+  ],
+  "key": {
+    "W": {
+      "item": "#slabTreatedWood",
+      "data": 0
+    },
+    "S": {
+      "item": "#stickTreatedWood",
+      "data": 0
+    }
+  },
+  "result": {
+    "item": "engineersdecor:treated_wood_windowsill",
+    "count": 2
+  }
+}

meta/update.json

@@ -1,6 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.12.2": {
+    "1.0.2-b2": "[A] Added rebar concrete tile stairs.\n[A] Added treated wood window sill.\n[A] Added decomposition recipes for stairs and tiles.\n[M] Changed stair recipe yield quantity from 9 to 6.",
     "1.0.2-b1": "[A] Added rebar concrete tile.\n[A] Added panzer glass (explosion-resistant reinforced glass).\n[M] Treated wood crafting table supports shift-click to transfer stacks between player inventory and crafting table storage (thanks majijn for the hint).",
     "1.0.1": "[R] Release based on v1.0.1-b4 * Treated wood crafting table * Clinker brick wall * Treated wood stool * Inset spot light * Recipe fixes * Logo updated",
     "1.0.1-b4": "[M] Crafting table keeps inventory and has eight storage slots.\n[M] Adapted inset light strength and harvest tool.\n[M] Crafting table recipe adapted.",
@@ -14,12 +15,15 @@
     "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table."
   },
   "1.13.2": {
+    "1.0.2-b1": "[A] Added Treated wood crafting table.\n[A] Added decomposition recipes for stairs and tiles.\n[N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version).\n[N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items.",
+    "1.0.0-a3": "[A] Added iron inset light.\n[A] Added rebar concrete tile.\n[A] Added rebar concrete tile stairs.\n[A] Added clinker brick wall.\n[A] Added treated wood stool.\n[A] Added treated window sill.",
+    "1.0.0-a2": "[A] Added panzer glass.",
     "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta."
   },
   "promos": {
     "1.12.2-recommended": "1.0.1",
-    "1.12.2-latest": "1.0.2-b1",
+    "1.12.2-latest": "1.0.2-b2",
     "1.13.2-recommended": "",
-    "1.13.2-latest": "1.0.0-a1"
+    "1.13.2-latest": "1.0.2-b1"
   }
 }

tasks.js

@@ -53,11 +53,11 @@ tasks["sync-main-repository"] = function() {
   sys.shell("cp -f .gitignore credits.md license Makefile readme.md tasks.js \"" + main_repo_local + "/\"")
   sys.shell("cp -r documentation meta \"" + main_repo_local + "/\"")
   cd_dev("1.12");
-  sys.shell("cp -f build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.12/\"")
+  sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.12/\"")
   sys.shell("cp -r src gradle meta \"" + main_repo_local + "/1.12/\"")
   //@todo uncomment after alpha code cleanup.
   //cd_dev("1.13");
-  //sys.shell("cp -f build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.13/\"")
+  //sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js signing.* \"" + main_repo_local + "/1.13/\"")
   //sys.shell("cp -r src gradle meta \"" + main_repo_local + "/1.13/\"")
   cd_main();
   print("Main repository changes:");