From 6e8de8103b7c978de11f2f35294ca0d71bf3606c Mon Sep 17 00:00:00 2001 From: Regorty <76084061+Regorty@users.noreply.github.com> Date: Sat, 9 Nov 2024 01:37:05 -0500 Subject: [PATCH] Varrock House models pt 5 also adjusted the limpwurt root plant so i can watch it grow more easily --- assets/minecraft/models/item/arrow.json | 4 +- .../clutter/standing_mirror_rectangle.json | 157 ++++++++++++++++++ .../models/clutter/varrock_large_oak_bed.json | 8 + .../farming/stage/limpwurt_sapling_2.json | 4 +- .../farming/stage/limpwurt_sapling_3.json | 4 +- .../farming/stage/limpwurt_sapling_4.json | 4 +- 6 files changed, 173 insertions(+), 8 deletions(-) create mode 100644 assets/ms/models/clutter/standing_mirror_rectangle.json create mode 100644 assets/ms/models/clutter/varrock_large_oak_bed.json diff --git a/assets/minecraft/models/item/arrow.json b/assets/minecraft/models/item/arrow.json index 3aa03472e..1b0ff9880 100644 --- a/assets/minecraft/models/item/arrow.json +++ b/assets/minecraft/models/item/arrow.json @@ -269,8 +269,8 @@ {"predicate": {"custom_model_data":266},"model":"ms:clutter/varrock_table_cloth_1"}, {"predicate": {"custom_model_data":267},"model":"ms:clutter/worn_bed_light_blue"}, {"predicate": {"custom_model_data":268},"model":"ms:clutter/shelf_clutter_kitchen_2"}, -{"predicate": {"custom_model_data":269},"model":"item/empty"}, -{"predicate": {"custom_model_data":270},"model":"item/empty"}, +{"predicate": {"custom_model_data":269},"model":"ms:clutter/varrock_large_oak_bed"}, +{"predicate": {"custom_model_data":270},"model":"ms:clutter/standing_mirror_rectangle"}, {"predicate": {"custom_model_data":271},"model":"item/empty"}, {"predicate": {"custom_model_data":272},"model":"item/empty"}, {"predicate": {"custom_model_data":273},"model":"item/empty"}, diff --git a/assets/ms/models/clutter/standing_mirror_rectangle.json b/assets/ms/models/clutter/standing_mirror_rectangle.json new file mode 100644 index 000000000..09c45e278 --- /dev/null +++ b/assets/ms/models/clutter/standing_mirror_rectangle.json @@ -0,0 +1,157 @@ +{ + "credit": "Made by Regorty", + "textures": { + "0": "item/custom/diamond_sword/construction/oak_plank", + "1": "item/custom/colors/blue_light", + "particle": "item/custom/diamond_sword/construction/oak_plank" + }, + "elements": [ + { + "from": [-2.75, -12, 6.25], + "to": [0.75, -11, 9.75], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, -12, 7]}, + "faces": { + "north": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "east": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "west": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "up": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "down": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [15.25, -12, 6.25], + "to": [18.75, -11, 9.75], + "rotation": {"angle": 0, "axis": "y", "origin": [16, -12, 7]}, + "faces": { + "north": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "east": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "west": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "up": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "down": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [16.25, -11, 7.25], + "to": [17.75, 8, 8.75], + "rotation": {"angle": 0, "axis": "y", "origin": [16, -11, 7]}, + "faces": { + "north": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "east": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "west": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [-1.75, -11, 7.25], + "to": [-0.25, 8, 8.75], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, -11, 7]}, + "faces": { + "north": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "east": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "west": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [15, 8, 7], + "to": [18, 10, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, -5, 7]}, + "faces": { + "north": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "east": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "up": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "down": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [-2, 8, 7], + "to": [1, 10, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [-19, -5, 7]}, + "faces": { + "north": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "south": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "west": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "up": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "down": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [1, -10, 6.75], + "to": [3, 28, 9.25], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "east": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "south": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "west": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "up": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "down": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [13, -10, 6.75], + "to": [15, 28, 9.25], + "rotation": {"angle": 0, "axis": "x", "origin": [20, 9, 8]}, + "faces": { + "north": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "east": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "west": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "up": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "down": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [3, -10, 6.75], + "to": [13, -8, 9.25], + "rotation": {"angle": 0, "axis": "x", "origin": [20, 9, 8]}, + "faces": { + "north": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "up": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"}, + "down": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"} + } + }, + { + "from": [3, 26, 6.75], + "to": [13, 28, 9.25], + "rotation": {"angle": 0, "axis": "x", "origin": [20, 45, 8]}, + "faces": { + "north": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "south": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "up": {"uv": [4.625, 12.875, 4.875, 12.625], "texture": "#0"}, + "down": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"} + } + }, + { + "from": [3, -8, 7.65], + "to": [13, 26, 9.25], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 9, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, + "south": {"uv": [4.125, 13.875, 4.375, 13.625], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -180, 0], + "scale": [0.15, 0.15, 0.15] + }, + "firstperson_righthand": { + "rotation": [0, -180, 0], + "scale": [0.15, 0.15, 0.15] + }, + "gui": { + "rotation": [12, -155, 0], + "scale": [0.4, 0.4, 0.4] + }, + "fixed": { + "translation": [-16, 2, 17], + "scale": [2.5, 2.5, 2.5] + } + } +} \ No newline at end of file diff --git a/assets/ms/models/clutter/varrock_large_oak_bed.json b/assets/ms/models/clutter/varrock_large_oak_bed.json new file mode 100644 index 000000000..8b7aeb7ab --- /dev/null +++ b/assets/ms/models/clutter/varrock_large_oak_bed.json @@ -0,0 +1,8 @@ +{ + "parent": "ms:cons/bedroom/large_oak_bed", + "textures": { + "0": "item/custom/diamond_hoe/firemaking_or_woodcut/oak_logs", + "1": "item/custom/diamond_sword/construction/bolt_of_cloth", + "2": "item/custom/colors/yellow" + } +} \ No newline at end of file diff --git a/assets/ms/models/farming/stage/limpwurt_sapling_2.json b/assets/ms/models/farming/stage/limpwurt_sapling_2.json index da8d93687..f6f358b5b 100644 --- a/assets/ms/models/farming/stage/limpwurt_sapling_2.json +++ b/assets/ms/models/farming/stage/limpwurt_sapling_2.json @@ -13,8 +13,8 @@ "translation": [0, 5.75, 0] }, "head": { - "translation": [-1, -31.75, 0.5], - "scale": [1.2, 1.2, 1.2] + "translation": [-1, -32, 0.5], + "scale": [1.5, 1.5, 1.5] }, "fixed": { "translation": [-0.75, 18.25, 16.5], diff --git a/assets/ms/models/farming/stage/limpwurt_sapling_3.json b/assets/ms/models/farming/stage/limpwurt_sapling_3.json index f24f51d22..d568ccabe 100644 --- a/assets/ms/models/farming/stage/limpwurt_sapling_3.json +++ b/assets/ms/models/farming/stage/limpwurt_sapling_3.json @@ -13,8 +13,8 @@ "translation": [0, 5.75, 0] }, "head": { - "translation": [-1, -31.75, 0.5], - "scale": [1.4, 1.4, 1.4] + "translation": [-1, -22, 0.5], + "scale": [2.5, 2.5, 2.5] }, "fixed": { "translation": [-0.75, 18.25, 16.5], diff --git a/assets/ms/models/farming/stage/limpwurt_sapling_4.json b/assets/ms/models/farming/stage/limpwurt_sapling_4.json index 123c0cb7f..32a53e398 100644 --- a/assets/ms/models/farming/stage/limpwurt_sapling_4.json +++ b/assets/ms/models/farming/stage/limpwurt_sapling_4.json @@ -13,8 +13,8 @@ "translation": [0, 5.75, 0] }, "head": { - "translation": [-1, -31.75, 0.5], - "scale": [1.6, 1.6, 1.6] + "translation": [-1, -15, 0.5], + "scale": [3.5, 3.5, 3.5] }, "fixed": { "translation": [-0.75, 18.25, 16.5],