Merge 1.21.5(-8) into 1.21.9(10)

* 1.21.5(-8):
  Update changelog (2.1.2|5)
  Apply updated atlas data to Pale Oak Beds (2.1.2|4)

Author: pnk2u

CHANGELOG.md

@@ -1,5 +1,6 @@
 <!--publish=false-->
 ### 2.1.2:
-- Prevent crash when loading a world with a _Decorated Bed_ (from <ins>Bedspreads</ins> (&#x200A;<sub><a title="Bedspreads&#10;on Modrinth" href="https://modrinth.com/mod/bedspreads/"><img width=20 src="https://img.shields.io/badge/-%20-%23032a?style=flat&logo=modrinth"></a></sub><!--SEPARATOR_V--><img width=5 height=8 src="https://raw.githubusercontent.com/pnk2u/resources/main/ModProjects/shared/pres/icon/separator_v.svg"><sub><a title="Bedspreads&#10;on Curseforge" href="https://www.curseforge.com/minecraft/mc-mods/bedspreads/"><img width=20 src="https://img.shields.io/badge/--%23302a?style=flat&logo=curseforge"></a></sub>&#x200A;)) containing no longer existing _Bed_ variants or otherwise corrupted _Bed_ data
-    > e.g. by downgrading a world from `1.21.4` to `1.21.1` where _**Pale Oak** Beds_ don't exist yet
+- `1.20.1`, `1.21(.1)`, `1.21.4`: Prevent crash when loading a world with a _Decorated Bed_ (from <ins>Bedspreads</ins> (&#x200A;<sub><a title="Bedspreads&#10;on Modrinth" href="https://modrinth.com/mod/bedspreads/"><img width=20 src="https://img.shields.io/badge/-%20-%23032a?style=flat&logo=modrinth"></a></sub><!--SEPARATOR_V--><img width=5 height=8 src="https://raw.githubusercontent.com/pnk2u/resources/main/ModProjects/shared/pres/icon/separator_v.svg"><sub><a title="Bedspreads&#10;on Curseforge" href="https://www.curseforge.com/minecraft/mc-mods/bedspreads/"><img width=20 src="https://img.shields.io/badge/--%23302a?style=flat&logo=curseforge"></a></sub>&#x200A;)) containing no longer existing _Bed_ variants or otherwise corrupted _Bed_ data
+    > e.g. by downgrading a world from `1.21.4` to `1.21.1` where _**Pale Oak** Beds_ don't exist yet  
+    **Note**: Versions `1.21.5`~`1.21.11` already included this fix
 - `1.21.11`: Fix log spam due to duplicate sprites in multiple texture atlases

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_black_bed_foot.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/black",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_black_bed_head.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/black",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_blue_bed_foot.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/blue",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_blue_bed_head.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/blue",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_brown_bed_foot.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/brown",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_brown_bed_head.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/brown",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_cyan_bed_foot.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/cyan",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_cyan_bed_head.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/cyan",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }

src/client/resources/assets/quad-lolmbdv/models/block/pale_oak_gray_bed_foot.json

@@ -3,7 +3,7 @@
   "textures":
     {
      "bed": "minecraft:entity/bed/gray",
-     "bed_frame": "quad-lolmbdv:entity/bed/pale_oak",
+     "bed_frame": "quad-lolmbdv:block/bed_frame_pale_oak",
      "particle": "minecraft:block/pale_oak_planks"
     }
 }