Asset directory structure reordering. Textures for rebar concrete and table improved.

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.0-b2
+version_engineersdecor=1.0.0-b3
 #
 # jar signing data loaded from signing.properties in the project root.
 #

meta/update.json

@@ -1,11 +1,12 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/redstone-gauges-and-switches/",
   "1.12.2": {
-    "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.0.0-b2": "[A] Added rebar concrete (steel reinforced, expensive, creeper-proof)."
+    "1.0.0-b3": "[A] Textures of rebar concrete and treated wood table improved.",
+    "1.0.0-b2": "[A] Added rebar concrete (steel reinforced, expensive, creeper-proof).",
+    "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."
   },
   "promos": {
     "1.12.2-recommended": "",
-    "1.12.2-latest": "1.0.0-b1"
+    "1.12.2-latest": "1.0.0-b3"
   }
 }

readme.md

@@ -65,6 +65,10 @@ More to come slowly but steadily.
 ----
 ## Revision history
 
+    - v1.0.0-b3 [A] Textures of rebar concrete and treated wood table improved.
+
+    - v1.0.0-b2 [A] Added rebar concrete (steel reinforced, expensive, creeper-proof).
+
     - v1.0.0-b1 [A] Initial structure.
                 [A] Added clinker bricks and clinker brick stairs.
                 [A] Added slag bricks and slag brick stairs.
@@ -74,9 +78,6 @@ More to come slowly but steadily.
                 [A] Added treated wood pole.
                 [A] Added treated wood table.
 
-    - v1.0.0-b2 [A] Added rebar concrete (steel reinforced, expensive, creeper-proof).
-
-
 ### Community references
 
 Mods covering similar features, or may fit well together with IE and the decorations of this mod:

src/main/resources/assets/engineersdecor/blockstates/metal_rung_ladder.json

@@ -1,6 +1,6 @@
 {
   "forge_marker": 1,
-  "defaults": { "model": "engineersdecor:metal_rung_ladder_model" },
+  "defaults": { "model": "engineersdecor:ladder/metal_rung_ladder_model" },
   "variants": {
     "normal": [{}],
     "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} },

src/main/resources/assets/engineersdecor/blockstates/metal_rung_steps.json

@@ -1,6 +1,6 @@
 {
   "forge_marker": 1,
-  "defaults": { "model": "engineersdecor:metal_rung_steps_model" },
+  "defaults": { "model": "engineersdecor:ladder/metal_rung_steps_model" },
   "variants": {
     "normal": [{}],
     "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} },

src/main/resources/assets/engineersdecor/blockstates/slag_brick_block.json

@@ -1,7 +1,7 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "engineersdecor:slag_brick_model",
+    "model": "engineersdecor:decor_full_block_model",
     "textures": { "all": "engineersdecor:blocks/slag_brick/slag_brick_texture0" }
   },
   "variants": {

src/main/resources/assets/engineersdecor/blockstates/treated_wood_ladder.json

@@ -1,6 +1,6 @@
 {
   "forge_marker": 1,
-  "defaults": { "model": "engineersdecor:treated_wood_ladder_model" },
+  "defaults": { "model": "engineersdecor:ladder/treated_wood_ladder_model" },
   "variants": {
     "normal": [{}],
     "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} },

src/main/resources/assets/engineersdecor/blockstates/treated_wood_table.json

@@ -1,6 +1,6 @@
 {
   "forge_marker": 1,
-  "defaults": { "model": "engineersdecor:treated_wood_table_model" },
+  "defaults": { "model": "engineersdecor:furniture/treated_wood_table_model" },
   "variants": {
     "normal": [{}],
     "inventory": [{}]

src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json

@@ -0,0 +1,190 @@
+{
+	"credit": "I made this with the Blockbench",
+	"parent": "block/cube",
+	"textures": {
+		"o": "engineersdecor:blocks/iestyle/treated_wood_framed_texture",
+		"particle": "engineersdecor:blocks/iestyle/treated_wood_framed_texture"
+	},
+	"elements": [
+		{
+			"from": [1, 0, 1],
+			"to": [3, 14, 3],
+			"faces": {
+				"north": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"east": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"south": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"west": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"up": {"uv": [1, 1, 3, 3], "texture": "#o"},
+				"down": {"uv": [1, 13, 3, 15], "texture": "#o", "cullface": "down"}
+			}
+		},
+		{
+			"from": [13, 0, 1],
+			"to": [15, 14, 3],
+			"faces": {
+				"north": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"east": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"south": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"west": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"up": {"uv": [13, 1, 15, 3], "texture": "#o"},
+				"down": {"uv": [13, 13, 15, 15], "texture": "#o", "cullface": "down"}
+			}
+		},
+		{
+			"from": [13, 0, 13],
+			"to": [15, 14, 15],
+			"faces": {
+				"north": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"east": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"south": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"west": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"up": {"uv": [13, 13, 15, 15], "texture": "#o"},
+				"down": {"uv": [13, 1, 15, 3], "texture": "#o", "cullface": "down"}
+			}
+		},
+		{
+			"from": [1, 0, 13],
+			"to": [3, 14, 15],
+			"faces": {
+				"north": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"east": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"south": {"uv": [1, 2, 3, 16], "texture": "#o"},
+				"west": {"uv": [13, 2, 15, 16], "texture": "#o"},
+				"up": {"uv": [1, 13, 3, 15], "texture": "#o"},
+				"down": {"uv": [1, 1, 3, 3], "texture": "#o", "cullface": "down"}
+			}
+		},
+		{
+			"from": [0, 14, 0],
+			"to": [16, 15.875, 16],
+			"faces": {
+				"north": {"uv": [0, 0.125, 16, 2], "texture": "#o"},
+				"east": {"uv": [0, 0.125, 16, 2], "texture": "#o"},
+				"south": {"uv": [0, 0.125, 16, 2], "texture": "#o"},
+				"west": {"uv": [0, 0.125, 16, 2], "texture": "#o"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#o"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#o"}
+			}
+		},
+		{
+			"from": [0.125, 15.875, 0.125],
+			"to": [15.875, 16, 15.875],
+			"faces": {
+				"north": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"},
+				"east": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"},
+				"south": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"},
+				"west": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"},
+				"up": {"uv": [0.25, 0.25, 15.75, 15.75], "texture": "#o"},
+				"down": {"uv": [0.25, 0.25, 15.75, 15.75], "texture": "#o"}
+			}
+		},
+		{
+			"from": [13, 13.5, 3],
+			"to": [15, 14, 5],
+			"faces": {
+				"north": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"east": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"south": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"west": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"up": {"uv": [13, 3, 15, 5], "texture": "#o"},
+				"down": {"uv": [13, 11, 15, 13], "texture": "#o"}
+			}
+		},
+		{
+			"from": [13, 13.5, 11],
+			"to": [15, 14, 13],
+			"faces": {
+				"north": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"east": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"south": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"west": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"up": {"uv": [13, 11, 15, 13], "texture": "#o"},
+				"down": {"uv": [13, 3, 15, 5], "texture": "#o"}
+			}
+		},
+		{
+			"from": [1, 13.5, 11],
+			"to": [3, 14, 13],
+			"faces": {
+				"north": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"east": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"south": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"west": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"up": {"uv": [1, 11, 3, 13], "texture": "#o"},
+				"down": {"uv": [1, 3, 3, 5], "texture": "#o"}
+			}
+		},
+		{
+			"from": [1, 13.5, 3],
+			"to": [3, 14, 5],
+			"faces": {
+				"north": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"east": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"south": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"west": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"up": {"uv": [1, 3, 3, 5], "texture": "#o"},
+				"down": {"uv": [1, 11, 3, 13], "texture": "#o"}
+			}
+		},
+		{
+			"from": [11, 13.5, 1],
+			"to": [13, 14, 3],
+			"faces": {
+				"north": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"east": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"south": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"west": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"up": {"uv": [11, 1, 13, 3], "texture": "#o"},
+				"down": {"uv": [11, 13, 13, 15], "texture": "#o"}
+			}
+		},
+		{
+			"from": [3, 13.5, 1],
+			"to": [5, 14, 3],
+			"faces": {
+				"north": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"east": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"south": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"west": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"up": {"uv": [3, 1, 5, 3], "texture": "#o"},
+				"down": {"uv": [3, 13, 5, 15], "texture": "#o"}
+			}
+		},
+		{
+			"from": [11, 13.5, 13],
+			"to": [13, 14, 15],
+			"faces": {
+				"north": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"east": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"south": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"west": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"up": {"uv": [11, 13, 13, 15], "texture": "#o"},
+				"down": {"uv": [11, 1, 13, 3], "texture": "#o"}
+			}
+		},
+		{
+			"from": [3, 13.5, 13],
+			"to": [5, 14, 15],
+			"faces": {
+				"north": {"uv": [11, 2, 13, 2.5], "texture": "#o"},
+				"east": {"uv": [1, 2, 3, 2.5], "texture": "#o"},
+				"south": {"uv": [3, 2, 5, 2.5], "texture": "#o"},
+				"west": {"uv": [13, 2, 15, 2.5], "texture": "#o"},
+				"up": {"uv": [3, 13, 5, 15], "texture": "#o"},
+				"down": {"uv": [3, 1, 5, 3], "texture": "#o"}
+			}
+		}
+	],
+	"display": {
+		"ground": {
+			"scale": [0.2, 0.2, 0.2]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}

src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json

@@ -2,8 +2,8 @@
 	"credit": "I made this with the Blockbench",
 	"parent": "block/cube",
 	"textures": {
-		"o": "engineersdecor:blocks/iestyle/treated_wood",
-		"particle": "engineersdecor:blocks/iestyle/treated_wood"
+		"o": "engineersdecor:blocks/iestyle/treated_wood_rough_texture",
+		"particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture"
 	},
 	"elements": [
 		{

src/main/resources/assets/engineersdecor/models/block/slag_brick_model.json

@@ -1 +0,0 @@
-{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:blocks/slag_brick/slag_brick_texture0" } }

src/main/resources/assets/engineersdecor/models/block/treated_wood_table_model.json

@@ -1,190 +0,0 @@
-{
-	"credit": "I made this with the Blockbench",
-	"parent": "block/cube",
-	"textures": {
-		"o": "engineersdecor:blocks/iestyle/treated_wood",
-		"particle": "engineersdecor:blocks/iestyle/treated_wood"
-	},
-	"elements": [
-		{
-			"from": [1, 0, 1],
-			"to": [3, 14, 3],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o", "cullface": "down"}
-			}
-		},
-		{
-			"from": [13, 0, 1],
-			"to": [15, 14, 3],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o", "cullface": "down"}
-			}
-		},
-		{
-			"from": [13, 0, 13],
-			"to": [15, 14, 15],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o", "cullface": "down"}
-			}
-		},
-		{
-			"from": [1, 0, 13],
-			"to": [3, 14, 15],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o", "cullface": "down"}
-			}
-		},
-		{
-			"from": [0, 14, 0],
-			"to": [16, 15.875, 16],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [0.25, 15.875, 0.25],
-			"to": [15.75, 16, 15.75],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [13, 13.5, 3],
-			"to": [15, 14, 5],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [13, 13.5, 11],
-			"to": [15, 14, 13],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [1, 13.5, 11],
-			"to": [3, 14, 13],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [1, 13.5, 3],
-			"to": [3, 14, 5],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [11, 13.5, 1],
-			"to": [13, 14, 3],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [3, 13.5, 1],
-			"to": [5, 14, 3],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [11, 13.5, 13],
-			"to": [13, 14, 15],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		},
-		{
-			"from": [3, 13.5, 13],
-			"to": [5, 14, 15],
-			"faces": {
-				"north": {"texture": "#o"},
-				"east": {"texture": "#o"},
-				"south": {"texture": "#o"},
-				"west": {"texture": "#o"},
-				"up": {"texture": "#o"},
-				"down": {"texture": "#o"}
-			}
-		}
-	],
-	"display": {
-		"ground": {
-			"scale": [0.2, 0.2, 0.2]
-		},
-		"gui": {
-			"rotation": [30, 225, 0],
-			"scale": [0.625, 0.625, 0.625]
-		},
-		"fixed": {
-			"scale": [0.5, 0.5, 0.5]
-		}
-	}
-}