From 53e3b2a7359d959f68dbff7ae4321ec636085956 Mon Sep 17 00:00:00 2001 From: Regorty <76084061+Regorty@users.noreply.github.com> Date: Fri, 2 Aug 2024 03:25:29 -0400 Subject: [PATCH] rimmington models made oak drawers fit 2 wide on item frame and added a blue bed --- assets/minecraft/models/item/arrow.json | 2 +- assets/ms/models/cons/bedroom/oak_drawers.json | 4 ++-- assets/ms/models/furniture/blue_full_size_bed.json | 10 ++++++++++ .../ms/models/furniture/red_gilded_full_size_bed.json | 11 ++++++----- 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 assets/ms/models/furniture/blue_full_size_bed.json diff --git a/assets/minecraft/models/item/arrow.json b/assets/minecraft/models/item/arrow.json index 04dd7cd97..59bf76dbc 100644 --- a/assets/minecraft/models/item/arrow.json +++ b/assets/minecraft/models/item/arrow.json @@ -232,7 +232,7 @@ {"predicate": {"custom_model_data":229},"model":"ms:clutter/church_candles"}, {"predicate": {"custom_model_data":230},"model":"ms:clutter/church_pew_red_left"}, {"predicate": {"custom_model_data":231},"model":"ms:clutter/church_pew_red_right"}, -{"predicate": {"custom_model_data":232},"model":"item/empty"}, +{"predicate": {"custom_model_data":232},"model":"ms:furniture/blue_full_size_bed"}, {"predicate": {"custom_model_data":233},"model":"item/empty"}, {"predicate": {"custom_model_data":234},"model":"item/empty"}, {"predicate": {"custom_model_data":235},"model":"item/empty"}, diff --git a/assets/ms/models/cons/bedroom/oak_drawers.json b/assets/ms/models/cons/bedroom/oak_drawers.json index 33a0ed1ca..7bf42c7e0 100644 --- a/assets/ms/models/cons/bedroom/oak_drawers.json +++ b/assets/ms/models/cons/bedroom/oak_drawers.json @@ -768,8 +768,8 @@ }, "fixed": { "rotation": [0, -180, 0], - "translation": [0, 4.75, 12], - "scale": [2.625, 2.625, 2.625] + "translation": [-16, 4, 14], + "scale": [4, 2.5, 2.5] } } } \ No newline at end of file diff --git a/assets/ms/models/furniture/blue_full_size_bed.json b/assets/ms/models/furniture/blue_full_size_bed.json new file mode 100644 index 000000000..825d6db4a --- /dev/null +++ b/assets/ms/models/furniture/blue_full_size_bed.json @@ -0,0 +1,10 @@ +{ + "parent": "ms:furniture/red_gilded_full_size_bed", + "textures": { + "0": "item/custom/diamond_sword/construction/mahogany_plank", + "1": "item/custom/diamond_sword/construction/mahogany_plank", + "2": "item/custom/diamond_sword/construction/bolt_of_cloth", + "4": "item/custom/colors/blue_dark", + "5": "item/custom/diamond_sword/construction/bolt_of_cloth" + } +} \ No newline at end of file diff --git a/assets/ms/models/furniture/red_gilded_full_size_bed.json b/assets/ms/models/furniture/red_gilded_full_size_bed.json index 868cf5fd2..511c093fd 100644 --- a/assets/ms/models/furniture/red_gilded_full_size_bed.json +++ b/assets/ms/models/furniture/red_gilded_full_size_bed.json @@ -5,6 +5,7 @@ "1": "item/custom/diamond_sword/construction/gold_leaf", "2": "item/custom/diamond_sword/construction/bolt_of_cloth", "4": "item/custom/colors/red_dark", + "5": "item/custom/goldhat", "particle": "item/custom/diamond_sword/construction/gold_leaf" }, "elements": [ @@ -1042,12 +1043,12 @@ { "name": "Element", "from": [-7, -4, -6], - "to": [17.25, -3, 22], + "to": [17, -3, 22], "faces": { - "north": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#1", "cullface": "north"}, - "south": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#1", "cullface": "north"}, - "west": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#1", "cullface": "north"}, - "down": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#1", "cullface": "north"} + "north": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#5", "cullface": "north"}, + "south": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#5", "cullface": "north"}, + "west": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#5", "cullface": "north"}, + "down": {"uv": [6.5, 9.25, 7, 9.625], "texture": "#5", "cullface": "north"} } } ],