From 1342cc38aa7718a2c8a37f92f5474ffcdff48527 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Fri, 11 Apr 2025 12:40:28 +0200 Subject: [PATCH] halo obj model --- .../assets/saturnclient/models/item/halo.json | 6 +- .../item/{obj_model_item.mtl => halo.mtl} | 0 .../item/{obj_model_item.obj => halo.obj} | 7 +- .../saturnclient/models/item/halo_black.json | 251 +----------------- .../saturnclient/models/item/halo_black.mtl | 13 + 5 files changed, 32 insertions(+), 245 deletions(-) rename src/main/resources/assets/saturnclient/models/item/{obj_model_item.mtl => halo.mtl} (100%) rename src/main/resources/assets/saturnclient/models/item/{obj_model_item.obj => halo.obj} (99%) create mode 100644 src/main/resources/assets/saturnclient/models/item/halo_black.mtl diff --git a/src/main/resources/assets/saturnclient/models/item/halo.json b/src/main/resources/assets/saturnclient/models/item/halo.json index 570d559..a8a7080 100644 --- a/src/main/resources/assets/saturnclient/models/item/halo.json +++ b/src/main/resources/assets/saturnclient/models/item/halo.json @@ -1,12 +1,12 @@ { "parent": "special-model-loader:builtin/obj", "flip_v": true, - "model": "saturnclient:models/item/obj_model_item.obj", + "model": "saturnclient:models/item/halo.obj", "display": { "thirdperson_righthand": { "rotation": [ 0, 0, 0 ], - "translation": [ 0, 9.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] + "translation": [ 1.5, 12, 1.5], + "scale": [ 0.2, 0.2, 0.2 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/saturnclient/models/item/obj_model_item.mtl b/src/main/resources/assets/saturnclient/models/item/halo.mtl similarity index 100% rename from src/main/resources/assets/saturnclient/models/item/obj_model_item.mtl rename to src/main/resources/assets/saturnclient/models/item/halo.mtl diff --git a/src/main/resources/assets/saturnclient/models/item/obj_model_item.obj b/src/main/resources/assets/saturnclient/models/item/halo.obj similarity index 99% rename from src/main/resources/assets/saturnclient/models/item/obj_model_item.obj rename to src/main/resources/assets/saturnclient/models/item/halo.obj index 4c64895..8df9f46 100644 --- a/src/main/resources/assets/saturnclient/models/item/obj_model_item.obj +++ b/src/main/resources/assets/saturnclient/models/item/halo.obj @@ -1,6 +1,6 @@ -# Blender 4.0.2 +# Blender 4.0.2 OBJ File: '' # www.blender.org -mtllib obj_model_item.mtl +mtllib halo.mtl o Torus v 1.250000 0.000000 0.000000 v 1.216506 0.125000 0.000000 @@ -1503,7 +1503,8 @@ vt 0.479167 0.166667 vt 0.479167 0.250000 vt 0.479167 0.333333 vt 0.479167 0.416667 -s 0 +usemtl tex +s off f 1/1/1 13/2/1 14/3/1 2/4/1 f 2/4/2 14/3/2 15/5/2 3/6/2 f 3/6/3 15/5/3 16/7/3 4/8/3 diff --git a/src/main/resources/assets/saturnclient/models/item/halo_black.json b/src/main/resources/assets/saturnclient/models/item/halo_black.json index b03fef1..0fb42a3 100644 --- a/src/main/resources/assets/saturnclient/models/item/halo_black.json +++ b/src/main/resources/assets/saturnclient/models/item/halo_black.json @@ -1,240 +1,13 @@ { - "credit": "Made with Blockbench", - "textures": { - "1": "saturnclient:item/halo_black" - }, - "elements": [ - { - "name": "hexadecagon", - "from": [7.40326, 10, 5], - "to": [8.59674, 11, 6], - "rotation": {"angle": -45, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 5], - "to": [8.59674, 11, 6], - "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 5], - "to": [8.59674, 11, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 5], - "to": [8.59674, 11, 6], - "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 5], - "to": [8.59674, 11, 6], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 10], - "to": [8.59674, 11, 11], - "rotation": {"angle": -45, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 10], - "to": [8.59674, 11, 11], - "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 10], - "to": [8.59674, 11, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 10], - "to": [8.59674, 11, 11], - "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [7.40326, 10, 10], - "to": [8.59674, 11, 11], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [5, 10, 7.40326], - "to": [6, 11, 8.59674], - "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [5, 10, 7.40326], - "to": [6, 11, 8.59674], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [5, 10, 7.40326], - "to": [6, 11, 8.59674], - "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [10, 10, 7.40326], - "to": [11, 11, 8.59674], - "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [10, 10, 7.40326], - "to": [11, 11, 8.59674], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "name": "hexadecagon", - "from": [10, 10, 7.40326], - "to": [11, 11, 8.59674], - "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "hexadecagon", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - } - ] -} \ No newline at end of file + "parent": "special-model-loader:builtin/obj", + "model": "saturnclient:models/item/halo.obj", + "mtl_override": "saturnclient:models/item/halo_black.mtl", + "flip_v": true, + "display": { + "thirdperson_righthand": { + "rotation": [0, 0, 0], + "translation": [1.5, 12, 1.5], + "scale": [0.2, 0.2, 0.2] + } + } +} diff --git a/src/main/resources/assets/saturnclient/models/item/halo_black.mtl b/src/main/resources/assets/saturnclient/models/item/halo_black.mtl new file mode 100644 index 0000000..6670390 --- /dev/null +++ b/src/main/resources/assets/saturnclient/models/item/halo_black.mtl @@ -0,0 +1,13 @@ +# Blender MTL File: 'None' +# Material Count: 1 + +newmtl tex +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd saturnclient:item/halo_black