Fix Writing Desk GUI and two-block rendering

src/main/resources/assets/rivencraft/blockstates/writing_desk.json

@@ -1,8 +1,12 @@
 {
   "variants": {
-    "facing=north": { "model": "rivencraft:block/writing_desk" },
-    "facing=east": { "model": "rivencraft:block/writing_desk", "y": 90 },
-    "facing=south": { "model": "rivencraft:block/writing_desk", "y": 180 },
-    "facing=west": { "model": "rivencraft:block/writing_desk", "y": 270 }
+    "facing=north,extension=false": {"model":"rivencraft:block/writing_desk"},
+    "facing=east,extension=false": {"model":"rivencraft:block/writing_desk","y":90},
+    "facing=south,extension=false": {"model":"rivencraft:block/writing_desk","y":180},
+    "facing=west,extension=false": {"model":"rivencraft:block/writing_desk","y":270},
+    "facing=north,extension=true": {"model":"rivencraft:block/writing_desk_extension"},
+    "facing=east,extension=true": {"model":"rivencraft:block/writing_desk_extension","y":90},
+    "facing=south,extension=true": {"model":"rivencraft:block/writing_desk_extension","y":180},
+    "facing=west,extension=true": {"model":"rivencraft:block/writing_desk_extension","y":270}
   }
 }

src/main/resources/assets/rivencraft/models/block/writing_desk.json

@@ -1,69 +1,11 @@
 {
   "parent": "minecraft:block/block",
-  "ambientocclusion": false,
-  "textures": {
-    "particle": "rivencraft:block/writing_desk",
-    "desk": "rivencraft:block/writing_desk"
-  },
+  "textures": {"wood":"rivencraft:block/writing_desk_wood","inlay":"rivencraft:block/writing_desk_inlay","particle":"rivencraft:block/writing_desk_wood"},
   "elements": [
-    {
-      "from": [0, 8, 0], "to": [16, 9, 16],
-      "faces": {
-        "up": {"uv": [1, 0, 3, 2], "texture": "#desk"},
-        "down": {"uv": [1, 2, 3, 4], "texture": "#desk"},
-        "north": {"uv": [1, 0, 3, 0.125], "texture": "#desk"},
-        "south": {"uv": [1, 0, 3, 0.125], "texture": "#desk"},
-        "east": {"uv": [1, 0, 3, 0.125], "texture": "#desk"},
-        "west": {"uv": [1, 0, 3, 0.125], "texture": "#desk"}
-      }
-    },
-    {
-      "from": [0, 0, 1], "to": [2, 8, 15],
-      "faces": {
-        "north": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
-        "south": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
-        "east": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
-        "west": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"}
-      }
-    },
-    {
-      "from": [14, 0, 1], "to": [16, 8, 15],
-      "faces": {
-        "north": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
-        "south": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
-        "east": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
-        "west": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"}
-      }
-    },
-    {
-      "from": [1, 3, 2], "to": [15, 4, 14],
-      "faces": {
-        "up": {"uv": [0, 4.25, 3.75, 6.125], "texture": "#desk"},
-        "down": {"uv": [0, 4.25, 3.75, 6.125], "texture": "#desk"},
-        "north": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"},
-        "south": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"},
-        "east": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"},
-        "west": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"}
-      }
-    },
-    {
-      "from": [1, 9, 14], "to": [15, 15, 16],
-      "faces": {
-        "north": {"uv": [8, 0, 11.75, 2], "texture": "#desk"},
-        "south": {"uv": [8, 0, 11.75, 2], "texture": "#desk"},
-        "east": {"uv": [8, 0, 8.25, 2], "texture": "#desk"},
-        "west": {"uv": [8, 0, 8.25, 2], "texture": "#desk"},
-        "up": {"uv": [8, 0, 11.75, 0.25], "texture": "#desk"}
-      }
-    },
-    {
-      "from": [1, 12, 9], "to": [15, 13, 15],
-      "faces": {
-        "up": {"uv": [8, 3.625, 11.75, 4.375], "texture": "#desk"},
-        "down": {"uv": [8, 3.625, 11.75, 4.375], "texture": "#desk"},
-        "north": {"uv": [8, 3.625, 11.75, 3.75], "texture": "#desk"},
-        "south": {"uv": [8, 3.625, 11.75, 3.75], "texture": "#desk"}
-      }
-    }
+    {"from":[0,0,1],"to":[16,1,15],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[0,8,0],"to":[16,9,16],"faces":{"up":{"texture":"#inlay"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[0,0,1],"to":[1,8,15],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[1,3,1],"to":[16,4,15],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[0,9,15],"to":[16,15,16],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}}
   ]
 }

src/main/resources/assets/rivencraft/models/block/writing_desk_extension.json

@@ -0,0 +1,11 @@
+{
+  "parent": "minecraft:block/block",
+  "textures": {"wood":"rivencraft:block/writing_desk_wood","inlay":"rivencraft:block/writing_desk_inlay","particle":"rivencraft:block/writing_desk_wood"},
+  "elements": [
+    {"from":[0,0,1],"to":[16,1,15],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[0,8,0],"to":[16,9,16],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[15,0,1],"to":[16,8,15],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[0,3,1],"to":[15,4,15],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}},
+    {"from":[0,9,15],"to":[16,15,16],"faces":{"up":{"texture":"#wood"},"down":{"texture":"#wood"},"north":{"texture":"#wood"},"south":{"texture":"#wood"},"east":{"texture":"#wood"},"west":{"texture":"#wood"}}}
+  ]
+}

src/main/resources/assets/rivencraft/models/item/writing_desk.json

@@ -1,3 +1,4 @@
 {
-  "parent": "rivencraft:block/writing_desk"
+  "parent": "minecraft:item/generated",
+  "textures": {"layer0": "rivencraft:item/writing_desk"}
 }